Fix Theme Chooser!