More updates to new syntax highlighting