Improve ES6 syntax highlighting