Improvements to the theme switcher to allow child themes to work properly as the appp theme