diff --git a/grammars/rescript.tmLanguage.json b/grammars/rescript.tmLanguage.json
index 5990a9476..a967d3c28 100644
--- a/grammars/rescript.tmLanguage.json
+++ b/grammars/rescript.tmLanguage.json
@@ -55,7 +55,7 @@
         }
       ]
     },
-    "punctuations": {
+    "punctuation": {
       "patterns": [
         {
           "match": "~",
@@ -89,6 +89,14 @@
           "match": "\\}",
           "name": "punctuation.section.braces.end"
         },
+        {
+          "match": "\\[",
+          "name": "punctuation.section.brackets.begin"
+        },
+        {
+          "match": "\\]",
+          "name": "punctuation.section.brackets.end"
+        },
         {
           "match": "\\(",
           "name": "punctuation.section.parens.begin"
@@ -188,7 +196,7 @@
                   "include": "#operator"
                 },
                 {
-                  "include": "#punctuations"
+                  "include": "#punctuation"
                 },
                 {
                   "include": "#string"
@@ -289,18 +297,6 @@
         }
       ]
     },
-    "bracketAccess": {
-      "patterns": [
-        {
-          "match": "\\[",
-          "name": "punctuation.section.brackets.begin"
-        },
-        {
-          "match": "\\]",
-          "name": "punctuation.section.brackets.end"
-        }
-      ]
-    },
     "list": {
       "patterns": [
         {
@@ -542,74 +538,27 @@
     }
   },
   "patterns": [
-    {
-      "include": "#storage"
-    },
-    {
-      "include": "#ffi-single"
-    },
-    {
-      "include": "#ffi"
-    },
-    {
-      "include": "#constant"
-    },
-    {
-      "include": "#commentLine"
-    },
-    {
-      "include": "#commentBlock"
-    },
-    {
-      "include": "#character"
-    },
-    {
-      "include": "#typeParameter"
-    },
-    {
-      "include": "#string"
-    },
-    {
-      "include": "#attribute"
-    },
-    {
-      "include": "#function"
-    },
-    {
-      "include": "#list"
-    },
-    {
-      "include": "#bracketAccess"
-    },
-    {
-      "include": "#jsx"
-    },
-    {
-      "include": "#operator"
-    },
-    {
-      "include": "#number"
-    },
-    {
-      "include": "#openOrIncludeModule"
-    },
-    {
-      "include": "#moduleDeclaration"
-    },
-    {
-      "include": "#moduleAccess"
-    },
-    {
-      "include": "#constructor"
-    },
-    {
-      "include": "#keyword"
-    },
-    {
-      "include": "#punctuations"
-    },
-    {
-      "include": "#defaultIdIsVariable"
-    }
+    { "include": "#storage" },
+    { "include": "#ffi-single" },
+    { "include": "#ffi" },
+    { "include": "#constant" },
+    { "include": "#commentLine" },
+    { "include": "#commentBlock" },
+    { "include": "#character" },
+    { "include": "#typeParameter" },
+    { "include": "#string" },
+    { "include": "#attribute" },
+    { "include": "#function" },
+    { "include": "#list" },
+    { "include": "#jsx" },
+    { "include": "#operator" },
+    { "include": "#number" },
+    { "include": "#openOrIncludeModule" },
+    { "include": "#moduleDeclaration" },
+    { "include": "#moduleAccess" },
+    { "include": "#constructor" },
+    { "include": "#keyword" },
+    { "include": "#punctuation" },
+    { "include": "#defaultIdIsVariable" }
   ]
 }