Added more theming possibilities for Theme-Chooser Themes

Change-Id: I69b8820b2f9c8bddffdf5d57eb4cad712552ddfb