ThemeChooser: get more support

Change-Id: Ic3c5e0f527f5f7a595a43b5ae2db6a1cacafab0d