diff --git a/package-lock.json b/package-lock.json
index e84db51bc..3a93beaed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@blockly/block-test": "^2.0.1",
-        "@blockly/dev-tools": "^3.0.1",
+        "@blockly/dev-tools": "^4.0.2",
         "@blockly/theme-modern": "^2.1.1",
         "@hyperjump/json-schema": "^0.18.4",
         "@wdio/selenium-standalone-service": "^7.10.1",
@@ -155,9 +155,9 @@
       }
     },
     "node_modules/@blockly/block-test": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.15.tgz",
-      "integrity": "sha512-S9A763PH1ILv/OnXHJtwdDX0obHupXlh2ccai4/6ddaNt1cm6ePBjm7t2iNNAGT3vlgum/GpEdG02LtwNCfohA==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.17.tgz",
+      "integrity": "sha512-nOnNV2vOEsWrGgn9LerSKZpv+nF9Og3IKJO+pUtAfu8XDDzu0C6Veq1bsUEGfXDpJCaoexwn8NiZtqJwl2F7DQ==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
@@ -167,16 +167,16 @@
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.1.8.tgz",
-      "integrity": "sha512-NspvkxClFlBsYe9mxfi51QuVFYtUVcKtG9OmtxEoapk1G6K1JDp3jtwUfNd3U2UjMmFHZMP9OaJC5nQQBye3hw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-4.0.2.tgz",
+      "integrity": "sha512-Vb26ATIGRR/qm3D09OOZqghgaabkzT77OZOzvvAp5UY302a/GT15bTKsdZ1jtK/sGA4ZuBvC+3q5E+sJG9cDTQ==",
       "dev": true,
       "dependencies": {
-        "@blockly/block-test": "^2.0.14",
-        "@blockly/theme-dark": "^3.0.13",
-        "@blockly/theme-deuteranopia": "^2.0.13",
-        "@blockly/theme-highcontrast": "^2.0.13",
-        "@blockly/theme-tritanopia": "^2.0.13",
+        "@blockly/block-test": "^2.0.17",
+        "@blockly/theme-dark": "^3.0.16",
+        "@blockly/theme-deuteranopia": "^2.0.16",
+        "@blockly/theme-highcontrast": "^2.0.16",
+        "@blockly/theme-tritanopia": "^2.0.16",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -188,13 +188,13 @@
         "node": ">=8.0.0"
       },
       "peerDependencies": {
-        "blockly": ">=7 <9"
+        "blockly": ">=8 <9"
       }
     },
     "node_modules/@blockly/theme-dark": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-3.0.13.tgz",
-      "integrity": "sha512-1ArhXFtd1BwFj8u5XegQeKYKZr8kfxNaSLbRrFPRidwhe/wFOuqAvKmVrhLvGAYfrT3+8JnrPNnYF4ouvSs+7Q==",
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-3.0.16.tgz",
+      "integrity": "sha512-a76DRJNcJ7TgCLkHevICUzhkMRYYdPpcg24OPuKMEnzrSUblT+VHuuElVLBDNs24wR/SRCnXC3qAiXwYi/bzdg==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
@@ -204,9 +204,9 @@
       }
     },
     "node_modules/@blockly/theme-deuteranopia": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-2.0.13.tgz",
-      "integrity": "sha512-tT+7slNnTWXtc+JkJVTqSQZ4OLSu9agV18pOopK2aTz+16K2xPa85N7GQxN+4D85sIcS0YUfEaJkC3gTt0SN0w==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-2.0.16.tgz",
+      "integrity": "sha512-8lgh5AGIfANugVO9EQJ5woy6JZ8BUvlxxky0iRab6nIVDAlA6m4k+HiqKUbEThBh69vlvMObwZW2DNcxVpcVrA==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
@@ -216,9 +216,9 @@
       }
     },
     "node_modules/@blockly/theme-highcontrast": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-2.0.13.tgz",
-      "integrity": "sha512-oJ7EagSp9BOazH9S/7J6Z4T6zTVdupYBzewXudkI2HGE7pBiJPoj4+jb9fe3Sn9bXQrzlKhZ6em6y26leua+WQ==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-2.0.16.tgz",
+      "integrity": "sha512-3ffHBxmdQea7NcsWBNCgGctW6fNeHHIK5S9PQ4994p1i4FLID9cQCrIRdCvodkAvmUrBa4nFe1LXveGX6GsIPw==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
@@ -240,9 +240,9 @@
       }
     },
     "node_modules/@blockly/theme-tritanopia": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.13.tgz",
-      "integrity": "sha512-GYkuFhBywZl62nNlCSFJS6mv5xuKkdX/od1G+fnCNSIldR5T/ZsjstSmG/Orqa4/53LmCH71onRs/vvfDW90Jw==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.16.tgz",
+      "integrity": "sha512-hOb8KFcFpZX3KPFNgCv4wPJrvyX742pVdn3nWmmpWaAaKD26NeaFmbh4F+Y2HQBQ0OIbvlX+R9e8PUBDVMGadw==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
@@ -2009,9 +2009,9 @@
       }
     },
     "node_modules/blockly": {
-      "version": "7.20211209.2",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-7.20211209.2.tgz",
-      "integrity": "sha512-74HTPbnDOwVGKx6qRE/ZVVQwf+J9s/WkgDKv0vuXw/DtBLvLrew7Nf5jaZP0+DXRVJpP1u5sfu+qtHaom0i6Ug==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-8.0.4.tgz",
+      "integrity": "sha512-qGYrynzalzEHOMLJhZmADpuMXUH55nSTVgVd11Z1ZlVsm3NQ69ZVgBEaCSN+GsEUUpoui71g4oVzE2iHEHbAtw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -13079,23 +13079,23 @@
       }
     },
     "@blockly/block-test": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.15.tgz",
