Altered syntax highlighting slightly.
Merge branch 'local'