Adds better syntax highlighting for comments.
Adds better syntax highlight for comments
Merges branch 'feature/fix-comments-highlighting' into dev