Some more highlighting tweaks