minor tweaks to theme engine