Improve highlighting

Hopefully addresses #7