New syntax highlighting.

New syntax highliting and a few other changes.