More theme tweaks