Improved syntax highlight