Some more tweaks to the theme