Revert "CM New Theme Engine."

This reverts commit e490e11bd94281c13bf7d214bf685e3fa1d996a2.