Adding new cm theme chooser

Change-Id: I33f084d91d072db376ea028a16334115838014d9