Tweak and clean up highlighting to be more consistent.

Use a slightly less dark background.