further theme tweaks