diff --git a/package-lock.json b/package-lock.json
index 5cecd60d8fb..195e5bc4ad9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,9 +67,9 @@
         "scratch-paint": "^2.2.151",
         "scratch-render": "^1.0.233",
         "scratch-render-fonts": "^1.0.2",
-        "scratch-storage": "file:/media/user/BigL/codio/scratch-storage",
+        "scratch-storage": "codio/scratch-storage#16210_fixes",
         "scratch-svg-renderer": "^2.3.102",
-        "scratch-vm": "file:/media/user/BigL/codio/scratch-vm",
+        "scratch-vm": "codio/scratch-vm#16210_fixes",
         "startaudiocontext": "^1.2.1",
         "style-loader": "4.0.0",
         "to-style": "^1.3.3",
@@ -128,117 +128,6 @@
         "react-dom": "^16.0.0"
       }
     },
-    "../scratch-storage": {
-      "name": "@codioedu/scratch-storage",
-      "version": "3.0.9",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0",
-        "arraybuffer-loader": "^1.0.3",
-        "base64-js": "^1.3.0",
-        "cross-fetch": "^4.0.0",
-        "fastestsmallesttextencoderdecoder": "^1.0.7",
-        "js-md5": "^0.7.3",
-        "minilog": "^3.1.0"
-      },
-      "devDependencies": {
-        "@babel/core": "7.26.0",
-        "@babel/plugin-transform-runtime": "7.25.9",
-        "@babel/polyfill": "7.12.1",
-        "@babel/preset-env": "7.26.0",
-        "@commitlint/cli": "18.6.1",
-        "@commitlint/config-conventional": "18.6.3",
-        "@commitlint/travis-cli": "8.3.6",
-        "@types/jest": "29.5.14",
-        "@typescript-eslint/eslint-plugin": "7.18.0",
-        "babel-loader": "9.2.1",
-        "buffer": "6.0.3",
-        "eslint": "8.57.1",
-        "eslint-config-scratch": "9.0.9",
-        "eslint-plugin-jest": "27.9.0",
-        "eslint-plugin-react": "7.37.2",
-        "file-loader": "6.2.0",
-        "husky": "8.0.3",
-        "jest": "29.7.0",
-        "json": "^9.0.4",
-        "rimraf": "6.0.1",
-        "scratch-semantic-release-config": "1.0.16",
-        "scratch-webpack-configuration": "1.6.0",
-        "semantic-release": "19.0.5",
-        "ts-jest": "29.2.5",
-        "ts-jest-mock-import-meta": "1.2.0",
-        "ts-loader": "9.5.1",
-        "webpack": "5.95.0",
-        "webpack-cli": "5.1.4"
-      }
-    },
-    "../scratch-vm": {
-      "name": "@codioedu/scratch-vm",
-      "version": "4.8.59",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@vernier/godirect": "^1.5.0",
-        "arraybuffer-loader": "^1.0.6",
-        "atob": "^2.1.2",
-        "btoa": "^1.2.1",
-        "canvas-toBlob": "^1.0.0",
-        "decode-html": "^2.0.0",
-        "diff-match-patch": "^1.0.4",
-        "format-message": "^6.2.1",
-        "htmlparser2": "^3.10.0",
-        "immutable": "^3.8.1",
-        "jszip": "^3.1.5",
-        "minilog": "^3.1.0",
-        "scratch-audio": "^1.0.6",
-        "scratch-parser": "^5.1.1",
-        "scratch-render": "^1.0.232",
-        "scratch-sb1-converter": "^1.0.0",
-        "scratch-storage": "file:/media/user/BigL/codio/scratch-storage",
-        "scratch-svg-renderer": "2.5.26",
-        "scratch-translate-extension-languages": "^1.0.0",
-        "text-encoding": "^0.7.0",
-        "uuid": "^8.3.2",
-        "web-worker": "^1.3.0"
-      },
-      "devDependencies": {
-        "@babel/core": "7.26.0",
-        "@babel/eslint-parser": "7.25.9",
-        "@babel/preset-env": "7.26.0",
-        "@commitlint/cli": "17.8.1",
-        "@commitlint/config-conventional": "17.8.1",
-        "adm-zip": "0.4.11",
-        "babel-loader": "9.2.1",
-        "callsite": "1.0.0",
-        "copy-webpack-plugin": "4.6.0",
-        "docdash": "1.2.0",
-        "eslint": "8.57.1",
-        "eslint-config-scratch": "9.0.9",
-        "expose-loader": "1.0.3",
-        "file-loader": "6.2.0",
-        "format-message-cli": "6.2.4",
-        "husky": "8.0.3",
-        "in-publish": "2.0.1",
-        "js-md5": "0.7.3",
-        "jsdoc": "3.6.11",
-        "json": "^9.0.4",
-        "pngjs": "3.4.0",
-        "scratch-blocks": "1.1.206",
-        "scratch-l10n": "3.18.357",
-        "scratch-render-fonts": "1.0.118",
-        "scratch-semantic-release-config": "1.0.16",
-        "scratch-webpack-configuration": "1.6.0",
-        "script-loader": "0.7.2",
-        "semantic-release": "19.0.5",
-        "stats.js": "0.17.0",
-        "tap": "16.3.10",
-        "webpack": "5.95.0",
-        "webpack-cli": "4.10.0",
-        "webpack-dev-server": "3.11.3"
-      },
-      "peerDependencies": {
-        "scratch-svg-renderer": "^0.2.0-prerelease"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -3750,6 +3639,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/@vernier/godirect": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@vernier/godirect/-/godirect-1.8.3.tgz",
+      "integrity": "sha512-poS0LZ3jAjH36gIAI0aNBBdsGGbmt11VFbLO+eGDJ/JDSPtMu1iUStvOi0UM/ZH6Jyh34SjVd8Cnxu/Wmcb8iQ==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
@@ -4705,7 +4600,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
       "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
@@ -6071,6 +5965,18 @@
         "node-int64": "^0.4.0"
       }
     },
