Merge in Updated Syntax Highlighting from Development