Syntax highlighting improvements