Merge "CM11 Themes: Add feature for new themes." into cm-11.0