fix highlighting
Merge branch 'highlight'