Revert "New Theme Engine [6/6]"

This reverts commit 487ae23e6222b27e3dd123d7dcaba9dc39bb3410.