Switched to new syntax highlighting feature