Improve highlighting.