Revert "Theme Engine [2/8]"

This reverts commit ac52c00fb6653ae5a2627dd68802ef40356fc844.