diff --git a/package-lock.json b/package-lock.json
index 039e32f48..6a43a522d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "pxt-blockly",
-  "version": "4.0.0",
+  "version": "4.0.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -205,16 +205,16 @@
       "dev": true
     },
     "@blockly/dev-tools": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.4.0.tgz",
-      "integrity": "sha512-47bSJzuBl2I7oKeVcCAuwrGYsk7GbDCh2Vmy0rUnPE4S/J8otnA1DEHT6x1xzl/o7nNG0D76QE+hYAuFdgpxAQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.1.3.tgz",
+      "integrity": "sha512-Xum4OWYoq+dqHT3HsHgWcuP24qO7JI5lAjuEHHCVPitDKgIKO7ONPAv0IrA5OyfHZuwO13bNfza71Vrmckw5/w==",
       "dev": true,
       "requires": {
-        "@blockly/block-test": "^1.1.0",
-        "@blockly/theme-dark": "^2.0.0",
-        "@blockly/theme-deuteranopia": "^1.0.1",
-        "@blockly/theme-highcontrast": "^1.0.1",
-        "@blockly/theme-tritanopia": "^1.0.1",
+        "@blockly/block-test": "^2.0.9",
+        "@blockly/theme-dark": "^3.0.8",
+        "@blockly/theme-deuteranopia": "^2.0.8",
+        "@blockly/theme-highcontrast": "^2.0.8",
+        "@blockly/theme-tritanopia": "^2.0.8",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -224,9 +224,9 @@
       },
       "dependencies": {
         "@blockly/block-test": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.0.tgz",
-          "integrity": "sha512-CxIgs1R+7G4ulPf+Op6q3JzpDMVUvQ8vZBQsbarDyC4vFkie1wU1gF0sweobiSPi6TvhZKtLokj6PctuEiveeA==",
+          "version": "2.0.9",
+          "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.9.tgz",
+          "integrity": "sha512-H1ScB0C4m2NdKgZmn0NoPE/X9CDhNDq5An/KE5sXBoo67aGgpdIv0i8d6sRq7ynx9lNwcZnNgq35s0H9fPdXRg==",
           "dev": true
         },
         "has-flag": {
@@ -261,21 +261,21 @@
       }
     },
     "@blockly/theme-dark": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.0.tgz",
-      "integrity": "sha512-7kGMYpHRQN94eXy98M+n3XeLDxEgMrGNYUuGiW/6j9PJeyKPf172oVG9qUz7mmdGK+zqe7wuVrJ+huHxKzNXog==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-3.0.8.tgz",
+      "integrity": "sha512-36EFsxThu9e4C9yF19GOPmMpxqpnx0yIw9izbk3BRWfx6kKxDvy/MkgIaxScT3/nHcnxIpELlh54sTSli5n7RQ==",
       "dev": true
     },
     "@blockly/theme-deuteranopia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.1.tgz",
-      "integrity": "sha512-68dsW6YqDroT1Yz3pZRcC7DvsZL7Ae5XXFSGG6t/y2HceD5COoHdSaLssTReAhZdlO2lUQcyXVKMpns+R6GzWg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-2.0.8.tgz",
+      "integrity": "sha512-b+oZ23+Z1JntjYhd6IUPfG/3ydSRfds9Wm+icbdYUzWCVneFUgkDnhkSh42rYeTukSd5NdkE8FmhTA6BYt8W0g==",
       "dev": true
     },
     "@blockly/theme-highcontrast": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.1.tgz",
-      "integrity": "sha512-t3Ss8vLuxRAi9fxZ/gqJSAY82z/O+q2L9VFNTl80Yf3JgVMEwOB0kTnQettuBx9pMFKTBhlgrBB1L4UmWHx6Iw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-2.0.8.tgz",
+      "integrity": "sha512-JWMkH8EjqU0S4zbrQdtexWzw4D+c20eMX8GevwFChiSGc3DmwRkwnAfKTw3o3OxicAQm+9A6Mqz+b1QF7J5QzQ==",
       "dev": true
     },
     "@blockly/theme-modern": {
@@ -285,9 +285,9 @@
       "dev": true
     },
     "@blockly/theme-tritanopia": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.1.tgz",
-      "integrity": "sha512-/EdNgcf/zSJjrOSzh5JIRBfIYiAQhApp6/Aq6xSqmid3qXChLllgCoSoHpktBD91qoJReHjN6WWOczeQHLMN0g==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.8.tgz",
+      "integrity": "sha512-eydBD5jJAopbmnSD/c7oDRaZpK0ccxPwU7uHTeqKfwGOLCGZg6X4CrBtV9UXXOrw385VfDrabJ3JPMmM70WqNg==",
       "dev": true
     },
     "@eslint/eslintrc": {
@@ -3160,9 +3160,9 @@
       }
     },
     "dat.gui": {
-      "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz",
-      "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==",
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.9.tgz",
+      "integrity": "sha512-sCNc1OHobc+Erc1HqiswYgHdVNpSJUlk/Hz8vzOCsER7rl+oF/4+v8GXFUyCgtXpoCX6+bnmg07DedLvBLwYKQ==",
       "dev": true
     },
     "data-urls": {
diff --git a/package.json b/package.json
index f0533fae3..a436f1456 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@blockly/block-test": "^1.0.0",
-    "@blockly/dev-tools": "^2.0.1",
+    "@blockly/dev-tools": "^3.1.3",
     "@blockly/theme-modern": "^2.1.1",
     "@wdio/selenium-standalone-service": "^6.11.0",
     "babel-eslint": "^10.1.0",