Moved back to using clean-home-sp in switch_theme