Added support for syntax highlighting.
Updated syntax highlighting styles
Merge branch 'release/1.4'