Make highlighting simpler.
Removed old box-based highlighting.