Switch over to CM theme chooser/provider

Change-Id: Idadf81ce774e50926ee206bb34bc9e3d1bb4aece