Added a theme for CM
Merge remote-tracking branch 'origin/master' into rbranch