Revert "New Theme Engine [1/6]"

This reverts commit 34d6168d14928060c527c4f7410a4b977719cdf5.