Revert "Squashed Commit of New Theme Engine"

This reverts commit 98927ecb577b2a9dd5b21fbb144a628bbe76ac23.