diff --git a/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage b/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage
deleted file mode 100644
index f0084dc..0000000
--- a/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-    "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>$schema</key>
-        <string>
-            https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json
-        </string>
-        <key>name</key>
-        <string>Zebus Messages</string>
-        <key>uuid</key>
-        <string>86FA8B6A-FA5E-4139-904B-91C75675BC6B</string>
-        <key>scopeName</key>
-        <string>source.zebusmsg</string>
-        <key>fileTypes</key>
-        <array>
-            <string>msg</string>
-        </array>
-        <key>patterns</key>
-        <array>
-            <dict>
-                <key>include</key>
-                <string>#messages</string>
-            </dict>
-        </array>
-        <key>repository</key>
-        <dict>
-            <key>messages</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>include</key>
-                        <string>#comments</string>
-                    </dict>
-                    <dict>
-                        <key>include</key>
-                        <string>#pragma</string>
-                    </dict>
-                    <dict>
-                        <key>include</key>
-                        <string>#attributes</string>
-                    </dict>
-                    <dict>
-                        <key>include</key>
-                        <string>#messageName</string>
-                    </dict>
-                    <dict>
-                        <key>include</key>
-                        <string>#keywords</string>
-                    </dict>
-                    <dict>
-                        <key>include</key>
-                        <string>#literals</string>
-                    </dict>
-                </array>
-            </dict>
-            <key>comments</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>comment.block.zebusmsg</string>
-                        <key>begin</key>
-                        <string>/\*</string>
-                        <key>end</key>
-                        <string>\*/</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>include</key>
-                                <string>#commentContent</string>
-                            </dict>
-                        </array>
-                    </dict>
-                    <dict>
-                        <key>name</key>
-                        <string>comment.line</string>
-                        <key>begin</key>
-                        <string>//</string>
-                        <key>end</key>
-                        <string>$</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>include</key>
-                                <string>#commentContent</string>
-                            </dict>
-                        </array>
-                    </dict>
-                </array>
-            </dict>
-            <key>commentContent</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>keyword.control</string>
-                        <key>match</key>
-                        <string>(?i)\b(TODO|FIXME|HACK|ISSUE)\b</string>
-                    </dict>
-                </array>
-            </dict>
-            <key>pragma</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>meta.preprocessor.zebusmsg</string>
-                        <key>begin</key>
-                        <string>^\s*#\s*\pragma\b</string>
-                        <key>end</key>
-                        <string>$</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>include</key>
-                                <string>#comments</string>
-                            </dict>
-                        </array>
-                    </dict>
-                </array>
-            </dict>
-            <key>attributes</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>emphasis</string>
-                        <key>begin</key>
-                        <string>\[</string>
-                        <key>end</key>
-                        <string>\]</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>include</key>
-                                <string>#attributes</string>
-                            </dict>
-                            <dict>
-                                <key>include</key>
-                                <string>#comments</string>
-                            </dict>
-                            <dict>
-                                <key>include</key>
-                                <string>#keywords</string>
-                            </dict>
-                            <dict>
-                                <key>include</key>
-                                <string>#literals</string>
-                            </dict>
-                        </array>
-                    </dict>
-                </array>
-            </dict>
-            <key>messageName</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>entity.name.class.zebusmsg</string>
-                        <key>match</key>
-                        <string>\w+(?=\s*[(&lt;])</string>
-                    </dict>
-                    <dict>
-                        <key>name</key>
-                        <string>entity.name.type.zebusmsg</string>
-                        <key>match</key>
-                        <string>\w+(?=\s*!\s*\()</string>
-                    </dict>
-                </array>
-            </dict>
-            <key>keywords</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>keyword.control.zebusmsg</string>
-                        <key>match</key>
-                        <string>
-                            \b(this|base|as|is|new|sizeof|typeof|stackalloc|true|false|else|if|switch|case|default|do|for|foreach|in|while|lock|break|continue|goto|return|try|throw|catch|finally|checked|unchecked|fixed|unsafe|class|interface|delegate|explicit|implicit|operator|params|ref|out|abstract|const|event|extern|override|readonly|sealed|static|virtual|volatile|public|protected|private|internal|namespace|using|get|set|add|remove|null|bool|byte|char|decimal|double|enum|float|int|long|sbyte|short|struct|uint|ushort|ulong|object|string|void|DateTime|Guid)\b
-                        </string>
-                    </dict>
-                </array>
-            </dict>
-            <key>literals</key>
-            <dict>
-                <key>patterns</key>
-                <array>
-                    <dict>
-                        <key>name</key>
-                        <string>string.quoted.double.zebusmsg</string>
-                        <key>begin</key>
-                        <string>"</string>
-                        <key>end</key>
-                        <string>"</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>name</key>
-                                <string>
-                                    constant.character.escape.zebusmsg
-                                </string>
-                                <key>match</key>
-                                <string>\\.</string>
-                            </dict>
-                        </array>
-                    </dict>
-                    <dict>
-                        <key>name</key>
-                        <string>string.quoted.double.zebusmsg</string>
-                        <key>begin</key>
-                        <string>@"</string>
-                        <key>end</key>
-                        <string>"(?!")</string>
-                        <key>patterns</key>
-                        <array>
-                            <dict>
-                                <key>name</key>
-                                <string>
-                                    constant.character.escape.zebusmsg
-                                </string>
-                                <key>match</key>
-                                <string>""</string>
-                            </dict>
-                        </array>
-                    </dict>
-                    <dict>
-                        <key>name</key>
-                        <string>string.quoted.single.zebusmsg</string>
-                        <key>match</key>
-                        <string>'(\\.|.)'</string>
-                    </dict>
-                    <dict>
-                        <key>name</key>
-                        <string>constant.numeric</string>
-                        <key>match</key>
-                        <string>
-                            \b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?
-                        </string>
-                    </dict>
-                </array>
-            </dict>
-        </dict>
-    </dict>
-</plist>
diff --git a/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage.json b/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage.json
index b518130..e505cbb 100644
--- a/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage.json
+++ b/src/Abc.Zebus.MessageDsl.TmBundle/zebus-messagedsl/Syntaxes/zebusmsg.tmLanguage.json
@@ -21,13 +21,13 @@
                     "include": "#pragma"
                 },
                 {
-                    "include": "#attributes"
+                    "include": "#keywords"
                 },
                 {
-                    "include": "#messageName"
+                    "include": "#attributes"
                 },
                 {
-                    "include": "#keywords"
+                    "include": "#messageName"
                 },
                 {
                     "include": "#literals"
@@ -70,7 +70,7 @@
             "patterns": [
                 {
                     "name": "meta.preprocessor.zebusmsg",
-                    "begin": "^\\s*#\\s*\\pragma\\b",
+                    "begin": "^\\s*#\\s*pragma\\b",
                     "end": "$",
                     "patterns": [
                         {
@@ -107,7 +107,7 @@
             "patterns": [
                 {
                     "name": "entity.name.class.zebusmsg",
-                    "match": "\\w+(?=\\s*[(<])"
+                    "match": "\\w+(?=\\s*([\\[(<?]|\\b\\w))"
                 },
                 {
                     "name": "entity.name.type.zebusmsg",
@@ -119,7 +119,7 @@
             "patterns": [
                 {
                     "name": "keyword.control.zebusmsg",
-                    "match": "\\b(this|base|as|is|new|sizeof|typeof|stackalloc|true|false|else|if|switch|case|default|do|for|foreach|in|while|lock|break|continue|goto|return|try|throw|catch|finally|checked|unchecked|fixed|unsafe|class|interface|delegate|explicit|implicit|operator|params|ref|out|abstract|const|event|extern|override|readonly|sealed|static|virtual|volatile|public|protected|private|internal|namespace|using|get|set|add|remove|null|bool|byte|char|decimal|double|enum|float|int|long|sbyte|short|struct|uint|ushort|ulong|object|string|void|DateTime|Guid)\\b"
+                    "match": "\\b(abstract|add|alias|as|ascending|async|await|base|bool|break|by|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|descending|do|double|dynamic|else|enum|equals|event|explicit|extern|false|finally|fixed|float|for|foreach|from|get|global|goto|group|if|implicit|in|int|interface|internal|into|is|join|let|lock|long|nameof|namespace|new|null|object|on|operator|orderby|out|override|params|partial|private|protected|public|readonly|ref|remove|return|sbyte|sealed|select|set|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|value|var|virtual|void|volatile|when|where|while|yield)\\b"
                 }
             ]
         },