Add CM's new theme chooser