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