Update to new Theme Chooser