More syntax highlighting updates