diff --git a/package-lock.json b/package-lock.json
index d2b72e6..7a476e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,14 +10,16 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@fontsource/fira-code": "^5.0.8",
+        "@monaco-editor/loader": "^1.3.3",
         "base-64": "^1.0.0",
         "clsx": "^2.0.0",
         "country-list": "^2.3.0",
         "file-saver": "^2.0.5",
-        "monaco-editor": "^0.40.0",
+        "monaco-editor": "0.40.0",
         "svelte": "^4.1.2",
         "svelte-floating-ui": "^1.5.3",
-        "utf8": "^3.0.0"
+        "utf8": "^3.0.0",
+        "vscode-json-languageservice": "5.3.5"
       },
       "devDependencies": {
         "@sveltejs/adapter-static": "^2.0.3",
@@ -47,7 +49,6 @@
         "tslib": "^2.6.1",
         "typescript": "^5.1.6",
         "vite": ">=4.4.9",
-        "vite-plugin-monaco-editor": "^1.1.0",
         "vscode-uri": "^3.0.7"
       }
     },
@@ -644,6 +645,17 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
+    "node_modules/@monaco-editor/loader": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.3.tgz",
+      "integrity": "sha512-6KKF4CTzcJiS8BJwtxtfyYt9shBiEv32ateQ9T4UVogwn4HM/uPo9iJd2Dmbkpz8CM6Y0PDUpjnZzCwC+eYo2Q==",
+      "dependencies": {
+        "state-local": "^1.0.6"
+      },
+      "peerDependencies": {
+        "monaco-editor": ">= 0.21.0 < 1"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1081,6 +1093,11 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.13.tgz",
+      "integrity": "sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ=="
+    },
     "node_modules/acorn": {
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
@@ -2469,6 +2486,11 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+    },
     "node_modules/kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -3567,6 +3589,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/state-local": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
+      "integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w=="
+    },
     "node_modules/streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -4211,15 +4238,6 @@
         }
       }
     },
-    "node_modules/vite-plugin-monaco-editor": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-monaco-editor/-/vite-plugin-monaco-editor-1.1.0.tgz",
-      "integrity": "sha512-IvtUqZotrRoVqwT0PBBDIZPNraya3BxN/bfcNfnxZ5rkJiGcNtO5eAOWWSgT7zullIAEqQwxMU83yL9J5k7gww==",
-      "dev": true,
-      "peerDependencies": {
-        "monaco-editor": ">=0.33.0"
-      }
-    },
     "node_modules/vitefu": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.4.tgz",
@@ -4234,11 +4252,32 @@
         }
       }
     },
+    "node_modules/vscode-json-languageservice": {
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.5.tgz",
+      "integrity": "sha512-DasT+bKtpaS2rTPEB4VMROnvO1WES2KD8RZZxXbumnk9sk5wco10VdB6sJgTlsKQN14tHQLZDXuHnSoSAlE8LQ==",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.13",
+        "jsonc-parser": "^3.2.0",
+        "vscode-languageserver-textdocument": "^1.0.8",
+        "vscode-languageserver-types": "^3.17.3",
+        "vscode-uri": "^3.0.7"
+      }
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz",
+      "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q=="
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="
+    },
     "node_modules/vscode-uri": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
-      "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==",
-      "dev": true
+      "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA=="
     },
     "node_modules/web-streams-polyfill": {
       "version": "3.2.1",
diff --git a/package.json b/package.json
index 21a7e46..6a1a686 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,10 @@
   "license": "Apache-2.0",
   "type": "module",
   "gobl_cli_version": "0.64.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/invopop/gobl.builder.git"
+  },
   "scripts": {
     "dev": "vite dev --port 3000",
     "build": "vite build",
@@ -16,6 +20,23 @@
     "lint": "prettier --check . && eslint .",
     "format": "prettier --write ."
   },
+  "svelte": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "svelte": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./editor/EditorProblem.svelte": {
+      "svelte": "./dist/editor/EditorProblem.svelte",
+      "types": "./dist/editor/EditorProblem.svelte.d.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "!dist/**/*.test.*",
+    "!dist/**/*.spec.*"
+  ],
   "devDependencies": {
     "@sveltejs/adapter-static": "^2.0.3",
     "@sveltejs/kit": "^1.22.4",
@@ -44,32 +65,24 @@
     "tslib": "^2.6.1",
     "typescript": "^5.1.6",
     "vite": ">=4.4.9",
-    "vite-plugin-monaco-editor": "^1.1.0",
     "vscode-uri": "^3.0.7"
   },
   "dependencies": {
-    "svelte": "^4.1.2",
     "@fontsource/fira-code": "^5.0.8",
+    "@monaco-editor/loader": "^1.3.3",
     "base-64": "^1.0.0",
     "clsx": "^2.0.0",
     "country-list": "^2.3.0",
     "file-saver": "^2.0.5",
-    "monaco-editor": "^0.40.0",
+    "monaco-editor": "0.40.0",
+    "svelte": "^4.1.2",
     "svelte-floating-ui": "^1.5.3",
-    "utf8": "^3.0.0"
+    "utf8": "^3.0.0",
+    "vscode-json-languageservice": "5.3.5"
   },
   "overrides": {
     "monaco-editor": {
       "vscode-json-languageservice": "$vscode-json-languageservice"
     }
-  },
-  "files": [
-    "dist"
-  ],
-  "exports": {
-    "./gobl-builder": {
-      "types": "./dist/GOBLBuilder.svelte.d.ts",
-      "svelte": "./dist/GOBLBuilder.svelte"
-    }
   }
 }
