Improve syntax highlighting system