Revert "Revert "Theme code""

This reverts commit bf92f562f2929c052cf5d1893ea7fdec12aaecb9.