diff --git a/package-lock.json b/package-lock.json
index f4166829f8..f05b09211b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2153,523 +2153,6 @@
         "@lit-labs/ssr-dom-shim": "^1.0.0"
       }
     },
-    "node_modules/@material/animation": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/animation/-/animation-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-GBuR4VmcTQW1D0lPXEosf5Giho72LLbyGIydWGtaEUtLJoive/D9kFkwTN4Fsyt9Kkl7hbhs35vrNe6QkAH4/Q==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/base": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/base/-/base-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-UJKbXwZtkrA3sfQDmj8Zbw1Q3Tqtl6KdfVFws95Yf7TCUgTFzbZI/FSx1w7dVugQPOEnIBuZnzqZam/MtHkx4w==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/button": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/button/-/button-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-IPBAByKpQjrWNVmAWx5VCTCLnOw4ymbLsbHmBkLiDgcLPs1EtwYnKKIwQ+/t3bV02OShUdMiyboL8V/C0gMS1A==",
-      "dependencies": {
-        "@material/density": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/focus-ring": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/shape": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/tokens": "14.0.0-canary.53b3cad2f.0",
-        "@material/touch-target": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/density": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/density/-/density-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-Eh/vZ3vVyqtpylg5Ci33qlgtToS4H1/ppd450Ib3tcdISIoodgijYY0w4XsRvrnZgbI/h/1STFdLxdzS0UNuFw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/dialog": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/dialog/-/dialog-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-yiG2nlVKTW0Ro3CF8Z/MVpTwSyG/8Kio3AaTUbeQdbjt5r692s4x5Yhd8m1IjEQKUeulY4CndvIbCUwZ8/G2PA==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/button": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/icon-button": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/shape": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/tokens": "14.0.0-canary.53b3cad2f.0",
-        "@material/touch-target": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/dom": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/dom/-/dom-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-aR+rfncF6oi2ivdOlKSJI4UXwNzWV5rXM88MLDoSJF1D7lXxhAKhge+tMUBodWGV/q0+FnXLuVAa0WYTrKjo+A==",
-      "dependencies": {
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/drawer": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/drawer/-/drawer-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-MXzRGq7NoONgbHa+AhAu4HvOUA9V37nSsY4g4Alita08UqRAvvFFr4K1CF9GI2K9pLCpyQv1UbN0Lw5b78HrVQ==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/list": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/shape": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/elevation": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-3h+EkR588RMZ5TSNQ4UeXD1FOBnL3ABQix0DQIGwtNJCqSMoPndT/oJEFvwQbTkZNDbFIKN9p1Q7/KuFPVY8Pw==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/feature-targeting": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/feature-targeting/-/feature-targeting-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-fn7Af3PRyARtNeYqtjxXmE3Y/dCpnpQVWWys57MqiGR/nvc6qpgOfJ6rOdcu/MrOysOE/oebTUDmDnTmwpe9Hw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/focus-ring": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/focus-ring/-/focus-ring-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-exPX5VrjQimipBwgcFDGRiEE783sOBgpkFui59A6i6iGvS2UrLHlYY2E65fyyyQnD1f/rv4Po1OOnCesE1kulg==",
-      "dependencies": {
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0"
-      }
-    },
-    "node_modules/@material/icon-button": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/icon-button/-/icon-button-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-BFdj3CP0JXHC/F2bDmpmzWhum4fkzIDgCCavvnpE/KcCbr0AaoSULRde+LtqvbdLIYW20cXhvjinIOlRhSOshA==",
-      "dependencies": {
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/density": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/focus-ring": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/touch-target": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/list": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/list/-/list-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-mkMpltSKAYLBtFnTTCk/mQIDzwxF/VLh1gh59ehOtmRXt7FvTz83RoAa4tqe53hpVrbX4HoLDBu+vILhq/wkjw==",
-      "dependencies": {
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/density": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/shape": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/mwc-base": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-base/-/mwc-base-0.27.0.tgz",
-      "integrity": "sha512-oCWWtjbyQ52AaUbzINLGBKScIPyqhps2Y7c8t6Gu6fcFeDxhKXMV1Cqvtj/OMhtAt53XjHfD2XruWwYv3cYYUA==",
-      "dependencies": {
-        "@material/base": "=14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-button": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-button/-/mwc-button-0.27.0.tgz",
-      "integrity": "sha512-t5m2zfE93RNKHMjdsU67X6csFzuSG08VJKKvXVQ+BriGE3xBgzY5nZdmZXomFpaWjDENPAlyS4ppCFm6o+DILw==",
-      "dependencies": {
-        "@material/mwc-icon": "^0.27.0",
-        "@material/mwc-ripple": "^0.27.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-checkbox": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-checkbox/-/mwc-checkbox-0.27.0.tgz",
-      "integrity": "sha512-EY0iYZLwo8qaqMwR5da4fdn0xI0BZNAvKTcwoubYWpDDHlGxDcqwvjp/40ChGo3Q/zv8/4/A0Qp7cwapI82EkA==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-ripple": "^0.27.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-dialog": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-dialog/-/mwc-dialog-0.27.0.tgz",
-      "integrity": "sha512-rkOEmCroVs0wBQbj87vH79SvSHHZ61QRCTUYsU2rHGZCvdzlmvHjWdoyKjJER6WwwM3rrT8xthfecmjICI28CA==",
-      "dependencies": {
-        "@material/dialog": "=14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "=14.0.0-canary.53b3cad2f.0",
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-button": "^0.27.0",
-        "blocking-elements": "^0.1.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1",
-        "wicg-inert": "^3.0.0"
-      }
-    },
-    "node_modules/@material/mwc-drawer": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-drawer/-/mwc-drawer-0.27.0.tgz",
-      "integrity": "sha512-dy/uwt+aI5aiUDqFcT6Z4GhGmLZR7fu3HMkfqtQDwoJShxnf5hHwk18fiD1VHHCDf9CZ5wjl7ug4fjpcs9r18A==",
-      "dependencies": {
-        "@material/drawer": "=14.0.0-canary.53b3cad2f.0",
-        "@material/mwc-base": "^0.27.0",
-        "blocking-elements": "^0.1.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1",
-        "wicg-inert": "^3.0.0"
-      }
-    },
-    "node_modules/@material/mwc-icon": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-icon/-/mwc-icon-0.27.0.tgz",
-      "integrity": "sha512-Sul44I37M9Ewynn0A9DjkEBrmll2VtNbth6Pxj7I1A/EAwEfaCrPvryyGqfIu1T2hTsRcaojzQx6QjF+B5QW9A==",
-      "dependencies": {
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-icon-button": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-icon-button/-/mwc-icon-button-0.27.0.tgz",
-      "integrity": "sha512-wReiPa1UkLaCSPtpkAs1OGKEBtvqPnz9kzuY+RvN5ZQnpo3Uh7n3plHV4y/stsUBfrWtBCcOgYnCdNRaR/r2nQ==",
-      "dependencies": {
-        "@material/mwc-ripple": "^0.27.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-list": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-list/-/mwc-list-0.27.0.tgz",
-      "integrity": "sha512-oAhNQsBuAOgF3ENOIY8PeWjXsl35HoYaUkl0ixBQk8jJP2HIEf+MdbS5688y/UXxFbSjr0m//LfwR5gauEashg==",
-      "dependencies": {
-        "@material/base": "=14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "=14.0.0-canary.53b3cad2f.0",
-        "@material/list": "=14.0.0-canary.53b3cad2f.0",
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-checkbox": "^0.27.0",
-        "@material/mwc-radio": "^0.27.0",
-        "@material/mwc-ripple": "^0.27.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-radio": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-radio/-/mwc-radio-0.27.0.tgz",
-      "integrity": "sha512-+rSO9a373BgyMgQOM0Z8vVkuieobBylPJ8qpltytM+yGPj8+n+MtwRZyg+ry3WwEjYYDMP6GxZPHwLgWs6lMpQ==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-ripple": "^0.27.0",
-        "@material/radio": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-ripple": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-ripple/-/mwc-ripple-0.27.0.tgz",
-      "integrity": "sha512-by0O8d8g3Rd96/sUB8hxy6MrDx1QTstqOsA64vqypWd526hMTBGRik08jTNap5sVIyrN9Vq17jb4NJLWQLnNHQ==",
-      "dependencies": {
-        "@material/dom": "=14.0.0-canary.53b3cad2f.0",
-        "@material/mwc-base": "^0.27.0",
-        "@material/ripple": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-tab": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-tab/-/mwc-tab-0.27.0.tgz",
-      "integrity": "sha512-BhX6hZYjPL+d3Gcl6rVHNPiEAudgMHA+7mHo2keqbIiFRLKa2CU+omHZO/82+EBan/TPL6ZK39Oki8aIaAJcRQ==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-ripple": "^0.27.0",
-        "@material/mwc-tab-indicator": "^0.27.0",
-        "@material/tab": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-tab-bar": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-tab-bar/-/mwc-tab-bar-0.27.0.tgz",
-      "integrity": "sha512-CqRZ38m8kOfSJo87Ek61eubO8AGR10Dp12c3pCyyy6mtK/0FSY+rfcmnMPxEzkxREqUnQPgw9lhqmGZXBSqzZQ==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/mwc-tab": "^0.27.0",
-        "@material/mwc-tab-scroller": "^0.27.0",
-        "@material/tab": "=14.0.0-canary.53b3cad2f.0",
-        "@material/tab-bar": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-tab-indicator": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-tab-indicator/-/mwc-tab-indicator-0.27.0.tgz",
-      "integrity": "sha512-bdE5mYP2ze/8d8cGTTJUS0+ByzEK5tmWsXfphFr/Dyy9b+gOnIOt1iX8tmKTOpbYKsV43LxtSkumhTTPDXEJLg==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/tab-indicator": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-tab-scroller": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-tab-scroller/-/mwc-tab-scroller-0.27.0.tgz",
-      "integrity": "sha512-WL/CYVx1cHjC1a/STIB/BaBfxGz3Rz4szNNX35FkYzm6GSGxUNkXZfKOAK7R8RdZOAETa8Gy5tTEhKZKKJ/aUA==",
-      "dependencies": {
-        "@material/dom": "=14.0.0-canary.53b3cad2f.0",
-        "@material/mwc-base": "^0.27.0",
-        "@material/tab-scroller": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-top-app-bar": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-top-app-bar/-/mwc-top-app-bar-0.27.0.tgz",
-      "integrity": "sha512-vHn10exeDhUVFpo4TgBsS8pta4AxZtjuuxrYFHMYxceGifEATvGbYoPyw1x7cCMcXMMIITElgfCURAbCmn3BgA==",
-      "dependencies": {
-        "@material/mwc-base": "^0.27.0",
-        "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/mwc-top-app-bar-fixed": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@material/mwc-top-app-bar-fixed/-/mwc-top-app-bar-fixed-0.27.0.tgz",
-      "integrity": "sha512-kU1RKmx8U7YCbsBuAXfNLtu+V/Jwos+o2mSY94tZpv36dIsvcsGQ4pB2zW0EaU8g9bQVdwLMVxj4oooxSmbZXw==",
-      "dependencies": {
-        "@material/mwc-top-app-bar": "^0.27.0",
-        "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-        "lit": "^2.0.0",
-        "tslib": "^2.0.1"
-      }
-    },
-    "node_modules/@material/radio": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/radio/-/radio-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-V/AgWEOuHFoh9d4Gq1rqBZnKSGtMLQNh23Bwrv0c1FhPqFvUpwt9jR3SVwhJk5gvQQWGy9p3iiGc9QCJ+0+P8Q==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/density": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/focus-ring": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/touch-target": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/ripple": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-6g2G62vd8DsMuIUSXlRrzb98qkZ4o8ZREknNwNP2zaLQEOkJ//4j9HaqDt98/3LIjUTY9UIVFTQENiMmlwKHYQ==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/rtl": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/rtl/-/rtl-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-f08LT0HSa0WYU+4Jz/tbm1TQ9Fcf2k+H6dPPYv0J1sZmX6hMgCEmNiUdUFLQFvszoXx2XrRi1/hIFjbz2e69Yg==",
-      "dependencies": {
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/shape": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/shape/-/shape-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-RyjInLCNe+nI/ulKea0ZLHphXQDiDqYazS25SRn18g8Hoa5qGNaY5oOBncDXUYn3jm5oI5kFc9oif//kulkbjg==",
-      "dependencies": {
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/tab/-/tab-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-Vmjugm9TBF906pNE2kORSDcMUYXQXV+uspFdbyoSH3hVOTjX+Bw+ODL9agW+pDsJRqGMLO/BAoZ0YQDCrCNX/A==",
-      "dependencies": {
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/focus-ring": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/tab-indicator": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-bar": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-bar/-/tab-bar-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-qLTxl0SWwSpsWBV5o7fMO4HaA3NSCTroM+qkUJYNq7lumMXxax8XP6+GvgbXXfsF1K6VqwSPJHnFt5g1kvtBOA==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/density": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/tab": "14.0.0-canary.53b3cad2f.0",
-        "@material/tab-indicator": "14.0.0-canary.53b3cad2f.0",
-        "@material/tab-scroller": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-indicator": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-indicator/-/tab-indicator-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-CMh5MuQamk10oYs0NpQwJ+JLPcY+WftU1b2NpAxbke+6yaV0XrcEkymSfHDkMB5itDvtpXR4fe2Yw9wO8gvcgg==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tab-scroller": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/tab-scroller/-/tab-scroller-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-eJJWfNDSdjrRVNHkSecblN26PtM8rTeK2FqcZh3iCYRZ74ywhKmHF+elrM2KRH8ez+u/YcZoQacgS8rX3v6ygw==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/dom": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/tab": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/theme": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/theme/-/theme-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-S06XAevDCDWMe+GgsEpITMS07imUidzadNaTbJsqssFajBLr53QWVZsG84BpjXKXoYvyEJvb0hX5U0lq6ip9UQ==",
-      "dependencies": {
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/tokens": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/tokens/-/tokens-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-myHFB7vac8zErA3qgkqmV+kpE+i9JEwc/6Yf0MOumDSpylJGw28QikpNC6eAVBK2EmPQTaFn20mqUxyud8dGqw==",
-      "dependencies": {
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0"
-      }
-    },
-    "node_modules/@material/top-app-bar": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/top-app-bar/-/top-app-bar-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-9vPLLxUbNrWNCPGHoIeIUtyXWQUNh+yQwnkTYVkVAVEb1CsWb2D+/NefytfvyFtXWBFQLybAeG5RH0ZqdcgQBQ==",
-      "dependencies": {
-        "@material/animation": "14.0.0-canary.53b3cad2f.0",
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/elevation": "14.0.0-canary.53b3cad2f.0",
-        "@material/ripple": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "@material/shape": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "@material/typography": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/touch-target": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/touch-target/-/touch-target-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-d83e5vbqoLyL542yOTTp4TLVltddWiqbI/j1w/D9ipE30YKfe2EDN+CNJc32Zufh5IUfK41DsZdrN8fI9cL99A==",
-      "dependencies": {
-        "@material/base": "14.0.0-canary.53b3cad2f.0",
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/rtl": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@material/typography": {
-      "version": "14.0.0-canary.53b3cad2f.0",
-      "resolved": "https://registry.npmjs.org/@material/typography/-/typography-14.0.0-canary.53b3cad2f.0.tgz",
-      "integrity": "sha512-9J0k2fq7uyHsRzRqJDJLGmg3YzRpfRPtFDVeUH/xBcYoqpZE7wYw5Mb7s/l8eP626EtR7HhXhSPjvRTLA6NIJg==",
-      "dependencies": {
-        "@material/feature-targeting": "14.0.0-canary.53b3cad2f.0",
-        "@material/theme": "14.0.0-canary.53b3cad2f.0",
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/@microsoft/tsdoc": {
       "version": "0.14.2",
       "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
@@ -14601,18 +14084,10 @@
     },
     "packages/core": {
       "name": "@openscd/core",
-      "version": "1.0.1",
+      "version": "0.1.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@lit/localize": "^0.11.4",
-        "@material/mwc-button": "^0.27.0",
-        "@material/mwc-dialog": "^0.27.0",
-        "@material/mwc-drawer": "^0.27.0",
-        "@material/mwc-icon": "^0.27.0",
-        "@material/mwc-icon-button": "^0.27.0",
-        "@material/mwc-list": "^0.27.0",
-        "@material/mwc-tab-bar": "^0.27.0",
-        "@material/mwc-top-app-bar-fixed": "^0.27.0",
         "@open-wc/lit-helpers": "^0.5.1",
         "lit": "^2.2.7"
       },
@@ -14647,7 +14122,7 @@
       }
     },
     "packages/open-scd": {
-      "version": "0.33.0",
+      "version": "0.34.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@material/mwc-dialog": "0.22.1",
diff --git a/packages/open-scd/src/addons/Editor.ts b/packages/open-scd/src/addons/Editor.ts
index 8c93ef62e5..e755c10fb8 100644
--- a/packages/open-scd/src/addons/Editor.ts
+++ b/packages/open-scd/src/addons/Editor.ts
@@ -31,7 +31,7 @@ import {
 } from '../foundation.js';
 
 @customElement('oscd-editor')
-export class Editor extends LitElement {
+export class OscdEditor extends LitElement {
   /** The `XMLDocument` to be edited */
   @property({ attribute: false })
   doc: XMLDocument | null = null;
diff --git a/packages/open-scd/src/Historing.ts b/packages/open-scd/src/addons/History.ts
similarity index 88%
rename from packages/open-scd/src/Historing.ts
rename to packages/open-scd/src/addons/History.ts
index b0dc5f74ee..66df1e4709 100644
--- a/packages/open-scd/src/Historing.ts
+++ b/packages/open-scd/src/addons/History.ts
@@ -1,5 +1,4 @@
-import { html, state, property, query, TemplateResult } from 'lit-element';
-import { ifDefined } from 'lit-html/directives/if-defined';
+import { html, state, property, query, TemplateResult, customElement, LitElement } from 'lit-element';
 import { get, translate } from 'lit-translate';
 
 import '@material/mwc-button';
@@ -13,7 +12,7 @@ import '@material/mwc-snackbar';
 import { Dialog } from '@material/mwc-dialog';
 import { Snackbar } from '@material/mwc-snackbar';
 
-import './filtered-list.js';
+import '../filtered-list.js';
 import {
   CommitDetail,
   CommitEntry,
@@ -27,11 +26,10 @@ import {
   LogEntry,
   LogEntryType,
   LogEvent,
-  Mixin,
   newActionEvent,
-} from './foundation.js';
-import { getFilterIcon, iconColors } from './icons/icons.js';
-import { Plugin } from './open-scd.js';
+} from '../foundation.js';
+import { getFilterIcon, iconColors } from '../icons/icons.js';
+import { Plugin } from '../open-scd.js';
 
 const icons = {
   info: 'info',
@@ -51,21 +49,25 @@ function getPluginName(src: string): string {
   return name || src;
 }
 
-/**
- * A mixin adding a `history` property to any `LitElement`, in which
- * incoming [[`LogEvent`]]s are logged.
- *
- * For [[`EditorAction`]] entries, also sets `editCount` to the index of
- * the committed action, allowing the user to go to `previousAction` with
- * `undo()` if `canUndo` and to go to `nextAction` with `redo()` if `canRedo`.
- *
- * Renders the `history` to `logUI` and the latest `'error'` [[`LogEntry`]] to
- * `messageUI`.
- */
-export type HistoringElement = Mixin<typeof Historing>;
-
-export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
-  class HistoringElement extends Base {
+
+export interface EditCountDetail {
+  editCount: number;
+}
+export type EditCountEvent = CustomEvent<EditCountDetail>;
+export function newEditCountEvent(
+  editCount: number,
+  eventInitDict?: CustomEventInit<Partial<EditCountDetail>>
+): EditCountEvent {
+  return new CustomEvent<EditCountDetail>('edit-count', {
+    bubbles: true,
+    composed: true,
+    ...eventInitDict,
+    detail: { editCount },
+  });
+}
+
+@customElement('oscd-history')
+export class OscdHistory extends LitElement {
     /** All [[`LogEntry`]]s received so far through [[`LogEvent`]]s. */
     @property({ type: Array })
     log: InfoEntry[] = [];
@@ -77,8 +79,15 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
     /** Index of the last [[`EditorAction`]] applied. */
     @property({ type: Number })
     editCount = -1;
+    
     @property()
     diagnoses = new Map<string, IssueDetail[]>();
+
+    @property({
+    type: Object,
+    })
+    host!: HTMLElement;
+
     @state()
     latestIssue!: IssueDetail;
 
@@ -125,20 +134,25 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
 
     undo(): boolean {
       if (!this.canUndo) return false;
-      this.dispatchEvent(
+      this.host.dispatchEvent(
         newActionEvent(
           invert((<CommitEntry>this.history[this.editCount]).action)
         )
       );
-      this.editCount = this.previousAction;
+      this.editCount = this.previousAction; 
+      this.dispatchEvent(newEditCountEvent(this.editCount));
       return true;
     }
     redo(): boolean {
       if (!this.canRedo) return false;
-      this.dispatchEvent(
+      this.host.dispatchEvent(
         newActionEvent((<CommitEntry>this.history[this.nextAction]).action)
       );
-      this.editCount = this.nextAction;
+      this.editCount = this.nextAction; 
+      this.host.dispatchEvent(
+        newActionEvent((<CommitEntry>this.history[this.editCount]).action)
+      );
+      
       return true;
     }
 
@@ -152,7 +166,8 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
         if (entry.action.derived) return;
         entry.action.derived = true;
         if (this.nextAction !== -1) this.history.splice(this.nextAction);
-        this.editCount = this.history.length;
+        this.editCount = this.history.length; 
+        this.dispatchEvent(newEditCountEvent(this.editCount));
       }
 
       this.history.push(entry);
@@ -162,7 +177,8 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
     private onReset() {
       this.log = [];
       this.history = [];
-      this.editCount = -1;
+      this.editCount = -1; 
+      this.dispatchEvent(newEditCountEvent(this.editCount));
     }
 
     private onInfo(detail: InfoDetail) {
@@ -203,22 +219,14 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
       }
     }
 
-    async performUpdate() {
-      await new Promise<void>(resolve =>
-        requestAnimationFrame(() => resolve())
-      );
-      super.performUpdate();
-    }
-
-    constructor(...args: any[]) {
-      super(...args);
-
+    firstUpdated(): void { 
       this.undo = this.undo.bind(this);
       this.redo = this.redo.bind(this);
       this.onLog = this.onLog.bind(this);
+      this.onIssue = this.onIssue.bind(this);
 
-      this.addEventListener('log', this.onLog);
-      this.addEventListener('issue', this.onIssue);
+      this.host.addEventListener('log', this.onLog);
+      this.host.addEventListener('issue', this.onIssue);
     }
 
     renderLogEntry(
@@ -241,9 +249,9 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
           <span slot="secondary">${entry.message}</span>
           <mwc-icon
             slot="graphic"
-            style="--mdc-theme-text-icon-on-background:var(${ifDefined(
+            style="--mdc-theme-text-icon-on-background:var(${
               iconColors[entry.kind]
-            )})"
+            })"
             >${icons[entry.kind]}</mwc-icon
           >
         </mwc-list-item></abbr
@@ -270,9 +278,9 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
           <span slot="secondary">${entry.message}</span>
           <mwc-icon
             slot="graphic"
-            style="--mdc-theme-text-icon-on-background:var(${ifDefined(
+            style="--mdc-theme-text-icon-on-background:var(${
               iconColors[entry.kind]
-            )})"
+            })"
             >history</mwc-icon
           >
         </mwc-list-item></abbr
@@ -385,7 +393,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
     }
 
     render(): TemplateResult {
-      return html`${ifImplemented(super.render())}
+      return html`
         <style>
           #log > mwc-icon-button-toggle {
             position: absolute;
@@ -513,7 +521,5 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
           <mwc-icon-button icon="close" slot="dismiss"></mwc-icon-button>
         </mwc-snackbar>`;
     }
-  }
-
-  return HistoringElement;
 }
+
diff --git a/packages/open-scd/src/open-scd.ts b/packages/open-scd/src/open-scd.ts
index 7b9cc3d818..638d48303f 100644
--- a/packages/open-scd/src/open-scd.ts
+++ b/packages/open-scd/src/open-scd.ts
@@ -4,6 +4,7 @@ import {
   html,
   LitElement,
   property,
+  state,
   TemplateResult,
   query,
 } from 'lit-element';
@@ -35,12 +36,11 @@ import {
   newSettingsUIEvent,
 } from './foundation.js';
 
-import { Historing } from './Historing.js';
-
 import './addons/Settings.js';
 import './addons/Waiter.js';
 import './addons/Wizards.js';
 import './addons/Editor.js';
+import './addons/History.js';
 
 import { ActionDetail, List } from '@material/mwc-list';
 import { Drawer } from '@material/mwc-drawer';
@@ -53,6 +53,7 @@ import { Switch } from '@material/mwc-switch';
 import { TextField } from '@material/mwc-textfield';
 import { Dialog } from '@material/mwc-dialog';
 import { initializeNsdoc, Nsdoc } from './foundation/nsdoc.js';
+import { EditCountEvent, OscdHistory } from './addons/History.js';
 
 // HOSTING INTERFACES
 
@@ -226,7 +227,7 @@ const loadedPlugins = new Set<string>();
 /** The `<open-scd>` custom element is the main entry point of the
  * Open Substation Configuration Designer. */
 @customElement('open-scd')
-export class OpenSCD extends Historing(LitElement) {
+export class OpenSCD extends LitElement {
   @property({ attribute: false })
   doc: XMLDocument | null = null;
   /** The name of the current [[`doc`]] */
@@ -234,6 +235,10 @@ export class OpenSCD extends Historing(LitElement) {
   /** The UUID of the current [[`doc`]] */
   @property({ type: String }) docId = '';
 
+  /** Index of the last [[`EditorAction`]] applied. */
+  @state()
+  editCount = -1;
+
   /** Object containing all *.nsdoc files and a function extracting element's label form them*/
   @property({ attribute: false })
   nsdoc: Nsdoc = initializeNsdoc();
@@ -245,6 +250,8 @@ export class OpenSCD extends Historing(LitElement) {
     return this.currentSrc;
   }
 
+  @query('oscd-history') historyAddon!: OscdHistory;
+
   set src(value: string) {
     this.currentSrc = value;
     this.dispatchEvent(newPendingStateEvent(this.loadDoc(value)));
@@ -268,13 +275,13 @@ export class OpenSCD extends Historing(LitElement) {
     const ctrlAnd = (key: string) =>
       e.key === key && e.ctrlKey && (handled = true);
 
-    if (ctrlAnd('y')) this.redo();
-    if (ctrlAnd('z')) this.undo();
-    if (ctrlAnd('l')) this.logUI.open ? this.logUI.close() : this.logUI.show();
+    if (ctrlAnd('y')) this.historyAddon.redo();
+    if (ctrlAnd('z')) this.historyAddon.undo();
+    if (ctrlAnd('l')) this.historyAddon.logUI.open ? this.historyAddon.logUI.close() : this.historyAddon.logUI.show();
     if (ctrlAnd('d'))
-      this.diagnosticUI.open
-        ? this.diagnosticUI.close()
-        : this.diagnosticUI.show();
+      this.historyAddon.diagnosticUI.open
+        ? this.historyAddon.diagnosticUI.close()
+        : this.historyAddon.diagnosticUI.show();
     if (ctrlAnd('m')) this.menuUI.open = !this.menuUI.open;
     if (ctrlAnd('o'))
       this.menuUI
@@ -307,15 +314,14 @@ export class OpenSCD extends Historing(LitElement) {
     return html`${this.renderHosting()}${this.renderPlugging()}${super.render()}`;
   }
 
-  connectedCallback(): void {
-    super.connectedCallback();
+  firstUpdated(): void {
     this.addEventListener('validate', async () => {
       this.shouldValidate = true;
       await this.validated;
 
       if (!this.shouldValidate) return;
 
-      this.diagnoses.clear();
+      this.historyAddon.diagnoses.clear();
       this.shouldValidate = false;
 
       this.validated = Promise.allSettled(
@@ -337,15 +343,20 @@ export class OpenSCD extends Historing(LitElement) {
     return html`<oscd-waiter>
       <oscd-settings .host=${this}>
         <oscd-wizards .host=${this}>
-          <oscd-editor
-            .doc=${this.doc}
-            .docName=${this.docName}
-            .docId=${this.docId}
-            .host=${this}
-            .editCount=${this.editCount}
+          <oscd-history 
+            .host=${this} 
+            @edit-count="${(e:EditCountEvent) => { this.editCount = e.detail.editCount }}"
           >
-            ${this.renderMain()}
-          </oscd-editor>
+            <oscd-editor
+              .doc=${this.doc}
+              .docName=${this.docName}
+              .docId=${this.docId}
+              .host=${this}
+              .editCount=${this.editCount}
+            >
+              ${this.renderMain()}
+            </oscd-editor>
+          </oscd-history>
         </oscd-wizards>
       </oscd-settings>
     </oscd-waiter>`;
@@ -527,8 +538,8 @@ export class OpenSCD extends Historing(LitElement) {
         icon: plugin.icon || pluginIcons['validator'],
         name: plugin.name,
         action: ae => {
-          if (this.diagnoses.get(plugin.src))
-            this.diagnoses.get(plugin.src)!.length = 0;
+          if (this.historyAddon.diagnoses.get(plugin.src))
+            this.historyAddon.diagnoses.get(plugin.src)!.length = 0;
 
           this.dispatchEvent(
             newPendingStateEvent(
@@ -557,16 +568,16 @@ export class OpenSCD extends Historing(LitElement) {
         icon: 'undo',
         name: 'undo',
         actionItem: true,
-        action: this.undo,
-        disabled: (): boolean => !this.canUndo,
+        action: this.historyAddon?.undo || undefined,
+        disabled: (): boolean => !this.historyAddon?.canUndo,
         kind: 'static',
       },
       {
         icon: 'redo',
         name: 'redo',
         actionItem: true,
-        action: this.redo,
-        disabled: (): boolean => !this.canRedo,
+        action: this.historyAddon?.redo || undefined,
+        disabled: (): boolean => !this.historyAddon?.canRedo,
         kind: 'static',
       },
       ...validators,
@@ -574,21 +585,21 @@ export class OpenSCD extends Historing(LitElement) {
         icon: 'list',
         name: 'menu.viewLog',
         actionItem: true,
-        action: (): void => this.logUI.show(),
+        action: (): void => this.historyAddon?.logUI.show(),
         kind: 'static',
       },
       {
         icon: 'history',
         name: 'menu.viewHistory',
         actionItem: true,
-        action: (): void => this.historyUI.show(),
+        action: (): void => this.historyAddon?.historyUI.show(),
         kind: 'static',
       },
       {
         icon: 'rule',
         name: 'menu.viewDiag',
         actionItem: true,
-        action: (): void => this.diagnosticUI.show(),
+        action: (): void => this.historyAddon?.diagnosticUI.show(),
         kind: 'static',
       },
       'divider',
@@ -919,7 +930,7 @@ export class OpenSCD extends Historing(LitElement) {
                 >${pluginIcons['editor']}</mwc-icon
               ></mwc-radio-list-item
             >
-            <mwc-radio-list-item id="menu" value="menu" hasMeta left
+            <mwc-radio-list-item value="menu" hasMeta left
               >${translate('plugins.menu')}<mwc-icon slot="meta"
                 >${pluginIcons['menu']}</mwc-icon
               ></mwc-radio-list-item
diff --git a/packages/open-scd/test/integration/Editing.test.ts b/packages/open-scd/test/integration/Editing.test.ts
index ec80f621d6..04e602db49 100644
--- a/packages/open-scd/test/integration/Editing.test.ts
+++ b/packages/open-scd/test/integration/Editing.test.ts
@@ -39,7 +39,7 @@ describe('Editing-Logging integration', () => {
       );
       expect(newElement.parentElement).to.equal(parent);
 
-      elm.undo();
+      elm.history.undo();
       expect(newElement.parentElement).to.be.null;
     });
 
@@ -48,9 +48,9 @@ describe('Editing-Logging integration', () => {
         newActionEvent({ new: { parent, element: newElement } })
       );
 
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
       expect(newElement.parentElement).to.equal(parent);
     });
 
@@ -58,9 +58,9 @@ describe('Editing-Logging integration', () => {
       elm.dispatchEvent(
         newActionEvent({ new: { parent, element: newElement } })
       );
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
       expect(
         parent.querySelector('Bay[name="Q03"]')?.nextElementSibling
       ).to.equal(parent.querySelector('Bay[name="Q01"]'));
@@ -80,9 +80,9 @@ describe('Editing-Logging integration', () => {
         })
       );
 
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
 
       expect(parent.querySelector('Bay[name="Q03"]')?.nextSibling).to.equal(
         parent.lastChild
@@ -104,7 +104,7 @@ describe('Editing-Logging integration', () => {
       );
       expect(element.parentElement).to.be.null;
 
-      elm.undo();
+      elm.history.undo();
       expect(element.parentElement).to.equal(parent);
     });
 
@@ -118,9 +118,9 @@ describe('Editing-Logging integration', () => {
         })
       );
 
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
       expect(element.parentElement).to.be.null;
     });
 
@@ -135,7 +135,7 @@ describe('Editing-Logging integration', () => {
           },
         })
       );
-      elm.undo();
+      elm.history.undo();
 
       expect(element.nextSibling).to.equal(originalNextSibling);
     });
@@ -155,7 +155,7 @@ describe('Editing-Logging integration', () => {
       );
       expect(element.parentElement).to.equal(newParent);
 
-      elm.undo();
+      elm.history.undo();
       expect(element.parentElement).to.equal(parent);
     });
 
@@ -164,9 +164,9 @@ describe('Editing-Logging integration', () => {
         newActionEvent({ old: { parent, element }, new: { parent: newParent } })
       );
 
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
       expect(element.parentElement).to.equal(newParent);
     });
 
@@ -185,7 +185,7 @@ describe('Editing-Logging integration', () => {
         newActionEvent({ old: { parent, element }, new: { parent: newParent } })
       );
 
-      elm.undo();
+      elm.history.undo();
       expect(
         parent.querySelector('Bay[name="Q01"]')?.nextElementSibling
       ).to.equal(parent.querySelector('Bay[name="Q02"]'));
@@ -204,7 +204,7 @@ describe('Editing-Logging integration', () => {
         newActionEvent({ old: { element }, new: { element: newElement } })
       );
 
-      elm.undo();
+      elm.history.undo();
       expect(newElement.parentElement).to.be.null;
       expect(element.parentElement).to.equal(parent);
     });
@@ -214,9 +214,9 @@ describe('Editing-Logging integration', () => {
         newActionEvent({ old: { element }, new: { element: newElement } })
       );
 
-      elm.undo();
+      elm.history.undo();
 
-      elm.redo();
+      elm.history.redo();
 
       expect(newElement.parentElement).to.equal(parent);
       expect(element.parentElement).to.be.null;
@@ -232,14 +232,14 @@ describe('Editing-Logging integration', () => {
       expect(element.children).to.have.lengthOf(originNewChildCount);
       expect(newElement.children).to.have.lengthOf(originOldChildCount);
 
-      elm.undo();
-      elm.redo();
+      elm.history.undo();
+      elm.history.redo();
 
-      elm.undo();
+      elm.history.undo();
       expect(element.children).to.have.lengthOf(originOldChildCount);
       expect(newElement.children).to.have.lengthOf(originNewChildCount);
 
-      elm.redo();
+      elm.history.redo();
       expect(element.children).to.have.lengthOf(originNewChildCount);
       expect(newElement.children).to.have.lengthOf(originOldChildCount);
     });
@@ -259,7 +259,7 @@ describe('Editing-Logging integration', () => {
       expect(element).to.have.attribute('name', 'Q03');
       expect(element).to.not.have.attribute('desc');
 
-      elm.undo();
+      elm.history.undo();
       expect(element).to.have.attribute('name', 'Q01');
       expect(element).to.have.attribute('desc', 'Bay');
     });
@@ -267,8 +267,8 @@ describe('Editing-Logging integration', () => {
     it('can redo', () => {
       elm.dispatchEvent(newActionEvent(updateAction));
 
-      elm.undo();
-      elm.redo();
+      elm.history.undo();
+      elm.history.redo();
 
       expect(element).to.have.attribute('name', 'Q03');
       expect(element).to.not.have.attribute('desc');
diff --git a/packages/open-scd/test/integration/Setting.test.ts b/packages/open-scd/test/integration/Setting.test.ts
index cb70f6a3b1..cab52ece78 100644
--- a/packages/open-scd/test/integration/Setting.test.ts
+++ b/packages/open-scd/test/integration/Setting.test.ts
@@ -1,21 +1,20 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import '../mock-setter-logger.js';
-import { MockSetterLogger } from '../mock-setter-logger.js';
-
 import { newLoadNsdocEvent, OscdSettings } from '../../src/addons/Settings.js';
+import '../../src/addons/History.js';
+import { OscdHistory } from '../../src/addons/History.js';
 
 describe('Oscd-Settings', () => {
-  let logger: MockSetterLogger;
+  let logger: OscdHistory;
   let settings: OscdSettings;
 
   beforeEach(async () => {
     localStorage.clear();
 
     logger = await fixture(
-      html`<mock-setter-logger>
+      html`<oscd-history .host=${document}>
         <oscd-settings .host=${document}></oscd-settings>
-      </mock-setter-logger>`
+      </oscd-history>`
     );
 
     settings = logger.querySelector('oscd-settings')!;
diff --git a/packages/open-scd/test/integration/__snapshots__/open-scd.test.snap.js b/packages/open-scd/test/integration/__snapshots__/open-scd.test.snap.js
index e5320d3e86..3e6039f9cf 100644
--- a/packages/open-scd/test/integration/__snapshots__/open-scd.test.snap.js
+++ b/packages/open-scd/test/integration/__snapshots__/open-scd.test.snap.js
@@ -5,1237 +5,1058 @@ snapshots["open-scd looks like its snapshot"] =
 `<oscd-waiter>
   <oscd-settings>
     <oscd-wizards>
-      <oscd-editor>
-        <mwc-drawer
-          class="mdc-theme--surface"
-          hasheader=""
-          id="menu"
-          type="modal"
-        >
-          <span slot="title">
-            Menu
-          </span>
-          <mwc-list wrapfocus="">
-            <li
-              divider=""
-              padded=""
-              role="separator"
-            >
-            </li>
-            <mwc-list-item
-              aria-disabled="false"
-              class="top"
-              graphic="icon"
-              iconid="folder_open"
-              mwc-list-item=""
-              tabindex="0"
-            >
-              <mwc-icon slot="graphic">
-                folder_open
-              </mwc-icon>
-              <span>
-                Open project
-              </span>
-            </mwc-list-item>
-            <oscd-plugina2b400fc5f053cb1 class="menu plugin">
-            </oscd-plugina2b400fc5f053cb1>
-            <mwc-list-item
-              aria-disabled="false"
-              class="top"
-              graphic="icon"
-              iconid="create_new_folder"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                create_new_folder
-              </mwc-icon>
-              <span>
-                New project
-              </span>
-            </mwc-list-item>
-            <oscd-plugin679d81826289fb9a class="menu plugin">
-            </oscd-plugin679d81826289fb9a>
-            <mwc-list-item
-              aria-disabled="true"
-              class="top"
-              disabled=""
-              graphic="icon"
-              iconid="save"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                save
-              </mwc-icon>
-              <span>
-                Save project
-              </span>
-            </mwc-list-item>
-            <oscd-plugin1cb4a5367ff1f6a1 class="menu plugin">
-            </oscd-plugin1cb4a5367ff1f6a1>
-            <li
-              divider=""
-              padded=""
-              role="separator"
-            >
-            </li>
-            <mwc-list-item
-              aria-disabled="true"
-              class="validator"
-              disabled=""
-              graphic="icon"
-              iconid="rule_folder"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                rule_folder
-              </mwc-icon>
-              <span>
-                Validate Schema
-              </span>
-            </mwc-list-item>
-            <oscd-plugin3aa68346726da1cd class="plugin validator">
-            </oscd-plugin3aa68346726da1cd>
-            <mwc-list-item
-              aria-disabled="true"
-              class="validator"
-              disabled=""
-              graphic="icon"
-              iconid="rule_folder"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                rule_folder
-              </mwc-icon>
-              <span>
-                Validate Templates
-              </span>
-            </mwc-list-item>
-            <oscd-plugin186320cdd626e422 class="plugin validator">
-            </oscd-plugin186320cdd626e422>
-            <li
-              divider=""
-              padded=""
-              role="separator"
-            >
-            </li>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="snippet_folder"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                snippet_folder
-              </mwc-icon>
-              <span>
-                Import IEDs
-              </span>
-            </mwc-list-item>
-            <oscd-plugin4fed39e69404009b class="menu plugin">
-            </oscd-plugin4fed39e69404009b>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="play_circle"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                play_circle
-              </mwc-icon>
-              <span>
-                Subscriber Update
-              </span>
-            </mwc-list-item>
-            <oscd-plugin90bf5c90b69b347b class="menu plugin">
-            </oscd-plugin90bf5c90b69b347b>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="merge_type"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                merge_type
-              </mwc-icon>
-              <span>
-                Merge Project
-              </span>
-            </mwc-list-item>
-            <oscd-plugin2b4693cc19da2446 class="menu plugin">
-            </oscd-plugin2b4693cc19da2446>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="merge_type"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                merge_type
-              </mwc-icon>
-              <span>
-                Update Substation
-              </span>
-            </mwc-list-item>
-            <oscd-plugin2a662bacb120083f class="menu plugin">
-            </oscd-plugin2a662bacb120083f>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="compare_arrows"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                compare_arrows
-              </mwc-icon>
-              <span>
-                Compare IED
-              </span>
-            </mwc-list-item>
-            <oscd-plugin46ae7b6e93fe0f90 class="menu plugin">
-            </oscd-plugin46ae7b6e93fe0f90>
-            <li
-              divider=""
-              padded=""
-              role="separator"
-            >
-            </li>
-            <mwc-list-item
-              aria-disabled="false"
-              class="static"
-              graphic="icon"
-              iconid="settings"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                settings
-              </mwc-icon>
-              <span>
-                Settings
-              </span>
-            </mwc-list-item>
-            <mwc-list-item
-              aria-disabled="false"
-              class="middle"
-              graphic="icon"
-              iconid="help"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                help
-              </mwc-icon>
-              <span>
-                Help
-              </span>
-            </mwc-list-item>
-            <oscd-plugin48ab1a46d409bed9 class="menu plugin">
-            </oscd-plugin48ab1a46d409bed9>
-            <mwc-list-item
-              aria-disabled="true"
-              class="middle"
-              disabled=""
-              graphic="icon"
-              iconid="history_toggle_off"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                history_toggle_off
-              </mwc-icon>
-              <span>
-                Show SCL History
-              </span>
-            </mwc-list-item>
-            <oscd-plugina5aa56c7c6319526 class="menu plugin">
-            </oscd-plugina5aa56c7c6319526>
-            <li
-              divider=""
-              padded=""
-              role="separator"
-            >
-            </li>
-            <mwc-list-item
-              aria-disabled="false"
-              class="static"
-              graphic="icon"
-              iconid="extension"
-              mwc-list-item=""
-              tabindex="-1"
-            >
-              <mwc-icon slot="graphic">
-                extension
-              </mwc-icon>
-              <span>
-                Extensions
-              </span>
-            </mwc-list-item>
-          </mwc-list>
-          <mwc-top-app-bar-fixed slot="appContent">
-            <mwc-icon-button
-              icon="menu"
-              label="Menu"
-              slot="navigationIcon"
-            >
-            </mwc-icon-button>
-            <div
-              id="title"
-              slot="title"
-            >
-            </div>
-            <mwc-icon-button
-              disabled=""
-              icon="undo"
-              label="undo"
-              slot="actionItems"
-            >
-            </mwc-icon-button>
-            <mwc-icon-button
-              disabled=""
-              icon="redo"
-              label="redo"
-              slot="actionItems"
-            >
-            </mwc-icon-button>
-            <mwc-icon-button
-              icon="list"
-              label="menu.viewLog"
-              slot="actionItems"
-            >
-            </mwc-icon-button>
+      <oscd-history>
+        <oscd-editor>
+          <mwc-drawer
+            class="mdc-theme--surface"
+            hasheader=""
+            id="menu"
+            type="modal"
+          >
+            <span slot="title">
+              Menu
+            </span>
+            <mwc-list wrapfocus="">
+              <li
+                divider=""
+                padded=""
+                role="separator"
+              >
+              </li>
+              <mwc-list-item
+                aria-disabled="false"
+                class="top"
+                graphic="icon"
+                iconid="folder_open"
+                mwc-list-item=""
+                tabindex="0"
+              >
+                <mwc-icon slot="graphic">
+                  folder_open
+                </mwc-icon>
+                <span>
+                  Open project
+                </span>
+              </mwc-list-item>
+              <oscd-plugina2b400fc5f053cb1 class="menu plugin">
+              </oscd-plugina2b400fc5f053cb1>
+              <mwc-list-item
+                aria-disabled="false"
+                class="top"
+                graphic="icon"
+                iconid="create_new_folder"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  create_new_folder
+                </mwc-icon>
+                <span>
+                  New project
+                </span>
+              </mwc-list-item>
+              <oscd-plugin679d81826289fb9a class="menu plugin">
+              </oscd-plugin679d81826289fb9a>
+              <mwc-list-item
+                aria-disabled="true"
+                class="top"
+                disabled=""
+                graphic="icon"
+                iconid="save"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  save
+                </mwc-icon>
+                <span>
+                  Save project
+                </span>
+              </mwc-list-item>
+              <oscd-plugin1cb4a5367ff1f6a1 class="menu plugin">
+              </oscd-plugin1cb4a5367ff1f6a1>
+              <li
+                divider=""
+                padded=""
+                role="separator"
+              >
+              </li>
+              <mwc-list-item
+                aria-disabled="true"
+                class="validator"
+                disabled=""
+                graphic="icon"
+                iconid="rule_folder"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  rule_folder
+                </mwc-icon>
+                <span>
+                  Validate Schema
+                </span>
+              </mwc-list-item>
+              <oscd-plugin3aa68346726da1cd class="plugin validator">
+              </oscd-plugin3aa68346726da1cd>
+              <mwc-list-item
+                aria-disabled="true"
+                class="validator"
+                disabled=""
+                graphic="icon"
+                iconid="rule_folder"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  rule_folder
+                </mwc-icon>
+                <span>
+                  Validate Templates
+                </span>
+              </mwc-list-item>
+              <oscd-plugin186320cdd626e422 class="plugin validator">
+              </oscd-plugin186320cdd626e422>
+              <li
+                divider=""
+                padded=""
+                role="separator"
+              >
+              </li>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="snippet_folder"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  snippet_folder
+                </mwc-icon>
+                <span>
+                  Import IEDs
+                </span>
+              </mwc-list-item>
+              <oscd-plugin4fed39e69404009b class="menu plugin">
+              </oscd-plugin4fed39e69404009b>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="play_circle"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  play_circle
+                </mwc-icon>
+                <span>
+                  Subscriber Update
+                </span>
+              </mwc-list-item>
+              <oscd-plugin90bf5c90b69b347b class="menu plugin">
+              </oscd-plugin90bf5c90b69b347b>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="merge_type"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  merge_type
+                </mwc-icon>
+                <span>
+                  Merge Project
+                </span>
+              </mwc-list-item>
+              <oscd-plugin2b4693cc19da2446 class="menu plugin">
+              </oscd-plugin2b4693cc19da2446>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="merge_type"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  merge_type
+                </mwc-icon>
+                <span>
+                  Update Substation
+                </span>
+              </mwc-list-item>
+              <oscd-plugin2a662bacb120083f class="menu plugin">
+              </oscd-plugin2a662bacb120083f>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="compare_arrows"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  compare_arrows
+                </mwc-icon>
+                <span>
+                  Compare IED
+                </span>
+              </mwc-list-item>
+              <oscd-plugin46ae7b6e93fe0f90 class="menu plugin">
+              </oscd-plugin46ae7b6e93fe0f90>
+              <li
+                divider=""
+                padded=""
+                role="separator"
+              >
+              </li>
+              <mwc-list-item
+                aria-disabled="false"
+                class="static"
+                graphic="icon"
+                iconid="settings"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  settings
+                </mwc-icon>
+                <span>
+                  Settings
+                </span>
+              </mwc-list-item>
+              <mwc-list-item
+                aria-disabled="false"
+                class="middle"
+                graphic="icon"
+                iconid="help"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  help
+                </mwc-icon>
+                <span>
+                  Help
+                </span>
+              </mwc-list-item>
+              <oscd-plugin48ab1a46d409bed9 class="menu plugin">
+              </oscd-plugin48ab1a46d409bed9>
+              <mwc-list-item
+                aria-disabled="true"
+                class="middle"
+                disabled=""
+                graphic="icon"
+                iconid="history_toggle_off"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  history_toggle_off
+                </mwc-icon>
+                <span>
+                  Show SCL History
+                </span>
+              </mwc-list-item>
+              <oscd-plugina5aa56c7c6319526 class="menu plugin">
+              </oscd-plugina5aa56c7c6319526>
+              <li
+                divider=""
+                padded=""
+                role="separator"
+              >
+              </li>
+              <mwc-list-item
+                aria-disabled="false"
+                class="static"
+                graphic="icon"
+                iconid="extension"
+                mwc-list-item=""
+                tabindex="-1"
+              >
+                <mwc-icon slot="graphic">
+                  extension
+                </mwc-icon>
+                <span>
+                  Extensions
+                </span>
+              </mwc-list-item>
+            </mwc-list>
+            <mwc-top-app-bar-fixed slot="appContent">
+              <mwc-icon-button
+                icon="menu"
+                label="Menu"
+                slot="navigationIcon"
+              >
+              </mwc-icon-button>
+              <div
+                id="title"
+                slot="title"
+              >
+              </div>
+              <mwc-icon-button
+                disabled=""
+                icon="undo"
+                label="undo"
+                slot="actionItems"
+              >
+              </mwc-icon-button>
+              <mwc-icon-button
+                disabled=""
+                icon="redo"
+                label="redo"
+                slot="actionItems"
+              >
+              </mwc-icon-button>
+              <mwc-icon-button
+                icon="list"
+                label="menu.viewLog"
+                slot="actionItems"
+              >
+              </mwc-icon-button>
+              <mwc-icon-button
+                icon="history"
+                label="menu.viewHistory"
+                slot="actionItems"
+              >
+              </mwc-icon-button>
+              <mwc-icon-button
+                icon="rule"
+                label="menu.viewDiag"
+                slot="actionItems"
+              >
+              </mwc-icon-button>
+            </mwc-top-app-bar-fixed>
+          </mwc-drawer>
+          <div class="landing">
             <mwc-icon-button
-              icon="history"
-              label="menu.viewHistory"
-              slot="actionItems"
+              class="landing_icon"
+              icon="folder_open"
             >
+              <div class="landing_label">
+                Open project
+              </div>
             </mwc-icon-button>
             <mwc-icon-button
-              icon="rule"
-              label="menu.viewDiag"
-              slot="actionItems"
+              class="landing_icon"
+              icon="create_new_folder"
             >
+              <div class="landing_label">
+                New project
+              </div>
             </mwc-icon-button>
-          </mwc-top-app-bar-fixed>
-        </mwc-drawer>
-        <div class="landing">
-          <mwc-icon-button
-            class="landing_icon"
-            icon="folder_open"
-          >
-            <div class="landing_label">
-              Open project
-            </div>
-          </mwc-icon-button>
-          <mwc-icon-button
-            class="landing_icon"
-            icon="create_new_folder"
-          >
-            <div class="landing_label">
-              New project
-            </div>
-          </mwc-icon-button>
-        </div>
-        <mwc-dialog
-          heading="Extensions"
-          id="pluginManager"
-          stacked=""
-        >
-          <mwc-list
-            id="pluginList"
-            multi=""
+          </div>
+          <mwc-dialog
+            heading="Extensions"
+            id="pluginManager"
+            stacked=""
           >
-            <mwc-list-item
-              aria-disabled="false"
-              graphic="avatar"
-              noninteractive=""
-              tabindex="-1"
-            >
-              <strong>
-                Editor tab
-              </strong>
-              <mwc-icon
-                class="inverted"
-                slot="graphic"
-              >
-                tab
-              </mwc-icon>
-            </mwc-list-item>
-            <li
-              divider=""
-              role="separator"
-            >
-            </li>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="0"
-              value="/src/editors/IED.js"
-            >
-              <mwc-icon slot="meta">
-                developer_board
-              </mwc-icon>
-              IED
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/editors/Substation.js"
-            >
-              <mwc-icon slot="meta">
-                margin
-              </mwc-icon>
-              Substation
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/SingleLineDiagram.js"
-            >
-              <mwc-icon slot="meta">
-                edit
-              </mwc-icon>
-              Single Line Diagram
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/GooseSubscriberMessageBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Message Binding (GOOSE)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/GooseSubscriberDataBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Data Binding (GOOSE)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/editors/GooseSubscriberLaterBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Later Binding (GOOSE)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/SMVSubscriberMessageBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Message Binding (SMV)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/SMVSubscriberDataBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Data Binding (SMV)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/editors/SMVSubscriberLaterBinding.js"
-            >
-              <mwc-icon slot="meta">
-                link
-              </mwc-icon>
-              Subscriber Later Binding (SMV)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/editors/Communication.js"
+            <mwc-list
+              id="pluginList"
+              multi=""
             >
-              <mwc-icon slot="meta">
-                settings_ethernet
-              </mwc-icon>
-              Communication
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/Protocol104.js"
-            >
-              <mwc-icon slot="meta">
-                settings_ethernet
-              </mwc-icon>
-              104
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/editors/Templates.js"
-            >
-              <mwc-icon slot="meta">
-                copy_all
-              </mwc-icon>
-              Templates
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/Publisher.js"
-            >
-              <mwc-icon slot="meta">
-                publish
-              </mwc-icon>
-              Publisher
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/editors/Cleanup.js"
-            >
-              <mwc-icon slot="meta">
-                cleaning_services
-              </mwc-icon>
-              Cleanup
-            </mwc-check-list-item>
-            <mwc-list-item
-              aria-disabled="false"
-              graphic="avatar"
-              noninteractive=""
-              tabindex="-1"
-            >
-              <strong>
-                Menu entry
-              </strong>
-              <mwc-icon
-                class="inverted"
-                slot="graphic"
+              <mwc-list-item
+                aria-disabled="false"
+                graphic="avatar"
+                noninteractive=""
+                tabindex="-1"
               >
                 <strong>
-                  play_circle
+                  Editor tab
                 </strong>
-              </mwc-icon>
-            </mwc-list-item>
-            <li
-              divider=""
-              role="separator"
-            >
-            </li>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/OpenProject.js"
-            >
-              <mwc-icon slot="meta">
-                folder_open
-              </mwc-icon>
-              Open project
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/NewProject.js"
-            >
-              <mwc-icon slot="meta">
-                create_new_folder
-              </mwc-icon>
-              New project
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/SaveProject.js"
-            >
-              <mwc-icon slot="meta">
-                save
-              </mwc-icon>
-              Save project
-            </mwc-check-list-item>
-            <li
-              divider=""
-              inset=""
-              role="separator"
-            >
-            </li>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/validators/ValidateSchema.js"
-            >
-              <mwc-icon slot="meta">
-                rule_folder
-              </mwc-icon>
-              Validate Schema
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/validators/ValidateTemplates.js"
-            >
-              <mwc-icon slot="meta">
-                rule_folder
-              </mwc-icon>
-              Validate Templates
-            </mwc-check-list-item>
-            <li
-              divider=""
-              inset=""
-              role="separator"
-            >
-            </li>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/ImportIEDs.js"
-            >
-              <mwc-icon slot="meta">
-                snippet_folder
-              </mwc-icon>
-              Import IEDs
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/menu/VirtualTemplateIED.js"
-            >
-              <mwc-icon slot="meta">
-                developer_board
-              </mwc-icon>
-              Create Virtual IED
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/SubscriberInfo.js"
-            >
-              <mwc-icon slot="meta">
-                play_circle
-              </mwc-icon>
-              Subscriber Update
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/menu/UpdateDescriptionABB.js"
-            >
-              <mwc-icon slot="meta">
-                play_circle
-              </mwc-icon>
-              Update desc (ABB)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/menu/UpdateDescriptionSEL.js"
-            >
-              <mwc-icon slot="meta">
-                play_circle
-              </mwc-icon>
-              Update desc (SEL)
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/Merge.js"
-            >
-              <mwc-icon slot="meta">
-                merge_type
-              </mwc-icon>
-              Merge Project
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/UpdateSubstation.js"
-            >
-              <mwc-icon slot="meta">
-                merge_type
-              </mwc-icon>
-              Update Substation
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/CompareIED.js"
-            >
-              <mwc-icon slot="meta">
-                compare_arrows
-              </mwc-icon>
-              Compare IED
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              tabindex="-1"
-              value="/src/menu/ExportCommunication.js"
-            >
-              <mwc-icon slot="meta">
-                sim_card_download
-              </mwc-icon>
-              Export Communication Section
-            </mwc-check-list-item>
-            <li
-              divider=""
-              inset=""
-              role="separator"
-            >
-            </li>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/Help.js"
-            >
-              <mwc-icon slot="meta">
-                help
-              </mwc-icon>
-              Help
-            </mwc-check-list-item>
-            <mwc-check-list-item
-              aria-disabled="false"
-              class="official"
-              graphic="control"
-              hasmeta=""
-              left=""
-              mwc-list-item=""
-              selected=""
-              tabindex="-1"
-              value="/src/menu/SclHistory.js"
-            >
-              <mwc-icon slot="meta">
-                history_toggle_off
-              </mwc-icon>
-              Show SCL History
-            </mwc-check-list-item>
-          </mwc-list>
-          <mwc-button
-            icon="refresh"
-            label="Reset"
-            slot="secondaryAction"
-            style="--mdc-theme-primary: var(--mdc-theme-error)"
-          >
-          </mwc-button>
-          <mwc-button
-            dialogaction="close"
-            icon=""
-            label="Close"
-            slot="secondaryAction"
-          >
-          </mwc-button>
-          <mwc-button
-            icon="library_add"
-            label="Add custom extension…"
-            outlined=""
-            slot="primaryAction"
-            trailingicon=""
-          >
-          </mwc-button>
-        </mwc-dialog>
-        <mwc-dialog
-          heading="Add custom extension"
-          id="pluginAdd"
-        >
-          <div style="display: flex; flex-direction: column; row-gap: 8px;">
-            <p style="color:var(--mdc-theme-error);">
-              Here you may add remote extensions directly from a custom URL.
-                You do this at your own risk.
-            </p>
-            <mwc-textfield
-              helper="Your preferred extension name"
-              id="pluginNameInput"
-              label="Name"
-              required=""
-            >
-            </mwc-textfield>
-            <mwc-list id="pluginKindList">
-              <mwc-radio-list-item
+                <mwc-icon
+                  class="inverted"
+                  slot="graphic"
+                >
+                  tab
+                </mwc-icon>
+              </mwc-list-item>
+              <li
+                divider=""
+                role="separator"
+              >
+              </li>
+              <mwc-check-list-item
                 aria-disabled="false"
-                aria-selected="true"
+                class="official"
                 graphic="control"
                 hasmeta=""
-                id="editor"
                 left=""
                 mwc-list-item=""
                 selected=""
                 tabindex="0"
-                value="editor"
+                value="/src/editors/IED.js"
               >
-                Editor tab
                 <mwc-icon slot="meta">
-                  tab
+                  developer_board
                 </mwc-icon>
-              </mwc-radio-list-item>
-              <mwc-radio-list-item
+                IED
+              </mwc-check-list-item>
+              <mwc-check-list-item
                 aria-disabled="false"
+                class="official"
                 graphic="control"
                 hasmeta=""
-                id="menu"
                 left=""
                 mwc-list-item=""
+                selected=""
                 tabindex="-1"
-                value="menu"
+                value="/src/editors/Substation.js"
               >
-                Menu entry
                 <mwc-icon slot="meta">
-                  play_circle
+                  margin
                 </mwc-icon>
-              </mwc-radio-list-item>
-              <div id="menudetails">
-                <mwc-formfield
-                  id="enabledefault"
-                  label="Requires loaded document"
-                >
-                  <mwc-switch
-                    checked=""
-                    id="requireDoc"
-                  >
-                  </mwc-switch>
-                </mwc-formfield>
-                <mwc-select
-                  fixedmenuposition=""
-                  id="menuPosition"
-                  value="middle"
+                Substation
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/SingleLineDiagram.js"
+              >
+                <mwc-icon slot="meta">
+                  edit
+                </mwc-icon>
+                Single Line Diagram
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/GooseSubscriberMessageBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Message Binding (GOOSE)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/GooseSubscriberDataBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Data Binding (GOOSE)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/editors/GooseSubscriberLaterBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Later Binding (GOOSE)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/SMVSubscriberMessageBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Message Binding (SMV)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/SMVSubscriberDataBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Data Binding (SMV)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/editors/SMVSubscriberLaterBinding.js"
+              >
+                <mwc-icon slot="meta">
+                  link
+                </mwc-icon>
+                Subscriber Later Binding (SMV)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/editors/Communication.js"
+              >
+                <mwc-icon slot="meta">
+                  settings_ethernet
+                </mwc-icon>
+                Communication
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/Protocol104.js"
+              >
+                <mwc-icon slot="meta">
+                  settings_ethernet
+                </mwc-icon>
+                104
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/editors/Templates.js"
+              >
+                <mwc-icon slot="meta">
+                  copy_all
+                </mwc-icon>
+                Templates
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/Publisher.js"
+              >
+                <mwc-icon slot="meta">
+                  publish
+                </mwc-icon>
+                Publisher
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/editors/Cleanup.js"
+              >
+                <mwc-icon slot="meta">
+                  cleaning_services
+                </mwc-icon>
+                Cleanup
+              </mwc-check-list-item>
+              <mwc-list-item
+                aria-disabled="false"
+                graphic="avatar"
+                noninteractive=""
+                tabindex="-1"
+              >
+                <strong>
+                  Menu entry
+                </strong>
+                <mwc-icon
+                  class="inverted"
+                  slot="graphic"
                 >
-                  <mwc-list-item
-                    aria-disabled="false"
-                    mwc-list-item=""
-                    role="option"
-                    tabindex="-1"
-                    value="top"
-                  >
-                    top
-                  </mwc-list-item>
-                  <mwc-list-item
-                    activated=""
-                    aria-disabled="false"
-                    aria-selected="true"
-                    mwc-list-item=""
-                    role="option"
-                    selected=""
-                    tabindex="0"
-                    value="middle"
-                  >
-                    middle
-                  </mwc-list-item>
-                  <mwc-list-item
-                    aria-disabled="false"
-                    mwc-list-item=""
-                    role="option"
-                    tabindex="-1"
-                    value="bottom"
-                  >
-                    bottom
-                  </mwc-list-item>
-                </mwc-select>
-              </div>
-              <mwc-radio-list-item
+                  <strong>
+                    play_circle
+                  </strong>
+                </mwc-icon>
+              </mwc-list-item>
+              <li
+                divider=""
+                role="separator"
+              >
+              </li>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/OpenProject.js"
+              >
+                <mwc-icon slot="meta">
+                  folder_open
+                </mwc-icon>
+                Open project
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/NewProject.js"
+              >
+                <mwc-icon slot="meta">
+                  create_new_folder
+                </mwc-icon>
+                New project
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/SaveProject.js"
+              >
+                <mwc-icon slot="meta">
+                  save
+                </mwc-icon>
+                Save project
+              </mwc-check-list-item>
+              <li
+                divider=""
+                inset=""
+                role="separator"
+              >
+              </li>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/validators/ValidateSchema.js"
+              >
+                <mwc-icon slot="meta">
+                  rule_folder
+                </mwc-icon>
+                Validate Schema
+              </mwc-check-list-item>
+              <mwc-check-list-item
                 aria-disabled="false"
+                class="official"
                 graphic="control"
                 hasmeta=""
-                id="validator"
                 left=""
                 mwc-list-item=""
+                selected=""
                 tabindex="-1"
-                value="validator"
+                value="/src/validators/ValidateTemplates.js"
               >
-                Validator
                 <mwc-icon slot="meta">
                   rule_folder
                 </mwc-icon>
-              </mwc-radio-list-item>
+                Validate Templates
+              </mwc-check-list-item>
+              <li
+                divider=""
+                inset=""
+                role="separator"
+              >
+              </li>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/ImportIEDs.js"
+              >
+                <mwc-icon slot="meta">
+                  snippet_folder
+                </mwc-icon>
+                Import IEDs
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/menu/VirtualTemplateIED.js"
+              >
+                <mwc-icon slot="meta">
+                  developer_board
+                </mwc-icon>
+                Create Virtual IED
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/SubscriberInfo.js"
+              >
+                <mwc-icon slot="meta">
+                  play_circle
+                </mwc-icon>
+                Subscriber Update
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/menu/UpdateDescriptionABB.js"
+              >
+                <mwc-icon slot="meta">
+                  play_circle
+                </mwc-icon>
+                Update desc (ABB)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/menu/UpdateDescriptionSEL.js"
+              >
+                <mwc-icon slot="meta">
+                  play_circle
+                </mwc-icon>
+                Update desc (SEL)
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/Merge.js"
+              >
+                <mwc-icon slot="meta">
+                  merge_type
+                </mwc-icon>
+                Merge Project
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/UpdateSubstation.js"
+              >
+                <mwc-icon slot="meta">
+                  merge_type
+                </mwc-icon>
+                Update Substation
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/CompareIED.js"
+              >
+                <mwc-icon slot="meta">
+                  compare_arrows
+                </mwc-icon>
+                Compare IED
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                tabindex="-1"
+                value="/src/menu/ExportCommunication.js"
+              >
+                <mwc-icon slot="meta">
+                  sim_card_download
+                </mwc-icon>
+                Export Communication Section
+              </mwc-check-list-item>
+              <li
+                divider=""
+                inset=""
+                role="separator"
+              >
+              </li>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/Help.js"
+              >
+                <mwc-icon slot="meta">
+                  help
+                </mwc-icon>
+                Help
+              </mwc-check-list-item>
+              <mwc-check-list-item
+                aria-disabled="false"
+                class="official"
+                graphic="control"
+                hasmeta=""
+                left=""
+                mwc-list-item=""
+                selected=""
+                tabindex="-1"
+                value="/src/menu/SclHistory.js"
+              >
+                <mwc-icon slot="meta">
+                  history_toggle_off
+                </mwc-icon>
+                Show SCL History
+              </mwc-check-list-item>
             </mwc-list>
-            <mwc-textfield
-              helper="The vendor supplied extension URL"
-              id="pluginSrcInput"
-              label="URL"
-              placeholder="http://example.com/plugin.js"
-              required=""
-              type="url"
-            >
-            </mwc-textfield>
-          </div>
-          <mwc-button
-            dialogaction="close"
-            label="Cancel"
-            slot="secondaryAction"
-          >
-          </mwc-button>
-          <mwc-button
-            icon="add"
-            label="Add"
-            slot="primaryAction"
-            trailingicon=""
+            <mwc-button
+              icon="refresh"
+              label="Reset"
+              slot="secondaryAction"
+              style="--mdc-theme-primary: var(--mdc-theme-error)"
+            >
+            </mwc-button>
+            <mwc-button
+              dialogaction="close"
+              icon=""
+              label="Close"
+              slot="secondaryAction"
+            >
+            </mwc-button>
+            <mwc-button
+              icon="library_add"
+              label="Add custom extension…"
+              outlined=""
+              slot="primaryAction"
+              trailingicon=""
+            >
+            </mwc-button>
+          </mwc-dialog>
+          <mwc-dialog
+            heading="Add custom extension"
+            id="pluginAdd"
           >
-          </mwc-button>
-        </mwc-dialog>
-        <mwc-dialog
-          heading="Log"
-          id="log"
-        >
-          <mwc-icon-button-toggle
-            id="infofilter"
-            on=""
-          >
-          </mwc-icon-button-toggle>
-          <mwc-icon-button-toggle
-            id="warningfilter"
-            on=""
-          >
-          </mwc-icon-button-toggle>
-          <mwc-icon-button-toggle
-            id="errorfilter"
-            on=""
-          >
-          </mwc-icon-button-toggle>
-          <mwc-list
-            id="content"
-            wrapfocus=""
-          >
-            <mwc-list-item
-              aria-disabled="true"
-              disabled=""
-              graphic="icon"
-              mwc-list-item=""
-              tabindex="0"
-            >
-              <span>
-                Errors, warnings and other notifications will show up here.
-              </span>
-              <mwc-icon slot="graphic">
-                info
-              </mwc-icon>
-            </mwc-list-item>
-          </mwc-list>
-          <mwc-button
-            dialogaction="close"
-            slot="primaryAction"
-          >
-            Close
-          </mwc-button>
-        </mwc-dialog>
-        <mwc-dialog
-          heading="SCL History"
-          id="history"
-        >
-          <mwc-list
-            id="content"
-            wrapfocus=""
-          >
-            <mwc-list-item
-              aria-disabled="true"
-              disabled=""
-              graphic="icon"
-              mwc-list-item=""
-              tabindex="0"
-            >
-              <span>
-                Edits will show up here
-              </span>
-              <mwc-icon slot="graphic">
-                info
-              </mwc-icon>
-            </mwc-list-item>
-          </mwc-list>
-          <mwc-button
-            disabled=""
-            icon="undo"
-            label="Undo"
-            slot="secondaryAction"
-          >
-          </mwc-button>
-          <mwc-button
-            disabled=""
-            icon="redo"
-            label="Redo"
-            slot="secondaryAction"
-          >
-          </mwc-button>
-          <mwc-button
-            dialogaction="close"
-            slot="primaryAction"
-          >
-            Close
-          </mwc-button>
-        </mwc-dialog>
-        <mwc-dialog
-          heading="Diagnostics"
-          id="diagnostic"
-        >
-          <filtered-list
-            id="content"
-            wrapfocus=""
-          >
-            <mwc-list-item
-              aria-disabled="true"
-              disabled=""
-              graphic="icon"
-              mwc-list-item=""
-              tabindex="0"
-            >
-              <span>
-                Issues found during validation will show up here
-              </span>
-              <mwc-icon slot="graphic">
-                info
-              </mwc-icon>
-            </mwc-list-item>
-          </filtered-list>
-          <mwc-button
-            dialogaction="close"
-            slot="primaryAction"
-          >
-            Close
-          </mwc-button>
-        </mwc-dialog>
-        <mwc-snackbar
-          id="info"
-          labeltext="No errors"
-          timeoutms="4000"
-        >
-          <mwc-icon-button
-            icon="close"
-            slot="dismiss"
-          >
-          </mwc-icon-button>
-        </mwc-snackbar>
-        <mwc-snackbar
-          id="warning"
-          labeltext="No errors"
-          timeoutms="6000"
-        >
-          <mwc-button
-            icon="history"
-            slot="action"
-          >
-            Show
-          </mwc-button>
-          <mwc-icon-button
-            icon="close"
-            slot="dismiss"
-          >
-          </mwc-icon-button>
-        </mwc-snackbar>
-        <mwc-snackbar
-          id="error"
-          labeltext="No errors"
-          timeoutms="10000"
-        >
-          <mwc-button
-            icon="history"
-            slot="action"
-          >
-            Show
-          </mwc-button>
-          <mwc-icon-button
-            icon="close"
-            slot="dismiss"
-          >
-          </mwc-icon-button>
-        </mwc-snackbar>
-        <mwc-snackbar
-          id="issue"
-          labeltext="No errors"
-          timeoutms="10000"
-        >
-          <mwc-button
-            icon="rule"
-            slot="action"
-          >
-            Show
-          </mwc-button>
-          <mwc-icon-button
-            icon="close"
-            slot="dismiss"
-          >
-          </mwc-icon-button>
-        </mwc-snackbar>
-      </oscd-editor>
+            <div style="display: flex; flex-direction: column; row-gap: 8px;">
+              <p style="color:var(--mdc-theme-error);">
+                Here you may add remote extensions directly from a custom URL.
+                You do this at your own risk.
+              </p>
+              <mwc-textfield
+                helper="Your preferred extension name"
+                id="pluginNameInput"
+                label="Name"
+                required=""
+              >
+              </mwc-textfield>
+              <mwc-list id="pluginKindList">
+                <mwc-radio-list-item
+                  aria-disabled="false"
+                  aria-selected="true"
+                  graphic="control"
+                  hasmeta=""
+                  id="editor"
+                  left=""
+                  mwc-list-item=""
+                  selected=""
+                  tabindex="0"
+                  value="editor"
+                >
+                  Editor tab
+                  <mwc-icon slot="meta">
+                    tab
+                  </mwc-icon>
+                </mwc-radio-list-item>
+                <mwc-radio-list-item
+                  aria-disabled="false"
+                  graphic="control"
+                  hasmeta=""
+                  left=""
+                  mwc-list-item=""
+                  tabindex="-1"
+                  value="menu"
+                >
+                  Menu entry
+                  <mwc-icon slot="meta">
+                    play_circle
+                  </mwc-icon>
+                </mwc-radio-list-item>
+                <div id="menudetails">
+                  <mwc-formfield
+                    id="enabledefault"
+                    label="Requires loaded document"
+                  >
+                    <mwc-switch
+                      checked=""
+                      id="requireDoc"
+                    >
+                    </mwc-switch>
+                  </mwc-formfield>
+                  <mwc-select
+                    fixedmenuposition=""
+                    id="menuPosition"
+                    value="middle"
+                  >
+                    <mwc-list-item
+                      aria-disabled="false"
+                      mwc-list-item=""
+                      role="option"
+                      tabindex="-1"
+                      value="top"
+                    >
+                      top
+                    </mwc-list-item>
+                    <mwc-list-item
+                      activated=""
+                      aria-disabled="false"
+                      aria-selected="true"
+                      mwc-list-item=""
+                      role="option"
+                      selected=""
+                      tabindex="0"
+                      value="middle"
+                    >
+                      middle
+                    </mwc-list-item>
+                    <mwc-list-item
+                      aria-disabled="false"
+                      mwc-list-item=""
+                      role="option"
+                      tabindex="-1"
+                      value="bottom"
+                    >
+                      bottom
+                    </mwc-list-item>
+                  </mwc-select>
+                </div>
+                <mwc-radio-list-item
+                  aria-disabled="false"
+                  graphic="control"
+                  hasmeta=""
+                  id="validator"
+                  left=""
+                  mwc-list-item=""
+                  tabindex="-1"
+                  value="validator"
+                >
+                  Validator
+                  <mwc-icon slot="meta">
+                    rule_folder
+                  </mwc-icon>
+                </mwc-radio-list-item>
+              </mwc-list>
+              <mwc-textfield
+                helper="The vendor supplied extension URL"
+                id="pluginSrcInput"
+                label="URL"
+                placeholder="http://example.com/plugin.js"
+                required=""
+                type="url"
+              >
+              </mwc-textfield>
+            </div>
+            <mwc-button
+              dialogaction="close"
+              label="Cancel"
+              slot="secondaryAction"
+            >
+            </mwc-button>
+            <mwc-button
+              icon="add"
+              label="Add"
+              slot="primaryAction"
+              trailingicon=""
+            >
+            </mwc-button>
+          </mwc-dialog>
+          [object Object]
+        </oscd-editor>
+      </oscd-history>
     </oscd-wizards>
   </oscd-settings>
 </oscd-waiter>
diff --git a/packages/open-scd/test/integration/editors/GooseSubscriberDataBinding.test.ts b/packages/open-scd/test/integration/editors/GooseSubscriberDataBinding.test.ts
index 9e5258d176..45ec834f38 100644
--- a/packages/open-scd/test/integration/editors/GooseSubscriberDataBinding.test.ts
+++ b/packages/open-scd/test/integration/editors/GooseSubscriberDataBinding.test.ts
@@ -140,6 +140,7 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
       )
     )).click();
     await element.updateComplete;
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
diff --git a/packages/open-scd/test/integration/editors/GooseSubscriberMessageBinding.test.ts b/packages/open-scd/test/integration/editors/GooseSubscriberMessageBinding.test.ts
index 93b119beda..b8f7347a15 100644
--- a/packages/open-scd/test/integration/editors/GooseSubscriberMessageBinding.test.ts
+++ b/packages/open-scd/test/integration/editors/GooseSubscriberMessageBinding.test.ts
@@ -1,4 +1,5 @@
 import { expect, fixture } from '@open-wc/testing';
+import { initializeNsdoc } from '../../../src/foundation/nsdoc.js';
 
 import { ListItem } from '@material/mwc-list/mwc-list-item.js';
 
@@ -28,10 +29,11 @@ class GooseMockOpenSCD extends MockOpenSCD {
   }
 }
 
-describe('GOOSE subscriber plugin', () => {
+describe('GOOSE subscriber plugin', async () => {
   let element: GooseSubscriberMessageBindingPlugin;
   let parent: GooseMockOpenSCD;
   let doc: XMLDocument;
+  const nsdoc = await initializeNsdoc();
 
   beforeEach(async () => {
     doc = await fetch('/test/testfiles/editors/MessageBindingGOOSE2007B4.scd')
@@ -42,6 +44,7 @@ describe('GOOSE subscriber plugin', () => {
       html`<goose-mock-open-scd .doc=${doc}
       ></goosemock-open-scd>`
     );
+    await parent.requestUpdate();
     await parent.updateComplete;
     element = parent.plugin;
   });
@@ -390,6 +393,7 @@ describe('GOOSE subscriber plugin', () => {
           beforeEach(async () => {
             (<HTMLElement>getItemFromSubscriberList('IED4')).click();
             await element.requestUpdate();
+            await element.updateComplete;
           });
 
           describe('the left hand side subscriber IED list', () => {
diff --git a/packages/open-scd/test/integration/editors/IED.test.ts b/packages/open-scd/test/integration/editors/IED.test.ts
index 4778597dd4..cadd459f2b 100644
--- a/packages/open-scd/test/integration/editors/IED.test.ts
+++ b/packages/open-scd/test/integration/editors/IED.test.ts
@@ -297,6 +297,7 @@ describe('IED Plugin', () => {
               'mwc-icon-button[icon="add"]'
             ) as HTMLElement)!.click();
 
+          await parent.requestUpdate();
           await parent.updateComplete;
 
           expect(parent.wizardUI.dialogs.length).to.equal(1);
diff --git a/packages/open-scd/test/integration/editors/SMVSubscriberDataBinding.test.ts b/packages/open-scd/test/integration/editors/SMVSubscriberDataBinding.test.ts
index 231661b020..f1a8e50b05 100644
--- a/packages/open-scd/test/integration/editors/SMVSubscriberDataBinding.test.ts
+++ b/packages/open-scd/test/integration/editors/SMVSubscriberDataBinding.test.ts
@@ -82,6 +82,7 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
       )
     )).click();
     await element.updateComplete;
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
@@ -126,6 +127,7 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
       )
     )).click();
     await element.updateComplete;
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
diff --git a/packages/open-scd/test/integration/editors/SMVSubscriberLaterBinding.test.ts b/packages/open-scd/test/integration/editors/SMVSubscriberLaterBinding.test.ts
index 052c3c9fc0..1c6b457913 100644
--- a/packages/open-scd/test/integration/editors/SMVSubscriberLaterBinding.test.ts
+++ b/packages/open-scd/test/integration/editors/SMVSubscriberLaterBinding.test.ts
@@ -107,6 +107,7 @@ describe('SMV Subscribe Later Binding plugin', () => {
     )).click();
 
     await element.updateComplete;
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     expect(
@@ -187,6 +188,7 @@ describe('SMV Subscribe Later Binding plugin', () => {
       )
     )).click();
     await element.updateComplete;
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     expect(
diff --git a/packages/open-scd/test/integration/editors/SMVSubscriberMessageBinding.test.ts b/packages/open-scd/test/integration/editors/SMVSubscriberMessageBinding.test.ts
index 859fc67218..4619d1016e 100644
--- a/packages/open-scd/test/integration/editors/SMVSubscriberMessageBinding.test.ts
+++ b/packages/open-scd/test/integration/editors/SMVSubscriberMessageBinding.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-
+import {initializeNsdoc} from '../../../src/foundation/nsdoc.js';
 import SMVSubscriberMessageBindingPlugin from '../../../src/editors/SMVSubscriberMessageBinding.js';
 
 import { ListItem } from '@material/mwc-list/mwc-list-item.js';
@@ -23,10 +23,11 @@ class SmvMockOpenSCD extends MockOpenSCD {
   }
 }
 
-describe('Sampled Values Plugin', () => {
+describe('Sampled Values Plugin', async () => {
   let element: SMVSubscriberMessageBindingPlugin;
   let parent: SmvMockOpenSCD;
   let doc: XMLDocument;
+  const nsdoc = await initializeNsdoc();
 
   beforeEach(async () => {
     doc = await fetch('/test/testfiles/editors/MessageBindingSMV2007B4.scd')
@@ -36,7 +37,7 @@ describe('Sampled Values Plugin', () => {
     parent = await fixture(
       html`<smv-mock-open-scd .doc=${doc}></smv-mock-open-scd>`
     );
-
+    await parent.requestUpdate();
     await parent.updateComplete;
 
     element = parent.plugin;
@@ -364,6 +365,7 @@ describe('Sampled Values Plugin', () => {
         beforeEach(async () => {
           (<HTMLElement>getItemFromSubscriberList('MSVCB01')).click();
           await element.updateComplete;
+          await parent.requestUpdate();
           await parent.updateComplete;
         });
 
diff --git a/packages/open-scd/test/integration/editors/Substation.test.ts b/packages/open-scd/test/integration/editors/Substation.test.ts
index 7eb90d766e..50bb59644f 100644
--- a/packages/open-scd/test/integration/editors/Substation.test.ts
+++ b/packages/open-scd/test/integration/editors/Substation.test.ts
@@ -70,6 +70,7 @@ describe('Substation Plugin', () => {
           ?.querySelector('substation-plugin')
           ?.shadowRoot?.querySelector('mwc-fab')
       )).click();
+      await parent.requestUpdate();
       await parent.updateComplete;
       expect(parent.wizardUI.dialogs.length).to.equal(1);
     });
diff --git a/packages/open-scd/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js b/packages/open-scd/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js
index 9dc7a06ccf..0e87a09d80 100644
--- a/packages/open-scd/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js
+++ b/packages/open-scd/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js
@@ -1185,3 +1185,987 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED for pa
 `;
 /* end snapshot GOOSE subscriber plugin in Subscriber view with a selected IED for partially subscribed GSEControl s clicking on the GSEControl list item the left hand side subscriber IED list looks like the latest snapshot */
 
+snapshots["in Publisher view per default the plugin itself looks like the latest snapshot"] = 
+`<div>
+  <mwc-formfield label="Publisher | Subscriber">
+    <mwc-radio
+      checked=""
+      id="goosePublisherView"
+      name="view"
+      value="goose"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <mwc-formfield label="Subscriber | Publisher">
+    <mwc-radio
+      id="gooseSubscriberView"
+      name="view"
+      value="ied"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <div class="container">
+    <goose-list class="row">
+    </goose-list>
+    <subscriber-list-goose class="row">
+    </subscriber-list-goose>
+  </div>
+</div>
+`;
+/* end snapshot in Publisher view per default the plugin itself looks like the latest snapshot */
+
+snapshots["in Publisher view per default the right hand side GSEControl list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    GOOSE Publishers
+  </h1>
+  <filtered-list activatable="">
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value="IED1>>CircuitBreaker_CB1>GCB"
+    >
+      <span>
+        IED1
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="large"
+      hasmeta=""
+      mwc-list-item=""
+      tabindex="0"
+      value="IED1>>CircuitBreaker_CB1>GCB"
+    >
+      <mwc-icon slot="graphic">
+      </mwc-icon>
+      <span>
+        GCB
+      </span>
+      <mwc-icon-button
+        class="hidden"
+        icon="edit"
+        slot="meta"
+      >
+      </mwc-icon-button>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value="IED2>>CBSW>GCB"
+    >
+      <span>
+        IED2
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="large"
+      hasmeta=""
+      mwc-list-item=""
+      tabindex="-1"
+      value="IED2>>CBSW>GCB"
+    >
+      <mwc-icon slot="graphic">
+      </mwc-icon>
+      <span>
+        GCB
+      </span>
+      <mwc-icon-button
+        class="hidden"
+        icon="edit"
+        slot="meta"
+      >
+      </mwc-icon-button>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value=""
+    >
+      <span>
+        IED3
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value="IED4>>CircuitBreaker_CB1>GCB"
+    >
+      <span>
+        IED4
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="large"
+      hasmeta=""
+      mwc-list-item=""
+      tabindex="-1"
+      value="IED4>>CircuitBreaker_CB1>GCB"
+    >
+      <mwc-icon slot="graphic">
+      </mwc-icon>
+      <span>
+        GCB
+      </span>
+      <mwc-icon-button
+        class="hidden"
+        icon="edit"
+        slot="meta"
+      >
+      </mwc-icon-button>
+    </mwc-list-item>
+  </filtered-list>
+</section>
+`;
+/* end snapshot in Publisher view per default the right hand side GSEControl list looks like the latest snapshot */
+
+snapshots["in Publisher view per default the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to GOOSE
+  </h1>
+  <mwc-list>
+    <mwc-list-item
+      aria-disabled="false"
+      noninteractive=""
+      tabindex="-1"
+    >
+      <span>
+        No control block selected
+      </span>
+    </mwc-list-item>
+  </mwc-list>
+</section>
+`;
+/* end snapshot in Publisher view per default the left hand side subscriber IED list looks like the latest snapshot */
+
+snapshots["in Publisher view with a selected GOOSE message the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED2 > GCB
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>CircuitBreaker_CB1> LGOS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3 IED4"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED3
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view with a selected GOOSE message the left hand side subscriber IED list looks like the latest snapshot */
+
+snapshots["in Publisher view with a selected GOOSE message for unsubscribed IEDs after clicking on the IEDs list element the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED2 > GCB
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1 IED3"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>CircuitBreaker_CB1> LGOS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED3
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        mwc-list-item=""
+        selected=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view with a selected GOOSE message for unsubscribed IEDs after clicking on the IEDs list element the left hand side subscriber IED list looks like the latest snapshot */
+
+snapshots["in Publisher view with a selected GOOSE message for subscribed IEDs after clicking on the IEDs list element looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED2 > GCB
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1 IED3 IED4"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED3
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view with a selected GOOSE message for subscribed IEDs after clicking on the IEDs list element looks like the latest snapshot */
+
+snapshots["in Publisher view with a selected GOOSE message for partially subscribed IEDs after clicking on the IEDs list element it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED2 > GCB
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1 IED4"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>CircuitBreaker_CB1> LGOS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED3
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view with a selected GOOSE message for partially subscribed IEDs after clicking on the IEDs list element it looks like the latest snapshot */
+
+snapshots["in Subscriber view per default the plugin itsself looks like the latest snapshot"] = 
+`<div>
+  <mwc-formfield label="Publisher | Subscriber">
+    <mwc-radio
+      id="goosePublisherView"
+      name="view"
+      value="goose"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <mwc-formfield label="Subscriber | Publisher">
+    <mwc-radio
+      checked=""
+      id="gooseSubscriberView"
+      name="view"
+      value="ied"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <div class="container">
+    <ied-list
+      class="row"
+      servicetype="goose"
+    >
+    </ied-list>
+    <subscriber-list-goose class="row">
+    </subscriber-list-goose>
+  </div>
+</div>
+`;
+/* end snapshot in Subscriber view per default the plugin itsself looks like the latest snapshot */
+
+snapshots["in Subscriber view per default the right hand side IEDs list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    GOOSE Subscribers
+  </h1>
+  <filtered-list activatable="">
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="0"
+    >
+      <span>
+        IED1
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED2
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED3
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED4
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+  </filtered-list>
+</section>
+`;
+/* end snapshot in Subscriber view per default the right hand side IEDs list looks like the latest snapshot */
+
+snapshots["in Subscriber view per default the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    GOOSE Messages subscribed to IED
+  </h1>
+  <mwc-list>
+    <mwc-list-item
+      aria-disabled="false"
+      noninteractive=""
+      tabindex="-1"
+    >
+      <span>
+        No IED selected
+      </span>
+    </mwc-list-item>
+  </mwc-list>
+</section>
+`;
+/* end snapshot in Subscriber view per default the left hand side subscriber IED list looks like the latest snapshot */
+
+snapshots["in Subscriber view with a selected IED the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    GOOSE Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1>>CircuitBreaker_CB1>GCB IED4>>CircuitBreaker_CB1>GCB"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          GCB (IED1)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          GCB (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view with a selected IED the left hand side subscriber IED list looks like the latest snapshot */
+
+snapshots["in Subscriber view with a selected IED for subscribed GSEControl s clicking on the GSEControl list item the left hand side subscriber IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    GOOSE Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1>>CircuitBreaker_CB1>GCB IED4>>CircuitBreaker_CB1>GCB"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          GCB (IED1)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          GCB (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view with a selected IED for subscribed GSEControl s clicking on the GSEControl list item the left hand side subscriber IED list looks like the latest snapshot */
+
diff --git a/packages/open-scd/test/integration/editors/__snapshots__/IED.test.snap.js b/packages/open-scd/test/integration/editors/__snapshots__/IED.test.snap.js
index 2e0ad05334..d8cf210dae 100644
--- a/packages/open-scd/test/integration/editors/__snapshots__/IED.test.snap.js
+++ b/packages/open-scd/test/integration/editors/__snapshots__/IED.test.snap.js
@@ -34,6 +34,7 @@ snapshots["IED Plugin with a doc loaded containing IEDs looks like the latest sn
         aria-selected="true"
         graphic="control"
         mwc-list-item=""
+        selected=""
         tabindex="0"
         twoline=""
         value="IED1"
diff --git a/packages/open-scd/test/integration/editors/__snapshots__/SMVSubscriberMessageBinding.test.snap.js b/packages/open-scd/test/integration/editors/__snapshots__/SMVSubscriberMessageBinding.test.snap.js
index aeeaed57df..fa5d92f0d9 100644
--- a/packages/open-scd/test/integration/editors/__snapshots__/SMVSubscriberMessageBinding.test.snap.js
+++ b/packages/open-scd/test/integration/editors/__snapshots__/SMVSubscriberMessageBinding.test.snap.js
@@ -1125,3 +1125,1127 @@ snapshots["Sampled Values Plugin in Subscriber view when selecting an IED and su
 `;
 /* end snapshot Sampled Values Plugin in Subscriber view when selecting an IED and subscribing a partially subscribed Sampled Value message it looks like the latest snapshot */
 
+snapshots["in Publisher view initially the plugin looks like the latest snapshot"] = 
+`<div>
+  <mwc-formfield label="Publisher | Subscriber">
+    <mwc-radio
+      checked=""
+      id="smvPublisherView"
+      name="view"
+      value="smv"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <mwc-formfield label="Subscriber | Publisher">
+    <mwc-radio
+      id="smvSubscriberView"
+      name="view"
+      value="ied"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <div class="container">
+    <smv-list class="row">
+    </smv-list>
+    <subscriber-list-smv class="row">
+    </subscriber-list-smv>
+  </div>
+</div>
+`;
+/* end snapshot in Publisher view initially the plugin looks like the latest snapshot */
+
+snapshots["in Publisher view initially the Sampled Values list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages
+  </h1>
+  <filtered-list activatable="">
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value=""
+    >
+      <span>
+        IED1
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value=""
+    >
+      <span>
+        IED2
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value="IED3>>MU01>MSVCB01"
+    >
+      <span>
+        IED3
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="large"
+      hasmeta=""
+      mwc-list-item=""
+      tabindex="0"
+      value="IED3>>MU01>MSVCB01"
+    >
+      <mwc-icon slot="graphic">
+      </mwc-icon>
+      <span>
+        MSVCB01
+      </span>
+      <mwc-icon-button
+        class="hidden"
+        icon="edit"
+        slot="meta"
+      >
+      </mwc-icon-button>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      noninteractive=""
+      tabindex="-1"
+      value="IED4>>CircuitBreaker_CB1>MSVCB02"
+    >
+      <span>
+        IED4
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <li
+      divider=""
+      role="separator"
+    >
+    </li>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="large"
+      hasmeta=""
+      mwc-list-item=""
+      tabindex="-1"
+      value="IED4>>CircuitBreaker_CB1>MSVCB02"
+    >
+      <mwc-icon slot="graphic">
+      </mwc-icon>
+      <span>
+        MSVCB02
+      </span>
+      <mwc-icon-button
+        class="hidden"
+        icon="edit"
+        slot="meta"
+      >
+      </mwc-icon-button>
+    </mwc-list-item>
+  </filtered-list>
+</section>
+`;
+/* end snapshot in Publisher view initially the Sampled Values list looks like the latest snapshot */
+
+snapshots["in Publisher view initially the subscriber list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to Sampled Value
+  </h1>
+  <mwc-list>
+    <mwc-list-item
+      aria-disabled="false"
+      noninteractive=""
+      tabindex="-1"
+    >
+      <span>
+        No control block selected
+      </span>
+    </mwc-list-item>
+  </mwc-list>
+</section>
+`;
+/* end snapshot in Publisher view initially the subscriber list looks like the latest snapshot */
+
+snapshots["in Publisher view when selecting a Sampled Values message the list on the right will initially show the subscribed / partially subscribed / not subscribed IEDs"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED3 > MSVCB01
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>Disconnectors> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED4>>CircuitBreaker_CB1> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED2"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED2
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view when selecting a Sampled Values message the list on the right will initially show the subscribed / partially subscribed / not subscribed IEDs */
+
+snapshots["in Publisher view when selecting a Sampled Values message and subscribing an unsubscribed IED it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED3 > MSVCB01
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>Disconnectors> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED4>>CircuitBreaker_CB1> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED2"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        mwc-list-item=""
+        selected=""
+        tabindex="0"
+      >
+        <span>
+          IED2
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view when selecting a Sampled Values message and subscribing an unsubscribed IED it looks like the latest snapshot */
+
+snapshots["in Publisher view when selecting a Sampled Values message and you unsubscribe a subscribed IED it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED3 > MSVCB01
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        selected=""
+        tabindex="0"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>Disconnectors> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED4>>CircuitBreaker_CB1> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED2"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED2
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view when selecting a Sampled Values message and you unsubscribe a subscribed IED it looks like the latest snapshot */
+
+snapshots["in Publisher view when selecting a Sampled Values message and you subscribe a partially subscribed IED it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    IEDs subscribed to IED3 > MSVCB01
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED1"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED1
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED1>>Disconnectors> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        hasmeta=""
+        mwc-list-item=""
+        selected=""
+        tabindex="0"
+      >
+        <span>
+          IED4
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+        <mwc-icon
+          slot="meta"
+          title="IED4>>CircuitBreaker_CB1> LSVS 1"
+        >
+          monitor_heart
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED2"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          IED2
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Publisher view when selecting a Sampled Values message and you subscribe a partially subscribed IED it looks like the latest snapshot */
+
+snapshots["in Subscriber view initially the plugin looks like the latest snapshot"] = 
+`<div>
+  <mwc-formfield label="Publisher | Subscriber">
+    <mwc-radio
+      id="smvPublisherView"
+      name="view"
+      value="smv"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <mwc-formfield label="Subscriber | Publisher">
+    <mwc-radio
+      checked=""
+      id="smvSubscriberView"
+      name="view"
+      value="ied"
+    >
+    </mwc-radio>
+  </mwc-formfield>
+  <div class="container">
+    <ied-list
+      class="row"
+      servicetype="smv"
+    >
+    </ied-list>
+    <subscriber-list-smv class="row">
+    </subscriber-list-smv>
+  </div>
+</div>
+`;
+/* end snapshot in Subscriber view initially the plugin looks like the latest snapshot */
+
+snapshots["in Subscriber view initially the IED list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Subscribers
+  </h1>
+  <filtered-list activatable="">
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="0"
+    >
+      <span>
+        IED1
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED2
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED3
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+    <mwc-list-item
+      aria-disabled="false"
+      graphic="icon"
+      mwc-list-item=""
+      tabindex="-1"
+    >
+      <span>
+        IED4
+      </span>
+      <mwc-icon slot="graphic">
+        developer_board
+      </mwc-icon>
+    </mwc-list-item>
+  </filtered-list>
+</section>
+`;
+/* end snapshot in Subscriber view initially the IED list looks like the latest snapshot */
+
+snapshots["in Subscriber view initially the subscriber list looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages subscribed to IED
+  </h1>
+  <mwc-list>
+    <mwc-list-item
+      aria-disabled="false"
+      noninteractive=""
+      tabindex="-1"
+    >
+      <span>
+        No IED selected
+      </span>
+    </mwc-list-item>
+  </mwc-list>
+</section>
+`;
+/* end snapshot in Subscriber view initially the subscriber list looks like the latest snapshot */
+
+snapshots["in Subscriber view when selecting an IED the subscriber list will initially show the subscribed / partially subscribed / not subscribed IEDs"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4>>CircuitBreaker_CB1>MSVCB02"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          MSVCB02 (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3>>MU01>MSVCB01"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          MSVCB01 (IED3)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view when selecting an IED the subscriber list will initially show the subscribed / partially subscribed / not subscribed IEDs */
+
+snapshots["in Subscriber view when selecting an IED and subscribing a unsubscribed Sampled Value message clicking on a SampledValueControl list item it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3>>MU01>MSVCB01"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          MSVCB01 (IED3)
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4>>CircuitBreaker_CB1>MSVCB02"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        mwc-list-item=""
+        selected=""
+        tabindex="0"
+      >
+        <span>
+          MSVCB02 (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view when selecting an IED and subscribing a unsubscribed Sampled Value message clicking on a SampledValueControl list item it looks like the latest snapshot */
+
+snapshots["in Subscriber view when selecting an IED and unsubscribing a subscribed Sampled Value message it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3>>MU01>MSVCB01"
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        mwc-list-item=""
+        selected=""
+        tabindex="-1"
+      >
+        <span>
+          MSVCB01 (IED3)
+        </span>
+        <mwc-icon slot="graphic">
+          clear
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4>>CircuitBreaker_CB1>MSVCB02"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          MSVCB02 (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view when selecting an IED and unsubscribing a subscribed Sampled Value message it looks like the latest snapshot */
+
+snapshots["in Subscriber view when selecting an IED and subscribing a partially subscribed Sampled Value message it looks like the latest snapshot"] = 
+`<section tabindex="0">
+  <h1>
+    Sampled Value Messages subscribed to IED2
+  </h1>
+  <div class="wrapper">
+    <filtered-list>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value=""
+      >
+        <span>
+          Subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        noninteractive=""
+        tabindex="-1"
+      >
+        <span>
+          None
+        </span>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED4>>CircuitBreaker_CB1>MSVCB02"
+      >
+        <span>
+          Partially subscribed
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        aria-selected="true"
+        graphic="avatar"
+        mwc-list-item=""
+        selected=""
+        tabindex="0"
+      >
+        <span>
+          MSVCB02 (IED4)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        noninteractive=""
+        tabindex="-1"
+        value="IED3>>MU01>MSVCB01"
+      >
+        <span>
+          Available to subscribe
+        </span>
+      </mwc-list-item>
+      <li
+        divider=""
+        role="separator"
+      >
+      </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="-1"
+      >
+        <span>
+          MSVCB01 (IED3)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
+    </filtered-list>
+  </div>
+</section>
+`;
+/* end snapshot in Subscriber view when selecting an IED and subscribing a partially subscribed Sampled Value message it looks like the latest snapshot */
+
diff --git a/packages/open-scd/test/integration/editors/__snapshots__/Substation.test.snap.js b/packages/open-scd/test/integration/editors/__snapshots__/Substation.test.snap.js
index ac79c3ceea..e08b60721e 100644
--- a/packages/open-scd/test/integration/editors/__snapshots__/Substation.test.snap.js
+++ b/packages/open-scd/test/integration/editors/__snapshots__/Substation.test.snap.js
@@ -8,7 +8,7 @@ snapshots["Substation Plugin without a doc loaded looks like the latest snapshot
   <mwc-fab
     extended=""
     icon="add"
-    label="[substation.wizard.title.add]"
+    label="substation.wizard.title.add"
   >
   </mwc-fab>
 </h1>
diff --git a/packages/open-scd/test/integration/editors/communication/Communication.test.ts b/packages/open-scd/test/integration/editors/communication/Communication.test.ts
index f1b6daf2af..221920e9e5 100644
--- a/packages/open-scd/test/integration/editors/communication/Communication.test.ts
+++ b/packages/open-scd/test/integration/editors/communication/Communication.test.ts
@@ -68,6 +68,7 @@ describe('Communication Plugin', () => {
     it('that opens a add subnetwork wizard on mwc-fab click', async () => {
       expect(parent.wizardUI.dialogs.length).to.equal(0);
       fab.click();
+      await parent.requestUpdate();
       await parent.updateComplete;
       expect(parent.wizardUI.dialogs.length).to.equal(1);
     });
diff --git a/packages/open-scd/test/integration/editors/triggered/ImportIedsPlugin.test.ts b/packages/open-scd/test/integration/editors/triggered/ImportIedsPlugin.test.ts
index 5a1f9cb253..e64d2d613d 100644
--- a/packages/open-scd/test/integration/editors/triggered/ImportIedsPlugin.test.ts
+++ b/packages/open-scd/test/integration/editors/triggered/ImportIedsPlugin.test.ts
@@ -407,8 +407,8 @@ describe('ImportIedsPlugin', () => {
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
       element.prepareImport(importDoc, 'invalid.iid');
 
-      expect(parent.log[0].kind).to.equal('error');
-      expect(parent.log[0].title).to.equal('No IED element in the file');
+      expect(parent.historyAddon.log[0].kind).to.equal('error');
+      expect(parent.historyAddon.log[0].title).to.equal('No IED element in the file');
     });
 
     it('throws duplicate ied name error', async () => {
@@ -417,8 +417,8 @@ describe('ImportIedsPlugin', () => {
         .then(str => new DOMParser().parseFromString(str, 'application/xml'));
       element.prepareImport(importDoc, 'duplicate.iid');
 
-      expect(parent.log[0].kind).to.equal('error');
-      expect(parent.log[0].title).to.equal(
+      expect(parent.historyAddon.log[0].kind).to.equal('error');
+      expect(parent.historyAddon.log[0].title).to.equal(
         'IED element IED2 already in the file'
       );
     });
@@ -431,8 +431,8 @@ describe('ImportIedsPlugin', () => {
 
       element.prepareImport(importDoc, 'parsererror.iid');
 
-      expect(parent.log[0].kind).to.equal('error');
-      expect(parent.log[0].title).to.equal('Parser error');
+      expect(parent.historyAddon.log[0].kind).to.equal('error');
+      expect(parent.historyAddon.log[0].title).to.equal('Parser error');
     });
   });
 });
diff --git a/packages/open-scd/test/integration/open-scd.test.ts b/packages/open-scd/test/integration/open-scd.test.ts
index 18c92cd66c..582c25cfb0 100644
--- a/packages/open-scd/test/integration/open-scd.test.ts
+++ b/packages/open-scd/test/integration/open-scd.test.ts
@@ -42,31 +42,31 @@ describe('open-scd', () => {
   });
 
   it('opens the log on log icon click', async () => {
-    expect(element.logUI).to.have.property('open', false);
+    expect(element.historyAddon.logUI).to.have.property('open', false);
     await (<HTMLElement>(
       element.shadowRoot!.querySelector('mwc-icon-button[icon="list"]')!
     )).click();
-    expect(element.logUI).to.have.property('open', true);
+    expect(element.historyAddon.logUI).to.have.property('open', true);
   });
 
   it('opens the history on history icon click', async () => {
-    expect(element.historyUI).to.have.property('open', false);
+    expect(element.historyAddon.historyUI).to.have.property('open', false);
     await (<HTMLElement>(
       element.shadowRoot!.querySelector('mwc-icon-button[icon="history"]')!
     )).click();
-    expect(element.historyUI).to.have.property('open', true);
+    expect(element.historyAddon.historyUI).to.have.property('open', true);
   });
 
   it('opens the log on snackbar button click', async () => {
-    expect(element.logUI).to.have.property('open', false);
-    await element.errorUI.querySelector('mwc-button')!.click();
-    expect(element.logUI).to.have.property('open', true);
+    expect(element.historyAddon.logUI).to.have.property('open', false);
+    await element.historyAddon.errorUI.querySelector('mwc-button')!.click();
+    expect(element.historyAddon.logUI).to.have.property('open', true);
   });
 
   it('opens the diagnostics on snackbar button click', async () => {
-    expect(element.diagnosticUI).to.have.property('open', false);
-    await element.issueUI.querySelector('mwc-button')!.click();
-    expect(element.diagnosticUI).to.have.property('open', true);
+    expect(element.historyAddon.diagnosticUI).to.have.property('open', false);
+    await element.historyAddon.issueUI.querySelector('mwc-button')!.click();
+    expect(element.historyAddon.diagnosticUI).to.have.property('open', true);
   });
 
   /**
diff --git a/packages/open-scd/test/integration/validators/ValidateSchema.test.ts b/packages/open-scd/test/integration/validators/ValidateSchema.test.ts
index 282bf1715f..b3136fb149 100644
--- a/packages/open-scd/test/integration/validators/ValidateSchema.test.ts
+++ b/packages/open-scd/test/integration/validators/ValidateSchema.test.ts
@@ -37,7 +37,7 @@ describe('ValidateSchema plugin', () => {
     });
 
     beforeEach(async () => {
-      parent.diagnoses.clear();
+      parent.historyAddon.diagnoses.clear();
       await parent.updateComplete;
 
       await element.validate();
@@ -45,11 +45,11 @@ describe('ValidateSchema plugin', () => {
     });
 
     it('zeroissues indication looks like the latest snapshot', async () =>
-      await expect(parent.diagnosticUI).to.equalSnapshot());
+      await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot());
 
     it('indicates successful schema validation in the diagnoses pane', async () => {
       const lastEntry = <IssueDetail[]>(
-        parent.diagnoses.get('/src/validators/ValidateSchema.js')
+        parent.historyAddon.diagnoses.get('/src/validators/ValidateSchema.js')
       );
       expect(lastEntry.length).to.equal(1);
       expect(lastEntry[0].title).to.contain(
@@ -58,7 +58,7 @@ describe('ValidateSchema plugin', () => {
     });
 
     it('indicates successful schema validation in the log', async () => {
-      const lastEntry = <LogEntry>parent.log.pop();
+      const lastEntry = <LogEntry>parent.historyAddon.log.pop();
       expect(lastEntry.kind).to.equal('info');
       expect(lastEntry.title).to.contain(
         'valid2007B XML schema validation successful'
@@ -79,7 +79,7 @@ describe('ValidateSchema plugin', () => {
     });
 
     beforeEach(async () => {
-      parent.diagnoses.clear();
+      parent.historyAddon.diagnoses.clear();
       await parent.updateComplete;
 
       await element.validate();
@@ -87,14 +87,14 @@ describe('ValidateSchema plugin', () => {
     });
 
     it('pushes issues to the diagnostics pane that look like the latest snapshot', async () =>
-      await expect(parent.diagnosticUI).to.equalSnapshot());
+      await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot());
 
     it('create issues in diagnose', async () =>
-      expect(parent.diagnoses.get('/src/validators/ValidateSchema.js')).to.not
+      expect(parent.historyAddon.diagnoses.get('/src/validators/ValidateSchema.js')).to.not
         .be.undefined);
 
     it('generates error messages in the log', async () => {
-      const lastLogEntry = <LogEntry>parent.log.pop();
+      const lastLogEntry = <LogEntry>parent.historyAddon.log.pop();
       expect(lastLogEntry.kind).to.equal('warning');
       expect(lastLogEntry.title).to.contain(
         'invalid2007B XML schema validation failed'
diff --git a/packages/open-scd/test/integration/validators/ValidateTemplates.test.ts b/packages/open-scd/test/integration/validators/ValidateTemplates.test.ts
index 502874d456..48944b7e52 100644
--- a/packages/open-scd/test/integration/validators/ValidateTemplates.test.ts
+++ b/packages/open-scd/test/integration/validators/ValidateTemplates.test.ts
@@ -41,8 +41,8 @@ describe('ValidateTemplates OpenSCD integration test ', () => {
 
     it('shows a "No errors" message in the diagnostics pane', async () => {
       await parent.requestUpdate();
-      expect(parent.diagnosticUI).to.contain.text('No errors');
-      await expect(parent.diagnosticUI).to.equalSnapshot();
+      expect(parent.historyAddon.diagnosticUI).to.contain.text('No errors');
+      await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot();
     });
   });
 
@@ -71,14 +71,14 @@ describe('ValidateTemplates OpenSCD integration test ', () => {
       await parent.updateComplete;
     });
     it('generates issues in the diagnistics pane', async () => {
-      const issues = parent.diagnoses.get(
+      const issues = parent.historyAddon.diagnoses.get(
         '/src/validators/ValidateTemplates.js'
       );
       expect(issues?.length).to.equal(28);
     }).timeout(1000);
     it('pushes issues to the diagnostics pane that look like the latest snapshot', async () => {
       await parent.requestUpdate();
-      await expect(parent.diagnosticUI).to.equalSnapshot();
+      await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot();
     });
   });
   describe('with schema version smaller "2007B3"', () => {
@@ -106,14 +106,14 @@ describe('ValidateTemplates OpenSCD integration test ', () => {
       await parent.updateComplete;
     });
     it('shows only one message in the diagnostics pane', async () => {
-      const issues = parent.diagnoses.get(
+      const issues = parent.historyAddon.diagnoses.get(
         '/src/validators/ValidateTemplates.js'
       );
       expect(issues?.length).to.equal(1);
     }).timeout(1000);
     it('looks like the latest snapshot', async () => {
       await parent.requestUpdate();
-      await expect(parent.diagnosticUI).to.equalSnapshot();
+      await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot();
     });
   });
 });
diff --git a/packages/open-scd/test/mock-editor-logger.ts b/packages/open-scd/test/mock-editor-logger.ts
index 63f1e9aae1..3a93eab818 100644
--- a/packages/open-scd/test/mock-editor-logger.ts
+++ b/packages/open-scd/test/mock-editor-logger.ts
@@ -1,7 +1,42 @@
-import { LitElement, customElement } from 'lit-element';
+import { LitElement, customElement, property, state, html, query, TemplateResult } from 'lit-element';
 
-import { Editing } from '../src/Editing.js';
-import { Historing } from '../src/Historing.js';
+import '../src/addons/Editor.js';
+import '../src/addons/History.js';
+import { OscdEditor } from '../src/addons/Editor.js';
+import { EditCountEvent, OscdHistory } from '../src/addons/History.js';
 
 @customElement('mock-editor-logger')
-export class MockEditorLogger extends Editing(Historing(LitElement)) {}
+export class MockEditorLogger extends LitElement {
+  @property({ type: Object }) doc!: XMLDocument;
+
+  @property({ type: String }) docName = 'test';
+
+  @property({ type: String }) docId = 'test';
+
+  @state()
+  editCount = -1;
+
+  @query('oscd-history')
+  history!: OscdHistory;
+
+  @query('oscd-editor')
+  editor!: OscdEditor;
+
+  render(): TemplateResult {
+    return html`
+        <oscd-history 
+            .host=${this} 
+            @edit-count="${(e:EditCountEvent) => { this.editCount = e.detail.editCount }}"
+          >
+            <oscd-editor
+              .doc=${this.doc}
+              .docName=${this.docName}
+              .docId=${this.docId}
+              .host=${this}
+              .editCount=${this.editCount}
+            >
+
+            </oscd-editor>
+          </oscd-history>`;
+  }
+}
diff --git a/packages/open-scd/test/unit/Historing.test.ts b/packages/open-scd/test/unit/Historing.test.ts
index ea4a5155ac..01e33686a8 100644
--- a/packages/open-scd/test/unit/Historing.test.ts
+++ b/packages/open-scd/test/unit/Historing.test.ts
@@ -1,19 +1,22 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import './mock-logger.js';
+import '../mock-editor-logger.js';
 import { MockAction } from './mock-actions.js';
-import { MockLogger } from './mock-logger.js';
+import { MockEditorLogger } from '../mock-editor-logger.js';
 
 import {
   CommitEntry,
   newIssueEvent,
   newLogEvent,
 } from '../../src/foundation.js';
+import { OscdHistory } from '../../src/addons/History.js';
 
 describe('HistoringElement', () => {
-  let element: MockLogger;
+  let mock: MockEditorLogger;
+  let element: OscdHistory;
   beforeEach(async () => {
-    element = <MockLogger>await fixture(html`<mock-logger></mock-logger>`);
+    mock = <MockEditorLogger>await fixture(html`<mock-editor-logger></mock-editor-logger>`);
+    element = mock.history;
   });
 
   it('starts out with an empty log', () =>
diff --git a/packages/open-scd/test/unit/Plugging.test.ts b/packages/open-scd/test/unit/Plugging.test.ts
index f9c69fb370..7f4c7f4f06 100644
--- a/packages/open-scd/test/unit/Plugging.test.ts
+++ b/packages/open-scd/test/unit/Plugging.test.ts
@@ -114,7 +114,7 @@ describe('OpenSCD-Plugin', () => {
       await element.pluginDownloadUI.updateComplete;
       menuKindOption = <HTMLElement>(
         element.pluginDownloadUI.querySelector(
-          '#pluginKindList > mwc-radio-list-item[id="menu"]'
+          '#pluginKindList > mwc-radio-list-item[value="menu"]'
         )
       );
       validatorKindOption = <HTMLElement>(