Add Themes support

Change-Id: I0eb669956d9e89bb92cd43487b14b4246454a400