diff --git a/src/lib/editor/Editor.svelte b/src/lib/editor/Editor.svelte
index 53619ac..9cbe21b 100644
--- a/src/lib/editor/Editor.svelte
+++ b/src/lib/editor/Editor.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import * as monaco from "monaco-editor";
-  import JSONWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
-  import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
-  import type { Environment } from "monaco-editor";
+  // import * as monaco from "monaco-editor";
+  import loader from "@monaco-editor/loader";
+  import type * as Monaco from "monaco-editor/esm/vs/editor/editor.api";
+  // import JSONWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
+  // import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
   import type { Unsubscriber } from "svelte/store";
 
   import { onDestroy, onMount } from "svelte";
@@ -21,20 +22,22 @@
   import SuccessIcon from "$lib/ui/icons/SuccessIcon.svelte";
   import LightbulbIcon from "$lib/ui/icons/LightbulbIcon.svelte";
 
-  const modelUri = monaco.Uri.parse("gobl://doc.json");
+  let monaco: typeof Monaco;
 
   export let jsonSchemaURL: string;
 
   let editorEl: HTMLElement;
-  let monacoEditor: monaco.editor.IStandaloneCodeEditor;
-  let model: monaco.editor.ITextModel;
-  let readOnlyEditHandler: monaco.IDisposable;
+  let monacoEditor: Monaco.editor.IStandaloneCodeEditor;
+  let model: Monaco.editor.ITextModel;
+  let readOnlyEditHandler: Monaco.IDisposable;
   let lineNumber = 1;
   let column = 1;
   let drawerClosed = false;
 
   let unsubscribeEditor: Unsubscriber;
 
+  const goblDocURL = "gobl://doc.json";
+
   // Sort by `monaco.MarkerSeverity` enum value descending, most severe shown first.
   $: sortedProblems = $problems.sort((a, b) => b.severity - a.severity);
   $: warningCount = $problems.filter((problem) => problem.severity === monaco.MarkerSeverity.Warning).length;
@@ -45,6 +48,9 @@
   }
 
   function setSchemaURI(uri: string) {
+    if (!monaco) {
+      return;
+    }
     monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
       validate: true,
       enableSchemaRequest: true,
@@ -52,7 +58,7 @@
       schemas: uri
         ? [
             {
-              fileMatch: [modelUri.toString()],
+              fileMatch: [goblDocURL],
               uri,
             },
           ]
@@ -64,23 +70,16 @@
     }
   }
 
-  onMount(() => {
-    (<Environment>self.MonacoEnvironment) = {
-      getWorker: function (_: string, label: string) {
-        switch (label) {
-          case "json":
-            return new JSONWorker();
-          default:
-            return new EditorWorker();
-        }
-      },
-    };
+  onMount(async () => {
+    const monacoEditorImport = await import("monaco-editor");
+    loader.config({ monaco: monacoEditorImport.default });
+
+    monaco = await loader.init();
 
+    let modelUri = monaco.Uri.parse(goblDocURL);
     model = monaco.editor.createModel("", "json", modelUri);
 
-    if (jsonSchemaURL) {
-      setSchemaURI(jsonSchemaURL);
-    }
+    setSchemaURI(jsonSchemaURL);
 
     monacoEditor = monaco.editor.create(editorEl, {
       model,
@@ -203,8 +202,9 @@
 
   onDestroy(() => {
     unsubscribeEditor();
-    model.dispose();
-    monacoEditor.dispose();
+    // model.dispose();
+    monaco?.editor.getModels().forEach((m) => m.dispose());
+    // monacoEditor.dispose();
     readOnlyEditHandler.dispose();
     document.removeEventListener("undoButtonClick", handleUndoButtonClick, true);
     document.removeEventListener("redoButtonClick", handleRedoButtonClick, true);
@@ -247,7 +247,7 @@
     monacoEditor.trigger("redoButton", "redo", null);
   }
 
-  function handleProblemClick(problem: monaco.editor.IMarker) {
+  function handleProblemClick(problem: Monaco.editor.IMarker) {
     return function () {
       monacoEditor.setPosition({ lineNumber: problem.startLineNumber, column: problem.startColumn });
       monacoEditor.revealLineInCenter(problem.startLineNumber);