Improve syntax highlighting regexps