Cleanup theme header + Plone upgrade