Revert "New Theme Engine [3/6]"

This reverts commit c2807ac91187a30afe0e3e5755e2eabfdc9b9d1b.