Several small theme tweaks