+    "node_modules/btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "btoa": "bin/btoa.js"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/buffer": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
@@ -6407,6 +6313,12 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/canvas-toBlob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canvas-toBlob/-/canvas-toBlob-1.0.0.tgz",
+      "integrity": "sha512-oU5bawygt/Nef9F+C49eTFmzXzz6yKdGqn6J1wn/LZQF5ulnnZVm0KIZzik85I6tjCbZFH6aa47j4bU2tkHxRw==",
+      "license": "MIT"
+    },
     "node_modules/capture-exit": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
@@ -7452,7 +7364,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
       "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "node-fetch": "^2.6.12"
@@ -7924,6 +7835,12 @@
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "license": "MIT"
     },
+    "node_modules/decode-html": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/decode-html/-/decode-html-2.0.0.tgz",
+      "integrity": "sha512-lVJ+EBozhAXA2nSQG+xAgcD0P5K3uejnIIvM09uoQfS8AALkQ+HhHcEUvKovXi0EIpIZWjm0y8X7ULjaJpgY9w==",
+      "license": "MIT"
+    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -8388,6 +8305,12 @@
         "node": ">=0.3.1"
       }
     },
+    "node_modules/diff-match-patch": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==",
+      "license": "Apache-2.0"
+    },
     "node_modules/diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -8476,7 +8399,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "domelementtype": "^1.3.0",
@@ -8503,14 +8425,12 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "1"
@@ -8526,7 +8446,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
-      "dev": true,
       "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -8770,7 +8689,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/env-ci": {
@@ -10783,6 +10701,40 @@
         "node": ">= 0.12"
       }
     },
