Added more theming possibilities for Theme-Chooser Themes