Added ThemeSwitcher and a few new themes