+    "node_modules/format-message": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/format-message/-/format-message-6.2.4.tgz",
+      "integrity": "sha512-/24zYeSRy2ZlEO2OIctm7jOHvMpoWf+uhqFCaqqyZKi1C229zAAy2E5vF4lSSaMH0a2kewPrOzq6xN4Yy7cQrw==",
+      "license": "MIT",
+      "dependencies": {
+        "format-message-formats": "^6.2.4",
+        "format-message-interpret": "^6.2.4",
+        "format-message-parse": "^6.2.4",
+        "lookup-closest-locale": "^6.2.0"
+      }
+    },
+    "node_modules/format-message-formats": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/format-message-formats/-/format-message-formats-6.2.4.tgz",
+      "integrity": "sha512-smT/fAqBLqusWfWCKRAx6QBDAAbmYznWsIyTyk66COmvwt2Byiqd7SJe2ma9a5oV0kwRaOJpN/F4lr4YK/n6qQ==",
+      "license": "MIT"
+    },
+    "node_modules/format-message-interpret": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/format-message-interpret/-/format-message-interpret-6.2.4.tgz",
+      "integrity": "sha512-dRvz9mXhITApyOtfuFEb/XqvCe1u6RMkQW49UJHXS8w2S8cAHCqq5LNDFK+QK6XVzcofROycLb/k1uybTAKt2w==",
+      "license": "MIT",
+      "dependencies": {
+        "format-message-formats": "^6.2.4",
+        "lookup-closest-locale": "^6.2.0"
+      }
+    },
+    "node_modules/format-message-parse": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/format-message-parse/-/format-message-parse-6.2.4.tgz",
+      "integrity": "sha512-k7WqXkEzgXkW4wkHdS6Cv2Ou0rIFtiDelZjgoe1saW4p7FT7zS8OeAUpAekhormqzpeecR97e4vBft1zMsfFOQ==",
+      "license": "MIT"
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -12260,7 +12212,6 @@
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "domelementtype": "^1.3.1",
@@ -12531,7 +12482,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/immutable": {
@@ -16834,6 +16784,12 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/js-md5": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
+      "license": "MIT"
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -17080,7 +17036,6 @@
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
       "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
-      "dev": true,
       "license": "(MIT OR GPL-3.0-or-later)",
       "dependencies": {
         "lie": "~3.3.0",
@@ -17093,14 +17048,12 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jszip/node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -17116,14 +17069,12 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jszip/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -17215,7 +17166,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "immediate": "~3.0.5"
@@ -17519,6 +17469,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lookup-closest-locale": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.2.0.tgz",
+      "integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ==",
+      "license": "MIT"
+    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -18542,7 +18498,6 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
       "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
@@ -18563,14 +18518,12 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/node-fetch/node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
@@ -22110,7 +22063,6 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true,
       "license": "(MIT AND Zlib)"
     },
     "node_modules/papaparse": {
@@ -24019,7 +23971,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -25331,6 +25282,51 @@
         "scratch-render-fonts": "^1.0.0"
       }
     },
+    "node_modules/scratch-parser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.2.1.tgz",
+      "integrity": "sha512-O9acef/B5MAQSB6PrEGKtbmEL1AOVZf4mYZnR0sNlzRvqqaEd+fZDL5SM7E9uQP09dIghefrm6/xmgzQIJP9Wg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ajv": "^6.3.0",
+        "jszip": "^3.1.5",
+        "pify": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/scratch-parser/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/scratch-parser/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT"
+    },
+    "node_modules/scratch-parser/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/scratch-render": {
       "version": "1.2.81",
       "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.81.tgz",
@@ -25363,6 +25359,17 @@
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
       "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
     },
+    "node_modules/scratch-sb1-converter": {
+      "version": "1.0.314",
+      "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.314.tgz",
+      "integrity": "sha512-+pZeXMjP98qC2Av0ASflROkGGvS0jw4k5qlpWu/5beQfZ9WaJ9MrLJN99XzHYB59MWYBy3N78MCJuko3sZUAhQ==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "js-md5": "^0.7.3",
+        "minilog": "^3.1.0",
+        "text-encoding": "^0.7.0"
+      }
+    },
     "node_modules/scratch-semantic-release-config": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/scratch-semantic-release-config/-/scratch-semantic-release-config-1.0.16.tgz",
@@ -25382,8 +25389,19 @@
       }
     },
     "node_modules/scratch-storage": {
-      "resolved": "../scratch-storage",
-      "link": true
+      "name": "@codioedu/scratch-storage",
+      "version": "3.0.9",
+      "resolved": "git+ssh://git@github.com/codio/scratch-storage.git#497c523c0258bd9661de5d2010224257ae61f4d7",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0",
+        "arraybuffer-loader": "^1.0.3",
+        "base64-js": "^1.3.0",
+        "cross-fetch": "^4.0.0",
+        "fastestsmallesttextencoderdecoder": "^1.0.7",
+        "js-md5": "^0.7.3",
+        "minilog": "^3.1.0"
+      }
     },
     "node_modules/scratch-svg-renderer": {
       "version": "2.5.30",
@@ -25403,9 +25421,71 @@
         "scratch-render-fonts": "^1.0.0"
       }
     },
