Revert "Theme work"

This reverts commit aa55b7b30cd15d242b1813105a206e17b29f8c06.