diff --git a/package-lock.json b/package-lock.json
index 039e32f48..970bf540a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "pxt-blockly",
-  "version": "4.0.0",
+  "version": "4.0.15",
   "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": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-7.0.0.tgz",
+      "integrity": "sha512-8HR1JobHd7DxUPQiyAyP1e2PuXtJ47Y244PS6wBL3PJBlr3YGmFMiUuCYyBNEB6WB7uhIFPQROEeNZ6ahrPCAg==",
       "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": "^4.0.1",
+        "@blockly/theme-dark": "^5.0.0",
+        "@blockly/theme-deuteranopia": "^4.0.0",
+        "@blockly/theme-highcontrast": "^4.0.0",
+        "@blockly/theme-tritanopia": "^4.0.0",
         "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": "4.0.1",
+          "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-4.0.1.tgz",
+          "integrity": "sha512-9obFj6QfNzcOxeriMPPicfa6bGANZXwWhT8vIYJ6ljcXf/8YsP4uE8f3XPtsUn+JWKdejCm8OqauTa8fJuKKxw==",
           "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": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-5.0.0.tgz",
+      "integrity": "sha512-5hX7U+YA/G/pcBDzndBT2nNKYG2vElp8oPO4D/Fwv/00/OR0V7iI+OAFZ2lEK2UES6uU0dKe4TKE6cwOwDuoJA==",
       "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": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-4.0.0.tgz",
+      "integrity": "sha512-Pebs5q4BwbWeWGHHcb7IBYGK45YJ+dKau9QNjABeB3/vhDyEai5tGHezNyG0X1DsLw0T2wh6Dkao/z5mRflbUQ==",
       "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": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-4.0.0.tgz",
+      "integrity": "sha512-Kb5u8UIaaeoDv66zKWDZmOQhlg32c688FqsWm523Cb3k1qjBIcloZ0/hX05lq9KhmtB1vF8aHtQeC78EJ5Gm2Q==",
       "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": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-4.0.0.tgz",
+      "integrity": "sha512-PMMhcCJyxP7sZhrxNanzw/F0Q/Dsf5U6CPXdRadbcs9iv/K1U0X+LP4XRWuNPfp6iDTX2N9G8YCcWC24rlp2CQ==",
       "dev": true
     },
     "@eslint/eslintrc": {
@@ -378,9 +378,9 @@
       "dev": true
     },
     "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -407,9 +407,9 @@
       }
     },
     "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
       "dev": true
     },
     "@szmarczak/http-timer": {
@@ -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": {
@@ -7146,7 +7146,7 @@
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==",
       "dev": true
     },
     "lodash.clonedeep": {
@@ -7176,7 +7176,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
     "lodash.isobject": {
@@ -8834,7 +8834,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index ce0a82314..8aa8173fd 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": "^7.0.0",
     "@blockly/theme-modern": "^2.1.1",
     "@wdio/selenium-standalone-service": "^6.11.0",
     "babel-eslint": "^10.1.0",