Update regex matching for highlighting