diff --git a/package.json b/package.json
index b1df4d2..33614ac 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
           "light": "./icons/opengoal-goos.png",
           "dark": "./icons/opengoal-goos.png"
         },
-        "configuration": "./language-configuration.json"
+        "configuration": "./syntaxes/configs/opengoal-goos.jsonc"
       },
       {
         "id": "opengoal-ir",
@@ -152,7 +152,7 @@
           "light": "./icons/opengoal-ir.png",
           "dark": "./icons/opengoal-ir.png"
         },
-        "configuration": "./syntaxes/configs/ir.jsonc"
+        "configuration": "./syntaxes/configs/opengoal-ir.jsonc"
       }
     ],
     "grammars": [
diff --git a/syntaxes/configs/opengoal-goos.jsonc b/syntaxes/configs/opengoal-goos.jsonc
new file mode 100644
index 0000000..3217501
--- /dev/null
+++ b/syntaxes/configs/opengoal-goos.jsonc
@@ -0,0 +1,32 @@
+{
+  "comments": {
+    "lineComment": ";;",
+    // symbols used for start and end a block comment. Remove this entry if your language does not support block comments
+    "blockComment": ["#|", "|#"]
+  },
+  // symbols used as brackets
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  // symbols that are auto closed when typing
+  "autoClosingPairs": [
+    ["(", ")"],
+    ["\"", "\""]
+  ],
+  // symbols that can be used to surround a selection
+  "surroundingPairs": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+    ["\"", "\""]
+  ],
+  "folding": {
+    "markers": {
+      "start": "\\(\\s*$",
+      "end": "^\\s*\\)"
+    }
+  },
+  "wordPattern": "[^\\s,\\(\\)]+"
+}
diff --git a/syntaxes/configs/ir.jsonc b/syntaxes/configs/opengoal-ir.jsonc
similarity index 88%
rename from syntaxes/configs/ir.jsonc
rename to syntaxes/configs/opengoal-ir.jsonc
index 72eac3a..f11858e 100644
--- a/syntaxes/configs/ir.jsonc
+++ b/syntaxes/configs/opengoal-ir.jsonc
@@ -14,5 +14,6 @@
       "start": "^; \\.function.*",
       "end": "^;; \\.endfunction\\b"
     }
-  }
+  },
+  "wordPattern": "[^\\s,\\(\\)]+"
 }
diff --git a/syntaxes/configs/opengoal.jsonc b/syntaxes/configs/opengoal.jsonc
index 759ce1d..3217501 100644
--- a/syntaxes/configs/opengoal.jsonc
+++ b/syntaxes/configs/opengoal.jsonc
@@ -27,5 +27,6 @@
       "start": "\\(\\s*$",
       "end": "^\\s*\\)"
     }
-  }
+  },
+  "wordPattern": "[^\\s,\\(\\)]+"
 }