Revert "CM11 Themes: Add feature for new themes."

This reverts commit ca330a2862c2914cbaa3a3b5071113f35d986173.