Further theme tweaking