Hi, 
this patch fixes some issues with both indentation and syntax highlighting.
Has been tested with both the latest and earlier versions of the grammar.

Thank you.

V.