diff --git a/package-lock.json b/package-lock.json
index 18f96973..db93b591 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "schemio",
-  "version": "0.21.11",
+  "version": "0.22.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "schemio",
-      "version": "0.21.11",
+      "version": "0.22.0",
       "license": "MPL-2.0",
       "dependencies": {
         "@electron-forge/maker-dmg": "^6.0.1",
@@ -52,7 +52,7 @@
         "axios": "^0.22.0",
         "babel-loader": "^8.2.2",
         "codemirror": "^6.0.1",
-        "codemirror-lang-schemioscript": "^0.1.0",
+        "codemirror-lang-schemioscript": "^0.1.1",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.1",
         "electron": "21.2.3",
@@ -5894,9 +5894,9 @@
       }
     },
     "node_modules/codemirror-lang-schemioscript": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/codemirror-lang-schemioscript/-/codemirror-lang-schemioscript-0.1.0.tgz",
-      "integrity": "sha512-B7auQCKpsJYKQjiidltLUaok19orbK0P90hgwR7IdmB8AOoTn2+PI1Oaer+UPVrlYSsC8a5FatbyMMWHocGIPg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/codemirror-lang-schemioscript/-/codemirror-lang-schemioscript-0.1.1.tgz",
+      "integrity": "sha512-nTW122rtYS/AWZo0muhim/Nd4Cjx10S+Qr71GU0ojpfPORICZw42iyYDkUZvnFyRK8GGbziJK1JWzRy03KD2vw==",
       "dev": true,
       "dependencies": {
         "@codemirror/autocomplete": "^6.18.4",
@@ -22330,9 +22330,9 @@
       }
     },
     "codemirror-lang-schemioscript": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/codemirror-lang-schemioscript/-/codemirror-lang-schemioscript-0.1.0.tgz",
-      "integrity": "sha512-B7auQCKpsJYKQjiidltLUaok19orbK0P90hgwR7IdmB8AOoTn2+PI1Oaer+UPVrlYSsC8a5FatbyMMWHocGIPg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/codemirror-lang-schemioscript/-/codemirror-lang-schemioscript-0.1.1.tgz",
+      "integrity": "sha512-nTW122rtYS/AWZo0muhim/Nd4Cjx10S+Qr71GU0ojpfPORICZw42iyYDkUZvnFyRK8GGbziJK1JWzRy03KD2vw==",
       "dev": true,
       "requires": {
         "@codemirror/autocomplete": "^6.18.4",
diff --git a/package.json b/package.json
index c23aa6fc..2cc890a8 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "axios": "^0.22.0",
     "babel-loader": "^8.2.2",
     "codemirror": "^6.0.1",
-    "codemirror-lang-schemioscript": "^0.1.0",
+    "codemirror-lang-schemioscript": "^0.1.1",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "electron": "21.2.3",
diff --git a/src/ui/components/editor/Scripts.js b/src/ui/components/editor/Scripts.js
index 21c29467..d2e3580d 100644
--- a/src/ui/components/editor/Scripts.js
+++ b/src/ui/components/editor/Scripts.js
@@ -260,6 +260,10 @@ export const draculaTheme = createTheme({
 			tag: t.derefOperator,
 			color: '#E0E0E0',
 		},
+		{
+			tag: t.macroName,
+			color: '#F5B360',
+		},
 		{
 			tag: t.attributeName,
 			color: '#7BACCA',