Further theme tweaks.