Syntax highlighting improved