MS-81: Add syntax highlighting
Merge branch 'MS-81-syntaxhighlight' into develop