Revert "Theme Engine [4/8]"

This reverts commit 93b9ebe9c2b1cbd4a45434feb28208196e020229.