And also many people are talking about solid state batteries and...

And also many people are talking about solid state batteries and some think it might be a rival for Li-Ion batteries replacing Li component; NO it is NOT.
Solid state batteries are (at this moment at least) based on the same principles and chemistry as Li-Ion just having different type of electrolyte and separator. In fact solid state batteries will probably require more Li content as will enable higher power/energy density and ultimately it may enable Li metal batteries which require much more Li than normal Li-Ion.