Revert "New CM Theme Engine."

This reverts commit 4f495eb7356108be8dc1c0caae2e0971529b616e.