diff --git a/package-lock.json b/package-lock.json
index 42ccc8fd9..083af5e74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "pxt-blockly",
-  "version": "3.1.3",
+  "version": "4.0.0",
   "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": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-2.6.1.tgz",
+      "integrity": "sha512-mv7u3x/Z2qA2PCSPomz0S4ofQn+m/UHC/AoNu1FZuwNAwuE5SCy7HCTDracpKWqoK8iuXwi4PWUdu669CDbp5A==",
       "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": "^1.1.5",
+        "@blockly/theme-dark": "^2.0.6",
+        "@blockly/theme-deuteranopia": "^1.0.7",
+        "@blockly/theme-highcontrast": "^1.0.7",
+        "@blockly/theme-tritanopia": "^1.0.7",
         "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": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-1.1.5.tgz",
+          "integrity": "sha512-lSDPuwOIEn8DLOzOLu/xNX6U4E4ps+9o5epxJ1JXxBjHqIBw7ghihHfsvuZ1c+rSsBnKGgwBzh5odq6ynIV2GQ==",
           "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": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.6.tgz",
+      "integrity": "sha512-2gPz3Iw+VjBFaNhoYXm/zRA2Xhe/nDnpOyPxbav7sGs4XcO4F0yPruuXxBm7oGGbGudmxmJXhTdmV+4d8MpvSg==",
       "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": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.7.tgz",
+      "integrity": "sha512-m2Jo6lCYnVn3eLzmBoSBN31t2qQ8fAjEJmcUBcpJ56TGB1gks1vGVJHg/yhcK+vUB85IFuUUUJ6+MOjhEZFOvQ==",
       "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": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.7.tgz",
+      "integrity": "sha512-FI/LyP/gGCatpeKvKTLSyColgyHETKSFo5RrgbZ+GTgVAQxXAj7MQ4DZDtlWECOKaT6WGQLNk5OserBXMCtDbQ==",
       "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": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.7.tgz",
+      "integrity": "sha512-Y6d8ZR3y9iz1GdihHbSYGTIwWEanWtp0tYPtsVx3QlcKMuc+NyAtGQVE324ZTA+N1ayH4L31CGRAAo7AAm3gPA==",
       "dev": true
     },
     "@eslint/eslintrc": {