Made the highlight regex more sane... I think?