Revert "Theme work"

This reverts commit a802587ba5382cbf4bbad10e7b5ca1295988dea6.