-      "integrity": "sha512-S9A763PH1ILv/OnXHJtwdDX0obHupXlh2ccai4/6ddaNt1cm6ePBjm7t2iNNAGT3vlgum/GpEdG02LtwNCfohA==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/@blockly/block-test/-/block-test-2.0.17.tgz",
+      "integrity": "sha512-nOnNV2vOEsWrGgn9LerSKZpv+nF9Og3IKJO+pUtAfu8XDDzu0C6Veq1bsUEGfXDpJCaoexwn8NiZtqJwl2F7DQ==",
       "dev": true,
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.1.8.tgz",
-      "integrity": "sha512-NspvkxClFlBsYe9mxfi51QuVFYtUVcKtG9OmtxEoapk1G6K1JDp3jtwUfNd3U2UjMmFHZMP9OaJC5nQQBye3hw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-4.0.2.tgz",
+      "integrity": "sha512-Vb26ATIGRR/qm3D09OOZqghgaabkzT77OZOzvvAp5UY302a/GT15bTKsdZ1jtK/sGA4ZuBvC+3q5E+sJG9cDTQ==",
       "dev": true,
       "requires": {
-        "@blockly/block-test": "^2.0.14",
-        "@blockly/theme-dark": "^3.0.13",
-        "@blockly/theme-deuteranopia": "^2.0.13",
-        "@blockly/theme-highcontrast": "^2.0.13",
-        "@blockly/theme-tritanopia": "^2.0.13",
+        "@blockly/block-test": "^2.0.17",
+        "@blockly/theme-dark": "^3.0.16",
+        "@blockly/theme-deuteranopia": "^2.0.16",
+        "@blockly/theme-highcontrast": "^2.0.16",
+        "@blockly/theme-tritanopia": "^2.0.16",
         "chai": "^4.2.0",
         "dat.gui": "^0.7.7",
         "lodash.assign": "^4.2.0",
@@ -13105,23 +13105,23 @@
       }
     },
     "@blockly/theme-dark": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-3.0.13.tgz",
-      "integrity": "sha512-1ArhXFtd1BwFj8u5XegQeKYKZr8kfxNaSLbRrFPRidwhe/wFOuqAvKmVrhLvGAYfrT3+8JnrPNnYF4ouvSs+7Q==",
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-3.0.16.tgz",
+      "integrity": "sha512-a76DRJNcJ7TgCLkHevICUzhkMRYYdPpcg24OPuKMEnzrSUblT+VHuuElVLBDNs24wR/SRCnXC3qAiXwYi/bzdg==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-deuteranopia": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-2.0.13.tgz",
-      "integrity": "sha512-tT+7slNnTWXtc+JkJVTqSQZ4OLSu9agV18pOopK2aTz+16K2xPa85N7GQxN+4D85sIcS0YUfEaJkC3gTt0SN0w==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-2.0.16.tgz",
+      "integrity": "sha512-8lgh5AGIfANugVO9EQJ5woy6JZ8BUvlxxky0iRab6nIVDAlA6m4k+HiqKUbEThBh69vlvMObwZW2DNcxVpcVrA==",
       "dev": true,
       "requires": {}
     },
     "@blockly/theme-highcontrast": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-2.0.13.tgz",
-      "integrity": "sha512-oJ7EagSp9BOazH9S/7J6Z4T6zTVdupYBzewXudkI2HGE7pBiJPoj4+jb9fe3Sn9bXQrzlKhZ6em6y26leua+WQ==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-2.0.16.tgz",
+      "integrity": "sha512-3ffHBxmdQea7NcsWBNCgGctW6fNeHHIK5S9PQ4994p1i4FLID9cQCrIRdCvodkAvmUrBa4nFe1LXveGX6GsIPw==",
       "dev": true,
       "requires": {}
     },
@@ -13133,9 +13133,9 @@
       "requires": {}
     },
     "@blockly/theme-tritanopia": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.13.tgz",
-      "integrity": "sha512-GYkuFhBywZl62nNlCSFJS6mv5xuKkdX/od1G+fnCNSIldR5T/ZsjstSmG/Orqa4/53LmCH71onRs/vvfDW90Jw==",
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.16.tgz",
+      "integrity": "sha512-hOb8KFcFpZX3KPFNgCv4wPJrvyX742pVdn3nWmmpWaAaKD26NeaFmbh4F+Y2HQBQ0OIbvlX+R9e8PUBDVMGadw==",
       "dev": true,
       "requires": {}
     },
@@ -14551,9 +14551,9 @@
       }
     },
     "blockly": {
-      "version": "7.20211209.2",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-7.20211209.2.tgz",
-      "integrity": "sha512-74HTPbnDOwVGKx6qRE/ZVVQwf+J9s/WkgDKv0vuXw/DtBLvLrew7Nf5jaZP0+DXRVJpP1u5sfu+qtHaom0i6Ug==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-8.0.4.tgz",
+      "integrity": "sha512-qGYrynzalzEHOMLJhZmADpuMXUH55nSTVgVd11Z1ZlVsm3NQ69ZVgBEaCSN+GsEUUpoui71g4oVzE2iHEHbAtw==",
       "dev": true,
       "peer": true,
       "requires": {
diff --git a/package.json b/package.json
index 727a9ba3e..da496d750 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@blockly/block-test": "^2.0.1",
-    "@blockly/dev-tools": "^3.0.1",
+    "@blockly/dev-tools": "^4.0.2",
     "@blockly/theme-modern": "^2.1.1",
     "@hyperjump/json-schema": "^0.18.4",
     "@wdio/selenium-standalone-service": "^7.10.1",