diff --git a/package-lock.json b/package-lock.json
index e1b4eb846..3737b4478 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -167,16 +167,16 @@
       }
     },
     "node_modules/@blockly/dev-tools": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.0.7.tgz",
-      "integrity": "sha512-s55teQLYNKOtWZIngce2WFy052CrEGPMfhRzQgFKlrTfVafr+iZc+E4MTIY1J9R2Zw5uKnfxULV8LfNrwcH+fA==",
+      "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,
       "dependencies": {
-        "@blockly/block-test": "^2.0.4",
-        "@blockly/theme-dark": "^2.0.7",
-        "@blockly/theme-deuteranopia": "^1.0.8",
-        "@blockly/theme-highcontrast": "^1.0.8",
-        "@blockly/theme-tritanopia": "^1.0.8",
+        "@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",
@@ -188,43 +188,43 @@
         "node": ">=8.0.0"
       },
       "peerDependencies": {
-        "blockly": "^7.20211209.0"
+        "blockly": "7 - 8"
       }
     },
     "node_modules/@blockly/theme-dark": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.7.tgz",
-      "integrity": "sha512-sErL00Uaa0yBviBWpNT0tobaty5BYb+xbE3LwSsot7P/4u/j+pD+oKS8fqt8xsWxbtn67zL8PARmaP3KVe4+Aw==",
+      "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,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 7"
+        "blockly": "7 - 8"
       }
     },
     "node_modules/@blockly/theme-deuteranopia": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.8.tgz",
-      "integrity": "sha512-/9aDJCUuyDJ4OSHr2lCJRpqBLSvgV8YP7uCeCKuoY3uMnMKTxEcJ/AUma+oF98os+i3/GeNzCMYQ/6bdlCXRIQ==",
+      "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,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 7"
+        "blockly": "7 - 8"
       }
     },
     "node_modules/@blockly/theme-highcontrast": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.8.tgz",
-      "integrity": "sha512-A9bvQpmNtsn3W3pWa0NRttBm1IeIhV6zGAp4ziY+GU0kNGZDgbrP10JJKfz3dv+RCaXmslE9kS25RU/LYJjB/Q==",
+      "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,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 7"
+        "blockly": "7 - 8"
       }
     },
     "node_modules/@blockly/theme-modern": {
@@ -240,15 +240,15 @@
       }
     },
     "node_modules/@blockly/theme-tritanopia": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.8.tgz",
-      "integrity": "sha512-61G8VB5a8F9eRMYAXpeRia/DrRRfAnUqpA62pksvtcRwMoztwhToUHHkSYuOHxpDpKG/rTlaFtf/GUHFFaFHEQ==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.8.tgz",
+      "integrity": "sha512-eydBD5jJAopbmnSD/c7oDRaZpK0ccxPwU7uHTeqKfwGOLCGZg6X4CrBtV9UXXOrw385VfDrabJ3JPMmM70WqNg==",
       "dev": true,
       "engines": {
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "3.20200123.0 - 7"
+        "blockly": "7 - 8"
       }
     },
     "node_modules/@eslint/eslintrc": {
@@ -12734,16 +12734,16 @@
       "requires": {}
     },
     "@blockly/dev-tools": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/dev-tools/-/dev-tools-3.0.7.tgz",
-      "integrity": "sha512-s55teQLYNKOtWZIngce2WFy052CrEGPMfhRzQgFKlrTfVafr+iZc+E4MTIY1J9R2Zw5uKnfxULV8LfNrwcH+fA==",
+      "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": "^2.0.4",
-        "@blockly/theme-dark": "^2.0.7",
-        "@blockly/theme-deuteranopia": "^1.0.8",
-        "@blockly/theme-highcontrast": "^1.0.8",
-        "@blockly/theme-tritanopia": "^1.0.8",
+        "@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",
@@ -12753,23 +12753,23 @@
       }
     },
     "@blockly/theme-dark": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-2.0.7.tgz",
-      "integrity": "sha512-sErL00Uaa0yBviBWpNT0tobaty5BYb+xbE3LwSsot7P/4u/j+pD+oKS8fqt8xsWxbtn67zL8PARmaP3KVe4+Aw==",
+      "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,
       "requires": {}
     },
     "@blockly/theme-deuteranopia": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-deuteranopia/-/theme-deuteranopia-1.0.8.tgz",
-      "integrity": "sha512-/9aDJCUuyDJ4OSHr2lCJRpqBLSvgV8YP7uCeCKuoY3uMnMKTxEcJ/AUma+oF98os+i3/GeNzCMYQ/6bdlCXRIQ==",
+      "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,
       "requires": {}
     },
     "@blockly/theme-highcontrast": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-highcontrast/-/theme-highcontrast-1.0.8.tgz",
-      "integrity": "sha512-A9bvQpmNtsn3W3pWa0NRttBm1IeIhV6zGAp4ziY+GU0kNGZDgbrP10JJKfz3dv+RCaXmslE9kS25RU/LYJjB/Q==",
+      "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,
       "requires": {}
     },
@@ -12781,9 +12781,9 @@
       "requires": {}
     },
     "@blockly/theme-tritanopia": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-1.0.8.tgz",
-      "integrity": "sha512-61G8VB5a8F9eRMYAXpeRia/DrRRfAnUqpA62pksvtcRwMoztwhToUHHkSYuOHxpDpKG/rTlaFtf/GUHFFaFHEQ==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@blockly/theme-tritanopia/-/theme-tritanopia-2.0.8.tgz",
+      "integrity": "sha512-eydBD5jJAopbmnSD/c7oDRaZpK0ccxPwU7uHTeqKfwGOLCGZg6X4CrBtV9UXXOrw385VfDrabJ3JPMmM70WqNg==",
       "dev": true,
       "requires": {}
     },