Revert "Theme Engine [8/8]"

This reverts commit 94d2749fb110ccff331ea422b3da2dc6cc0f1d76.