Added more theming possibilities for Theme-Chooser Themes

Change-Id: Idc2985578fa2846a3f4971c19171500461023743