Clean theme compatibility improvements
Merge pull request #54 from IPA-Lets-Study-Together/dev

Clean theme compatibility improvements