* Improve highlighting

