Finished syntax highlighting
Merging