ThemeChooser Integration

Change-Id: Ic05b8d3574b2c7955c7174a519ec7c166b2fa7e7