Revert "New Theme Engine [5/6]"

This reverts commit 305ef115c5a9224a55135e5848d89850f1fe203f.