Revert "Theme Engine [3/8]"

This reverts commit 2382e61a2f0fa742ad732913d078e98232248555.