Tweak loading of themes