Improved syntax highlights