Huge syntax highlighting improvements