Revert "Theme work"

This reverts commit 30e91858449298ded4dc8db6c64c118628ceadb7.