Theme Selector fixed, also added new Themes