more clean up of mage.theme