first round of tweaks to the theme