Many problems with oxid eshop

Thank you. I swapped flow for wave as you said it is newer and should be supported longer.
Still not sure about “Mehr” what to do - should I swap some files manually? Or open file/s and copy/paste differences from github links?

Also I hope with any of these steps I will not ruin next update once e.g. 6.2.0 is available.