[highlight] tweak some of the highlight regexes