more highlight updates
Merge pull request #357 from shutter111/master

more highlight updates