Revert "New Theme Engine [4/6]"

This reverts commit 1152a41bd719b06be4a1250fb08ef7cf49c6f20b.