Improve regular expression for highlighting

Please see this patch.