diff --git a/package-lock.json b/package-lock.json
index 9f5f2e7bf3..5c5795a0f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2320,6 +2320,40 @@
         "lit": "^2.2.7"
       }
     },
+    "node_modules/@compas-oscd/open-scd": {
+      "version": "0.34.43",
+      "resolved": "file:packages/compas-open-scd/compas-oscd-open-scd-0.34.43.tgz",
+      "integrity": "sha512-fe6COfqbvAUPbnH/PUEuzAEhrS+LqPIDHOeAXtQNTuYMIGm/l9LEaZOoLyWKtV/kBOxAFbhzdBFFNC5j7Aq6Vg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@compas-oscd/core": "^0.1.23",
+        "@compas-oscd/xml": "^0.0.1",
+        "@material/mwc-dialog": "0.22.1",
+        "@material/mwc-drawer": "0.22.1",
+        "@material/mwc-fab": "0.22.1",
+        "@material/mwc-formfield": "0.22.1",
+        "@material/mwc-icon": "0.22.1",
+        "@material/mwc-icon-button": "0.22.1",
+        "@material/mwc-icon-button-toggle": "0.22.1",
+        "@material/mwc-linear-progress": "0.22.1",
+        "@material/mwc-list": "0.22.1",
+        "@material/mwc-menu": "0.22.1",
+        "@material/mwc-select": "0.22.1",
+        "@material/mwc-snackbar": "0.22.1",
+        "@material/mwc-switch": "0.22.1",
+        "@material/mwc-tab": "0.22.1",
+        "@material/mwc-tab-bar": "0.22.1",
+        "@material/mwc-textarea": "0.22.1",
+        "@material/mwc-textfield": "0.22.1",
+        "@material/mwc-top-app-bar-fixed": "0.22.1",
+        "@openscd/oscd-api": "^0.1.5",
+        "ace-custom-element": "^1.6.5",
+        "lit": "^2.2.7",
+        "lit-translate": "^1.2.1",
+        "marked": "^4.0.10",
+        "panzoom": "^9.4.2"
+      }
+    },
     "node_modules/@compas-oscd/xml": {
       "version": "0.0.1",
       "license": "Apache-2.0"
@@ -30806,6 +30840,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@compas-oscd/core": "^0.1.23",
+        "@compas-oscd/open-scd": "file:compas-oscd-open-scd-0.34.43.tgz",
         "@compas-oscd/xml": "^0.0.1",
         "@material/mwc-dialog": "0.22.1",
         "@material/mwc-drawer": "0.22.1",
diff --git a/packages/compas-open-scd/package.json b/packages/compas-open-scd/package.json
index c352e3c01a..8633226c5d 100644
--- a/packages/compas-open-scd/package.json
+++ b/packages/compas-open-scd/package.json
@@ -19,6 +19,7 @@
   "type": "module",
   "dependencies": {
     "@compas-oscd/core": "^0.1.23",
+    "@compas-oscd/open-scd": "file:compas-oscd-open-scd-0.34.43.tgz",
     "@compas-oscd/xml": "^0.0.1",
     "@material/mwc-dialog": "0.22.1",
     "@material/mwc-drawer": "0.22.1",
diff --git a/packages/compas-open-scd/src/addons/CompasHistory.ts b/packages/compas-open-scd/src/addons/CompasHistory.ts
index 66edb74293..446e357652 100644
--- a/packages/compas-open-scd/src/addons/CompasHistory.ts
+++ b/packages/compas-open-scd/src/addons/CompasHistory.ts
@@ -9,16 +9,16 @@ import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-snackbar';
 
-import '@openscd/open-scd/src/filtered-list.js';
+import '@compas-oscd/open-scd/filtered-list.js';
 
 import { IssueDetail } from '@compas-oscd/core';
 
 import {
   HistoryUIDetail,
   OscdHistory,
-} from '@openscd/open-scd/src/addons/History.js';
+} from '@compas-oscd/open-scd/dist/addons/History.js';
 import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
-import { newWizardEvent, SCLTag } from '@openscd/open-scd/src/foundation';
+import { newWizardEvent, SCLTag } from '@compas-oscd/open-scd/dist/foundation.js';
 import { nothing } from 'lit-html';
 
 export enum HistoryUIKind {
diff --git a/packages/compas-open-scd/src/addons/CompasLayout.ts b/packages/compas-open-scd/src/addons/CompasLayout.ts
index d1d515a0b9..52eb4986bd 100644
--- a/packages/compas-open-scd/src/addons/CompasLayout.ts
+++ b/packages/compas-open-scd/src/addons/CompasLayout.ts
@@ -8,12 +8,12 @@ import { get } from 'lit-translate';
 
 import type { UserInfoEvent } from '../compas/foundation';
 
-import { OscdLayout } from '@openscd/open-scd/src/addons/Layout.js';
+import { OscdLayout } from '@compas-oscd/open-scd/dist/addons/Layout.js';
 
 
 @customElement('compas-layout')
 export class CompasLayout extends OscdLayout {
-  @property({ type: String }) username: string | undefined;
+  @property({ type: String }) username: string | undefined = 'God Emperor Testus';
 
   connectedCallback(): void {
     super.connectedCallback();
@@ -27,9 +27,9 @@ export class CompasLayout extends OscdLayout {
   }
 
   protected renderActionItems(): TemplateResult {
-    return html`
+    return this.componentHtml`
       ${this.username != undefined
-                ? html`<span
+                ? this.componentHtml`<span
                     id="userField"
                     slot="actionItems"
                     style="font-family:Roboto"
diff --git a/packages/compas-open-scd/src/compas-editors/CompasVersions.ts b/packages/compas-open-scd/src/compas-editors/CompasVersions.ts
index 32d365026e..b8c1cb6322 100644
--- a/packages/compas-open-scd/src/compas-editors/CompasVersions.ts
+++ b/packages/compas-open-scd/src/compas-editors/CompasVersions.ts
@@ -21,12 +21,12 @@ import '@material/mwc-list/mwc-check-list-item';
 import { Dialog } from '@material/mwc-dialog';
 import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
-import '@openscd/open-scd/src/plain-compare-list.js';
+import '@compas-oscd/open-scd/dist/plain-compare-list.js';
 
 import { newLogEvent } from '@compas-oscd/core';
 import { newOpenDocEvent } from '@compas-oscd/core';
 
-import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent, Wizard } from '@compas-oscd/open-scd/dist/foundation.js';
 
 import {
   CompasSclDataService,
diff --git a/packages/compas-open-scd/src/compas-editors/Sitipe.ts b/packages/compas-open-scd/src/compas-editors/Sitipe.ts
index 5ca7de08a7..fc01057ad5 100644
--- a/packages/compas-open-scd/src/compas-editors/Sitipe.ts
+++ b/packages/compas-open-scd/src/compas-editors/Sitipe.ts
@@ -2,7 +2,7 @@ import { css, html, LitElement, property, TemplateResult } from 'lit-element';
 import { translate } from 'lit-translate';
 
 import './sitipe/sitipe-substation.js';
-import { isPublic } from '@openscd/open-scd/src/foundation.js';
+import { isPublic } from '@compas-oscd/open-scd/dist/foundation.js';
 
 /** An editor [[`plugin`]] for Sitipe based configuration */
 export default class SitipePlugin extends LitElement {
diff --git a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
index 912ed38ed1..80cc8c51de 100644
--- a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
+++ b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
@@ -17,15 +17,15 @@ import '@material/mwc-icon-button';
 
 import { IconButton } from '@material/mwc-icon-button';
 
-import { isPublic } from '@openscd/open-scd/src/foundation.js';
+import { isPublic } from '@compas-oscd/open-scd/dist/foundation.js';
 import { newActionEvent } from '@compas-oscd/core';
 import { createElement } from '@compas-oscd/xml';
 import { newLogEvent } from '@compas-oscd/core';
 
 import { ComplexAction, SimpleAction } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/action-pane.js';
-import '@openscd/open-scd/src/action-icon.js';
+import '@compas-oscd/open-scd/dist/action-pane.js';
+import '@compas-oscd/open-scd/dist/action-icon.js';
 
 import {
   SIEMENS_SITIPE_IED_REF,
diff --git a/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts b/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts
index 1b8a5db2c9..6f212841ec 100644
--- a/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts
+++ b/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts
@@ -11,7 +11,7 @@ import { get, translate } from 'lit-translate';
 import '@material/mwc-list';
 import '@material/mwc-list/mwc-check-list-item';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd/dist/foundation.js';
 import { newLogEvent } from '@compas-oscd/core';
 import { newOpenDocEvent } from '@compas-oscd/core';
 
diff --git a/packages/compas-open-scd/src/compas/CompasComment.ts b/packages/compas-open-scd/src/compas/CompasComment.ts
index f2512c9bcb..adf3ac9b64 100644
--- a/packages/compas-open-scd/src/compas/CompasComment.ts
+++ b/packages/compas-open-scd/src/compas/CompasComment.ts
@@ -5,10 +5,10 @@ import {
   LitElement,
   TemplateResult,
 } from 'lit-element';
-import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
+import { WizardTextField } from "@compas-oscd/open-scd/dist/wizard-textfield.js";
 import { translate } from 'lit-translate';
 
-import "@openscd/open-scd/src/wizard-textfield.js";
+import "@compas-oscd/open-scd/dist/wizard-textfield.js";
 
 @customElement('compas-comment')
 export class CompasCommentElement extends LitElement {
diff --git a/packages/compas-open-scd/src/compas/CompasExistsIn.ts b/packages/compas-open-scd/src/compas/CompasExistsIn.ts
index 06581ccff1..3b1d8a0b5b 100644
--- a/packages/compas-open-scd/src/compas/CompasExistsIn.ts
+++ b/packages/compas-open-scd/src/compas/CompasExistsIn.ts
@@ -1,6 +1,6 @@
 import { property, PropertyValues, state } from 'lit-element';
 
-import { LitElementConstructor, Mixin } from '@openscd/open-scd/src/foundation.js';
+import { LitElementConstructor, Mixin } from '@compas-oscd/open-scd/dist/foundation.js';
 
 import { getTypeFromDocName } from './foundation.js';
 import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';
diff --git a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts
index 9c4fe02389..56a7a60309 100644
--- a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts
+++ b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts
@@ -2,11 +2,11 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element';
 
 import '@material/mwc-list/mwc-list-item';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd/dist/foundation.js';
 import { newOpenDocEvent } from '@compas-oscd/core';
 import { newPendingStateEvent } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/filtered-list.js';
+import '@compas-oscd/open-scd/filtered-list.js';
 
 import {
   createLogEvent,
diff --git a/packages/compas-open-scd/src/compas/CompasLabelsField.ts b/packages/compas-open-scd/src/compas/CompasLabelsField.ts
index 0ab67ddb6c..4560df45c5 100644
--- a/packages/compas-open-scd/src/compas/CompasLabelsField.ts
+++ b/packages/compas-open-scd/src/compas/CompasLabelsField.ts
@@ -15,9 +15,9 @@ import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-icon';
 import '@material/mwc-icon-button';
 
-import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
+import { WizardTextField } from "@compas-oscd/open-scd/dist/wizard-textfield.js";
 
-import "@openscd/open-scd/src/wizard-textfield.js";
+import "@compas-oscd/open-scd/dist/wizard-textfield.js";
 
 import {
   COMPAS_LABELS_MAXIMUM,
diff --git a/packages/compas-open-scd/src/compas/CompasOpen.ts b/packages/compas-open-scd/src/compas/CompasOpen.ts
index bf19be8dec..c1c42f8501 100644
--- a/packages/compas-open-scd/src/compas/CompasOpen.ts
+++ b/packages/compas-open-scd/src/compas/CompasOpen.ts
@@ -17,7 +17,7 @@ import { createLogEvent } from '../compas-services/foundation.js';
 import { SclSelectedEvent } from './CompasSclList.js';
 import { TypeSelectedEvent } from './CompasSclTypeList.js';
 
-import '@openscd/open-scd/src/WizardDivider.js';
+import '@compas-oscd/open-scd/dist/WizardDivider.js';
 import './CompasSclTypeList.js';
 import './CompasSclList.js';
 
diff --git a/packages/compas-open-scd/src/compas/CompasSave.ts b/packages/compas-open-scd/src/compas/CompasSave.ts
index ed1c15c834..8f99097629 100644
--- a/packages/compas-open-scd/src/compas/CompasSave.ts
+++ b/packages/compas-open-scd/src/compas/CompasSave.ts
@@ -17,7 +17,7 @@ import '@material/mwc-button';
 import { newLogEvent } from '@compas-oscd/core';
 import { saveDocumentToFile } from '../file.js';
 
-import '@openscd/open-scd/src/WizardDivider.js';
+import '@compas-oscd/open-scd/dist/WizardDivider.js';
 
 import { CompasExistsIn } from './CompasExistsIn.js';
 import { CompasChangeSetRadiogroup } from './CompasChangeSetRadiogroup.js';
diff --git a/packages/compas-open-scd/src/compas/CompasSclList.ts b/packages/compas-open-scd/src/compas/CompasSclList.ts
index 56ce6a356e..bae595fd30 100644
--- a/packages/compas-open-scd/src/compas/CompasSclList.ts
+++ b/packages/compas-open-scd/src/compas/CompasSclList.ts
@@ -14,10 +14,10 @@ import '@material/mwc-icon';
 import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 
-import { SelectedItemsChangedEvent } from '@openscd/open-scd/src/oscd-filter-button.js';
+import { SelectedItemsChangedEvent } from '@compas-oscd/open-scd/dist/oscd-filter-button.js';
 
-import '@openscd/open-scd/src/filtered-list.js';
-import '@openscd/open-scd/src/oscd-filter-button.js';
+import '@compas-oscd/open-scd/filtered-list.js';
+import '@compas-oscd/open-scd/dist/oscd-filter-button.js';
 
 import {
   CompasSclDataService,
diff --git a/packages/compas-open-scd/src/compas/CompasSettings.ts b/packages/compas-open-scd/src/compas/CompasSettings.ts
index 303906da43..b4dc6c2ca6 100644
--- a/packages/compas-open-scd/src/compas/CompasSettings.ts
+++ b/packages/compas-open-scd/src/compas/CompasSettings.ts
@@ -11,7 +11,7 @@ import { translate } from 'lit-translate';
 import '@material/mwc-textfield';
 import '@material/mwc-button';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd/dist/foundation.js';
 import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
 import { Switch } from '@material/mwc-switch';
 
diff --git a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts
index f56e55d03f..9e093f5d00 100644
--- a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts
+++ b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts
@@ -9,11 +9,11 @@ import {
   newWizardEvent,
   Wizard,
   WizardInputElement,
-} from '@openscd/open-scd/src/foundation.js';
+} from '@compas-oscd/open-scd/dist/foundation.js';
 import { newLogEvent } from '@compas-oscd/core';
 import { newPendingStateEvent } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/wizard-textfield.js';
+import '@compas-oscd/open-scd/dist/wizard-textfield.js';
 
 import { CompasExistsIn } from './CompasExistsIn.js';
 import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';
diff --git a/packages/compas-open-scd/src/compas/private.ts b/packages/compas-open-scd/src/compas/private.ts
index 3593129746..09b8b8abe5 100644
--- a/packages/compas-open-scd/src/compas/private.ts
+++ b/packages/compas-open-scd/src/compas/private.ts
@@ -1,4 +1,4 @@
-import { SCL_NAMESPACE } from '@openscd/open-scd/src/schemas.js';
+import { SCL_NAMESPACE } from '@compas-oscd/open-scd/dist/schemas.js';
 
 export const COMPAS_NAMESPACE = 'https://www.lfenergy.org/compas/extension/v1';
 export const COMPAS_PREFIX = 'compas';
diff --git a/packages/compas-open-scd/src/menu/CompasImportFromApi.ts b/packages/compas-open-scd/src/menu/CompasImportFromApi.ts
index c73af3a94f..7dacda1d96 100644
--- a/packages/compas-open-scd/src/menu/CompasImportFromApi.ts
+++ b/packages/compas-open-scd/src/menu/CompasImportFromApi.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from 'lit-element';
 import { get } from 'lit-translate';
 
-import '@openscd/open-scd/src/filtered-list.js';
+import '@compas-oscd/open-scd/filtered-list.js';
 import '@openscd/open-scd/src/wizard-textfield.js';
 import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
 
diff --git a/packages/compas-open-scd/src/open-scd.ts b/packages/compas-open-scd/src/open-scd.ts
index b8ca15aabd..b7ba673e4b 100644
--- a/packages/compas-open-scd/src/open-scd.ts
+++ b/packages/compas-open-scd/src/open-scd.ts
@@ -14,18 +14,21 @@ import './addons/CompasSession.js';
 import './addons/CompasHistory.js';
 import './addons/CompasLayout.js';
 
-import '@openscd/open-scd/src/addons/Waiter.js';
-import '@openscd/open-scd/src/addons/Settings.js';
+import { newLogEvent } from '@compas-oscd/core';
+
+import '@compas-oscd/open-scd/addons/Waiter.js';
+import '@compas-oscd/open-scd/addons/Settings.js';
 import {
   initializeNsdoc,
   Nsdoc,
-} from '@openscd/open-scd/src/foundation/nsdoc.js';
+} from '@compas-oscd/open-scd/dist/foundation/nsdoc.js';
 import {
   InstalledOfficialPlugin,
   Plugin,
   MenuPosition,
   PluginKind,
-} from '@openscd/open-scd/src/plugin.js';
+  ContentContext
+} from '@compas-oscd/open-scd/dist/plugin.js';
 import { ActionDetail } from '@material/mwc-list';
 
 import { officialPlugins as builtinPlugins } from '../public/js/plugins.js';
@@ -35,9 +38,8 @@ import { classMap } from 'lit-html/directives/class-map.js';
 import {
   newConfigurePluginEvent,
   ConfigurePluginEvent,
-} from '@openscd/open-scd/src/plugin.events.js';
-import { newLogEvent } from '@compas-oscd/core';
-import { pluginTag } from '@openscd/open-scd/src/plugin-tag.js';
+} from '@compas-oscd/open-scd/dist/plugin.events.js';
+import { pluginTag } from '@compas-oscd/open-scd/dist/plugin-tag.js';
 import packageJson from '../package.json';
 import { CompasSclDataService } from './compas-services/CompasSclDataService.js';
 import { createLogEvent } from './compas-services/foundation.js';
@@ -126,7 +128,7 @@ export class OpenSCD extends LitElement {
     this.dispatchEvent(newPendingStateEvent(this.loadDoc(value)));
   }
 
-  @state() private storedPlugins: Plugin[] = [];
+  @state() storedPlugins: Plugin[] = [];
 
   @state() private editCount = -1;
 
@@ -393,7 +395,7 @@ export class OpenSCD extends LitElement {
     return JSON.parse(pluginsConfigStr) as Plugin[];
   }
 
-  protected get locale(): string {
+  public get locale(): string {
     return navigator.language || 'en-US';
   }
 
@@ -478,27 +480,8 @@ export class OpenSCD extends LitElement {
     }
     return {
       ...plugin,
-      content: () => {
-        return staticTagHtml`<${tag}
-            .doc=${this.doc}
-            .docName=${this.docName}
-            .editCount=${this.editCount}
-            .plugins=${this.storedPlugins}
-            .docId=${this.docId}
-            .pluginId=${plugin.src}
-            .nsdoc=${this.nsdoc}
-            .docs=${this.docs}
-            .locale=${this.locale}
-            .oscdApi=${new OscdApi(tag)}
-            .editor=${this.editor}
-            .compasApi=${this.compasApi}
-            class="${classMap({
-              plugin: true,
-              menu: plugin.kind === 'menu',
-              validator: plugin.kind === 'validator',
-              editor: plugin.kind === 'editor',
-            })}"
-          ></${tag}>`;
+      content: {
+        tag
       },
     };
   }
@@ -549,7 +532,7 @@ export interface MenuItem {
   actionItem?: boolean;
   action?: (event: CustomEvent<ActionDetail>) => void;
   disabled?: () => boolean;
-  content: () => TemplateResult;
+  content: ContentContext;
   kind: string;
 }
 
@@ -602,46 +585,6 @@ export interface CompasApi {
   };
 }
 
-/**
- * This is a template literal tag function. See:
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates
- *
- * Passes its arguments to LitElement's `html` tag after combining the first and
- * last expressions with the first two and last two static strings.
- * Throws unless the first and last expressions are identical strings.
- *
- * We need this to get around the expression location limitations documented in
- * https://lit.dev/docs/templates/expressions/#expression-locations
- *
- * After upgrading to Lit 2 we can use their static HTML functions instead:
- * https://lit.dev/docs/api/static-html/
- */
-function staticTagHtml(
-  oldStrings: ReadonlyArray<string>,
-  ...oldArgs: unknown[]
-): TemplateResult {
-  const args = [...oldArgs];
-  const firstArg = args.shift();
-  const lastArg = args.pop();
-
-  if (firstArg !== lastArg)
-    throw new Error(
-      `Opening tag <${firstArg}> does not match closing tag </${lastArg}>.`
-    );
-
-  const strings = [...oldStrings] as string[] & { raw: string[] };
-  const firstString = strings.shift();
-  const secondString = strings.shift();
-
-  const lastString = strings.pop();
-  const penultimateString = strings.pop();
-
-  strings.unshift(`${firstString}${firstArg}${secondString}`);
-  strings.push(`${penultimateString}${lastArg}${lastString}`);
-
-  return html(<TemplateStringsArray>strings, ...args);
-}
-
 function withoutContent<P extends Plugin | InstalledOfficialPlugin>(
   plugin: P
 ): P {