Added more theming possibilities for Theme-Chooser Themes

Change-Id: Ibebf99b2a2e6109b250fc1ee71d29f4f74efda51