Revert "New Theme Engine"

This reverts commit cc69102b56fa520ecb07e9210b91b7be00751d9d.