Revert "New Theme Engine [4/6]"

This reverts commit 0688344344cc9d8046aefb92c53903b76a2a435b.