Improved syntax highlighting