Revert "CM Theme engine [8/8]"

This reverts commit ead722f24e3d9528f4d710f1f88dcf449ac12ec9.