Fix theme tweaks