Improved syntax highlighting - issue #1