Revert "Revert "New Theme Engine [4/6]""

This reverts commit 22a3cf6416f7572a90a76d58a2d07742f1eadd18.