More syntax highlighting changes