Revert "Add New Theme Engine"

This reverts commit 413eca2617224c948ba31ba0189495cf1f81e9af.