Minor tweaks to themes