Improve syntax highlighter