+    "node_modules/scratch-translate-extension-languages": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/scratch-translate-extension-languages/-/scratch-translate-extension-languages-1.0.7.tgz",
+      "integrity": "sha512-6+bQU9iVYv23T8J0SjpV6MTugm0y8myh/4DPgu1BGfccysdkaWzu3MkNGQyQRUlbqAiW9wM7ctfv3USPEkzTgg==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/scratch-vm": {
-      "resolved": "../scratch-vm",
-      "link": true
+      "name": "@codioedu/scratch-vm",
+      "version": "4.8.59",
+      "resolved": "git+ssh://git@github.com/codio/scratch-vm.git#c0130afa7c64c6eba0bb2f8399da5441fb76922a",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@vernier/godirect": "^1.5.0",
+        "arraybuffer-loader": "^1.0.6",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "canvas-toBlob": "^1.0.0",
+        "decode-html": "^2.0.0",
+        "diff-match-patch": "^1.0.4",
+        "format-message": "^6.2.1",
+        "htmlparser2": "^3.10.0",
+        "immutable": "^3.8.1",
+        "jszip": "^3.1.5",
+        "minilog": "^3.1.0",
+        "scratch-audio": "^1.0.6",
+        "scratch-parser": "^5.1.1",
+        "scratch-render": "^1.0.232",
+        "scratch-sb1-converter": "^1.0.0",
+        "scratch-storage": "codio/scratch-storage#16210_fixes",
+        "scratch-svg-renderer": "2.5.26",
+        "scratch-translate-extension-languages": "^1.0.0",
+        "text-encoding": "^0.7.0",
+        "uuid": "^8.3.2",
+        "web-worker": "^1.3.0"
+      },
+      "peerDependencies": {
+        "scratch-svg-renderer": "^0.2.0-prerelease"
+      }
+    },
+    "node_modules/scratch-vm/node_modules/scratch-svg-renderer": {
+      "version": "2.5.26",
+      "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.26.tgz",
+      "integrity": "sha512-MIPwp2evZ3Fe3Qm0fVDsOdGvlP6qdc/xrGC4KLqY4kHn1RhKDOFXYID1JesL4cUNpKXyxsVTn/qsQFQCp6PNUQ==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "base64-js": "^1.2.1",
+        "base64-loader": "^1.0.0",
+        "css-tree": "^1.1.3",
+        "fastestsmallesttextencoderdecoder": "^1.0.22",
+        "isomorphic-dompurify": "^2.4.0",
+        "minilog": "^3.1.0",
+        "transformation-matrix": "^1.15.0"
+      },
+      "peerDependencies": {
+        "scratch-render-fonts": "^1.0.0"
+      }
+    },
+    "node_modules/scratch-vm/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
     },
     "node_modules/scratch-webpack-configuration": {
       "version": "1.5.1",
@@ -25889,7 +25969,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/setprototypeof": {
@@ -26995,7 +27074,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
@@ -27814,6 +27892,13 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/text-encoding": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz",
+      "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==",
+      "deprecated": "no longer maintained",
+      "license": "(Unlicense OR Apache-2.0)"
+    },
     "node_modules/text-extensions": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
@@ -28059,7 +28144,6 @@
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/transformation-matrix": {
@@ -29102,6 +29186,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/web-worker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz",
+      "integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==",
+      "license": "Apache-2.0"
+    },
     "node_modules/webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
diff --git a/package.json b/package.json
index 46214956c89..7cb7d19b157 100644
--- a/package.json
+++ b/package.json
@@ -90,9 +90,9 @@
     "scratch-paint": "^2.2.151",
     "scratch-render": "^1.0.233",
     "scratch-render-fonts": "^1.0.2",
-    "scratch-storage": "file:/media/user/BigL/codio/scratch-storage",
+    "scratch-storage": "codio/scratch-storage#16210_fixes",
     "scratch-svg-renderer": "^2.3.102",
-    "scratch-vm": "file:/media/user/BigL/codio/scratch-vm",
+    "scratch-vm": "codio/scratch-vm#16210_fixes",
     "startaudiocontext": "^1.2.1",
     "style-loader": "4.0.0",
     "to-style": "^1.3.3",