Redo syntax highlighting

Addresses issues #3, #8 and #9