Enable ThemeChooser

Change-Id: Ic992957b0759aa318619f66bb13f2564f860715f