More fixes for Theme Chooser removal