Theme Switcher Bug Fix and Cleanup for Release