Few theme tweaks