Revert "CM Theme Engine [3/8]"

This reverts commit 7151089c2a7555bfbd7f441c742f3d59f45a013d.