Revert "Theme Engine [4/8]" and put it on a seperate branch

This reverts commit cada227b8b0f1610e02359b3fd1ccf0312c3bee6.