diff --git a/CHANGES.md b/CHANGES.md
index a40540ae59ccef42415157c51d03e25edd06dbcf..3eff2d2b1e12b28ebeb253679cae79c9bdc925f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,10 +2,18 @@
 
 ## Development ():
 
-## 0.9.1 (04.02.2020):
+## 0.9.3 (04.02.2020):
 
 * **Update**: Updated the TEI editor dependency
 
+## 0.9.2 (30.01.2020):
+
+* **Update**: Updated icons in the menu
+
+## 0.9.1 (27.01.2020):
+
+* **Update**: Updated the TEI editor dependency for some performance improvements
+
 ## 0.9.0 (24.01.2020):
 
 * **Update**: Updated to use the new TEI editor
diff --git a/docs/editor/global_comments.rst b/docs/editor/global_comments.rst
index a7dfc71362901073319a484af5ff50c95b402b0f..9f6b800ec339ddafd10da417884d586396950926 100644
--- a/docs/editor/global_comments.rst
+++ b/docs/editor/global_comments.rst
@@ -1,8 +1,8 @@
-#########
-Kommentar
-#########
+#######
+Apparat
+#######
 
-Über den Menüpunkt "Kommentar" kann der Kommentar zum zu edierenden Text bearbeitet werden. Der Editor besteht aus einem
+Über den Menüpunkt "Apparat" kann der Apparat zum zu edierenden Text bearbeitet werden. Der Editor besteht aus einem
 Textbereich auf der linken Seite und einem Auszeichnungsbalken auf der rechten Seite. Die Darstellung des Textes richtet
 sich soweit möglich nach der Darstellung auf der öffentlichen Webseite.
 
diff --git a/docs/editor/icons/absatz.svg b/docs/editor/icons/absatz.svg
new file mode 100644
index 0000000000000000000000000000000000000000..094fef8bd2527cc1829db8e5debcb34d9dd2db67
--- /dev/null
+++ b/docs/editor/icons/absatz.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/bold.svg b/docs/editor/icons/bold.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9998b2367462051e153808bfceb0bf3814e1fbac
--- /dev/null
+++ b/docs/editor/icons/bold.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/edit.svg b/docs/editor/icons/edit.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bb4259a3b0e3208c266918305a8068311f65df46
--- /dev/null
+++ b/docs/editor/icons/edit.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/footnote.svg b/docs/editor/icons/footnote.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8bc3f5e1225a65881096a73d005f12b2ccc90ee3
--- /dev/null
+++ b/docs/editor/icons/footnote.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M14,10V4.5L19.5,10M5,3C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V9L15,3H5Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/foreign.svg b/docs/editor/icons/foreign.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5984ec4434ec7ca20154374c79af9fceb7a93618
--- /dev/null
+++ b/docs/editor/icons/foreign.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/heading-level-1.svg b/docs/editor/icons/heading-level-1.svg
new file mode 100644
index 0000000000000000000000000000000000000000..52864a406633d90826748aaebc47f22d65a3a80d
--- /dev/null
+++ b/docs/editor/icons/heading-level-1.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z" /></svg>
diff --git a/docs/editor/icons/heading-level-2.svg b/docs/editor/icons/heading-level-2.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a513b7d0ce7d6900d83302b3f29e635a945c3a31
--- /dev/null
+++ b/docs/editor/icons/heading-level-2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/heading-level-3.svg b/docs/editor/icons/heading-level-3.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6d7b0d86a2d7e325f950e6e5670632f14b19f572
--- /dev/null
+++ b/docs/editor/icons/heading-level-3.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/heading-level-4.svg b/docs/editor/icons/heading-level-4.svg
new file mode 100644
index 0000000000000000000000000000000000000000..703364e9e48ff953363c9dd28c6b7282c7d3749f
--- /dev/null
+++ b/docs/editor/icons/heading-level-4.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M18,18V13H13V11L18,4H20V11H21V13H20V18H18M18,11V7.42L15.45,11H18Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/italic.svg b/docs/editor/icons/italic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4ca42208cda21c1e875cfb3ded93766596eaa279
--- /dev/null
+++ b/docs/editor/icons/italic.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/nicht-ermittelt.svg b/docs/editor/icons/nicht-ermittelt.svg
new file mode 100644
index 0000000000000000000000000000000000000000..14e83c0bc1bcf16719500bd746ae9c3b9c750c7b
--- /dev/null
+++ b/docs/editor/icons/nicht-ermittelt.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/page-begin.svg b/docs/editor/icons/page-begin.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f54b4cc5e47f325ac01e0fa43e61d3bfb5d54456
--- /dev/null
+++ b/docs/editor/icons/page-begin.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,2L14,6.5V17.5L19,13V2M6.5,5C4.55,5 2.45,5.4 1,6.5V21.16C1,21.41 1.25,21.66 1.5,21.66C1.6,21.66 1.65,21.59 1.75,21.59C3.1,20.94 5.05,20.5 6.5,20.5C8.45,20.5 10.55,20.9 12,22C13.35,21.15 15.8,20.5 17.5,20.5C19.15,20.5 20.85,20.81 22.25,21.56C22.35,21.61 22.4,21.59 22.5,21.59C22.75,21.59 23,21.34 23,21.09V6.5C22.4,6.05 21.75,5.75 21,5.5V7.5L21,13V19C19.9,18.65 18.7,18.5 17.5,18.5C15.8,18.5 13.35,19.15 12,20V13L12,8.5V6.5C10.55,5.4 8.45,5 6.5,5V5Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/quelle.svg b/docs/editor/icons/quelle.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1105786dc21502154cc4d0d1dab5779473687e0a
--- /dev/null
+++ b/docs/editor/icons/quelle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M21,5C19.89,4.65 18.67,4.5 17.5,4.5C15.55,4.5 13.45,4.9 12,6C10.55,4.9 8.45,4.5 6.5,4.5C4.55,4.5 2.45,4.9 1,6V20.65C1,20.9 1.25,21.15 1.5,21.15C1.6,21.15 1.65,21.1 1.75,21.1C3.1,20.45 5.05,20 6.5,20C8.45,20 10.55,20.4 12,21.5C13.35,20.65 15.8,20 17.5,20C19.15,20 20.85,20.3 22.25,21.05C22.35,21.1 22.4,21.1 22.5,21.1C22.75,21.1 23,20.85 23,20.6V6C22.4,5.55 21.75,5.25 21,5M21,18.5C19.9,18.15 18.7,18 17.5,18C15.8,18 13.35,18.65 12,19.5V8C13.35,7.15 15.8,6.5 17.5,6.5C18.7,6.5 19.9,6.65 21,7V18.5Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/quote.svg b/docs/editor/icons/quote.svg
new file mode 100644
index 0000000000000000000000000000000000000000..22e40c8ea7a720fe868194f22e38868c3f065339
--- /dev/null
+++ b/docs/editor/icons/quote.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M14,17H17L19,13V7H13V13H16M6,17H9L11,13V7H5V13H8L6,17Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/sperrung.svg b/docs/editor/icons/sperrung.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1f405ab4dcc708afb6b2e2220ba417ee2460c178
--- /dev/null
+++ b/docs/editor/icons/sperrung.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/stellenkommentar.svg b/docs/editor/icons/stellenkommentar.svg
new file mode 100644
index 0000000000000000000000000000000000000000..434fe69e9b3d5098ffc76c06e4a59001b65857a8
--- /dev/null
+++ b/docs/editor/icons/stellenkommentar.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M6,7H18V9H6V7M6,11H15V13H6V11Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/sup.svg b/docs/editor/icons/sup.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f5b35e022501d5ee7eb023847ce339626461de2e
--- /dev/null
+++ b/docs/editor/icons/sup.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/vers.svg b/docs/editor/icons/vers.svg
new file mode 100644
index 0000000000000000000000000000000000000000..40ffc9ad3411eb01cc8fa84c470444c6ded8274c
--- /dev/null
+++ b/docs/editor/icons/vers.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,9H20V11H4V9M4,13H14V15H4V13Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/icons/verweis-apparat.svg b/docs/editor/icons/verweis-apparat.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e83b3810cff9086b7b94389c148cd65bd415e5a4
--- /dev/null
+++ b/docs/editor/icons/verweis-apparat.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20 2H4C2.9 2 2 2.9 2 4V16C2 17.1 2.9 18 4 18H8V21C8 21.6 8.4 22 9 22H9.5C9.7 22 10 21.9 10.2 21.7L13.9 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H13.1L10 19.1V16H4V4H20V16M8 9V11H12.5L10.7 12.8L12 14L16 10L12 6L10.8 7.2L12.5 9H8Z" /></svg>
\ No newline at end of file
diff --git a/docs/editor/index.rst b/docs/editor/index.rst
index 3bc5f12418e04dbaa554a38be2eab2a81ddee261..ad240668bb24d123b0df4721179d7bd1fd0c1faf 100644
--- a/docs/editor/index.rst
+++ b/docs/editor/index.rst
@@ -3,8 +3,8 @@ Text Editor
 ###########
 
 Der Text Editor erlaubt das Bearbeiten der TEI Dateien. Dazu bietet er die Möglichkeit der Bearbeitung der Metadaten
-und Texteditoren für den Haupttext, Kommentar, und Einzelstellenerläuterungen. In den drei letztgenannten gibt es
-eine Reihe von Auszeichnungsmöglichkeiten. Details zu all diesen finden sich in folgenen Bereichen:
+und Texteditoren für den Haupttext und Apparat. In den zwei Texteditoren gibt es eine Reihe von
+Auszeichnungsmöglichkeiten. Details zu all diesen finden sich in folgenen Bereichen:
 
 .. toctree::
    :maxdepth: 2
@@ -12,10 +12,9 @@ eine Reihe von Auszeichnungsmöglichkeiten. Details zu all diesen finden sich in
    metadata
    main_text
    global_comments
-   individual_comments
    markup
 
-Im Editor können sie zwischen den vier Bereichen jederzeit hin und herwechseln, ohne dass Änderungen verloren gehen.
+Im Editor können sie zwischen den drei Bereichen jederzeit hin und herwechseln, ohne dass Änderungen verloren gehen.
 Um Änderungen aber permanent zu speichern, muss aus dem "File" Menü der Eintrag "Save" ausgewählt werden. Der Editor
 fragt dann um eine kurze Beschreibung (maximal 32 Zeichen) der Änderung und speichert diese dann.
 
diff --git a/docs/editor/individual_comments.rst b/docs/editor/individual_comments.rst
deleted file mode 100644
index 05896d3f5b0b50e2702bb49e7eb2fa2958fb548d..0000000000000000000000000000000000000000
--- a/docs/editor/individual_comments.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-##########################
-Einzelstellenerläuterungen
-##########################
-
-Über den Menüpunkt "Einzelstellenerläuterung" können die Einzelstellenerläuterungen zum zu edierenden Text bearbeitet
-werden. Der Editor hat eine zusätzliche Menüleiste, aus der sie die zu bearbeitende Einzelstellenerläuterung auswählen
-können, sie löschen, oder eine neue Einzelstellenerläuterung hinzufügen.
-
-Wenn sie eine Einzelstellenerläuterung auswählen oder neu hinzufügen, dann wird darunter der Text der
-Einzelstellenerläuterung angezeigt, mit dem Textbereich auf der linken Seite und einem Auszeichnungsbalken auf der
-rechten Seite. Die Darstellung des Textes richtet sich soweit möglich nach der Darstellung auf der öffentlichen
-Webseite.
-
-Geben sie in den Textbereich den Text ein, wählen sie auszuzeichnende Stellen aus und nutzen sie die
-:doc:`markup` auf der rechten Seite um Elemente des Textes auszuzeichnen.
-
-Auf der rechten Seite hat die Einzelstellenerläuterung ein zusätzliches Attribute:
-
-* **Schlüssel**: Dies ist der eindeutige Schlüssel, welcher diese Einzelstellenerläuterung identifiziert. Diese **muss**
-  innerhalb des Textes eindeutig sein. Der Schlüssel ist nur innerhalb des Editors sichtbar. Auf der Webseite wird
-  er im Hintergrund genutzt um zwischen Text und Einzelstellenerläuterung zu verlinken.
diff --git a/docs/editor/markup.rst b/docs/editor/markup.rst
index b9851baa51d75639f84bf8c05bcdf3e29c17ce57..9b9f635fe6736655de35849f09ade6e05ce60f24 100644
--- a/docs/editor/markup.rst
+++ b/docs/editor/markup.rst
@@ -20,49 +20,47 @@ Blocktypen
 
 Folgende Textblöcke können ausgewählt werden.
 
-Überschrift
------------
+Überschrift |heading_img_1| |heading_img_2| |heading_img_3| |heading_img_4|
+---------------------------------------------------------------------------
+
+.. |heading_img_1| image:: icons/heading-level-1.svg
+.. |heading_img_2| image:: icons/heading-level-2.svg
+.. |heading_img_3| image:: icons/heading-level-3.svg
+.. |heading_img_4| image:: icons/heading-level-4.svg
 
-Zeichnet den Block als Überschrift aus. Für alle Überschriften gibt es zwei Attribute, welche rechts eingestellt
-werden können:
+Zeichnet den Block als Überschrift der jeweiligen Ebene aus. Für alle Überschriften gibt es ein Attribut, welches rechts
+eingestellt werden kann:
 
-* **Ebene**: Die Überschriftenebene von 1-3.
 * **Kennzeichnung**: Eine (beliebige) Kennzeichnung. Diese darf nur aus Buchstaben und den Zeichen - und _ bestehen. Diese
   wird vom Lesesystem zur generierung des Inhaltsverzeichnisses genutzt. Eine Überschrift ohne Kennzeichnung wird nicht
   in das Inhaltsverzeichnis übernommen. Falls zwei aufeinanderfolgende Überschriften die gleiche Kennzeichnung haben,
   dann werden diese im Inhaltsverzeichnis als ein Eintrag (Titel/Untertitel) dargestellt.
 
 
-Absatz
-------
+Absatz |absatz_img|
+-------------------
+
+.. |absatz_img| image:: icons/absatz.svg
 
-Zeichnet den Block als Textabsatz aus. Folgende Attribute können eingstellt werden:
+Zeichnet den Block als Textabsatz aus. Folgende Attribute können eingestellt werden:
 
 * **Eingrückt**: Die erste Textzeile des Absatzes ist eingerückt oder nicht.
 * **Textausrichtung**: Links-bündig, zentriert, rechts-bündig, oder Blocksatz.
 
-Vers
-----
-
-Markiert ein oder mehrere Zeilen als Vers. Dazu zuerst jede einzelne Zeile als Zeile auszeichnen. Danach alle Zeilen
-die zu einem Vers gehören auswählen und dann als Vers auszeichnen.
-
-Zeile
------
+Vers |vers_img|
+---------------
 
-Markiert den Textblock als Verszeile. Dies muss zuerst für alle Zeilen gemacht werden, welche in einen Vers
-zusammengefasst werden sollen.
+.. |vers_img| image:: icons/vers.svg
 
-Quellenliste
-------------
+Markiert ein oder mehrere Zeilen als Vers. Dazu alle Zeilen des Vers auswählen und dann als Vers auszeichnen.
 
-Markiert ein oder mehrere Quellen als Quellenliste. Dazu zuerst jede einzelne Quelle als Quelle auszeichnen. Danach
-alle Quellen auswählen und als Quellenliste auszeichnen.
+Quellenliste |quelle_img|
+-------------------------
 
-Quelle
-------
+.. |quelle_img| image:: icons/quelle.svg
 
-Markiert den Textblock als Quelle. Folgende Attribute können eingestell werden:
+Markiert ein oder mehrere Quellen als Quellenliste. Dazu alle Quellen auswählen und dann als Quellenliste auszeichnen.
+Die einzelnen Quellen haben folgendes Attribt das eingestellt werden kann:
 
 * **Kennzeichnung**: Das Kennzeichnungskürzel der Quelle. Dies darf nicht im Textblock selbst stehen, da es ansonst auf
   der Webseite verdoppelt wird
@@ -70,45 +68,57 @@ Markiert den Textblock als Quelle. Folgende Attribute können eingestell werden:
 Auszeichnungen
 ==============
 
-Folgende Auszeichnungne können innerhalb von Textblöcken vergeben werden:
+Folgende Auszeichnungen können innerhalb von Textblöcken vergeben werden:
 
-Einzelstellenverweis
---------------------
+Stellenkommentar |stellenkommentar_img|
+---------------------------------------
 
-Markiert den ausgewählten Text als Verweis auf eine :doc:`Einzelstellenerläuterung <individual_comments>`. Folgende
-Attribute können eingestellt werden:
+.. |stellenkommentar_img| image:: icons/stellenkommentar.svg
 
-* **Einzelstellenerläuterung**: Die zu verlinkende Einzelstellenerläuterung. Diese muss erstellt werden **bevor** sie
-  hier verlinkt werden kann.
+Markiert den ausgewählten Text als Stellenkommentar. Folgende Attribute können eingestellt werden:
 
-Globalkommentarverweis
-----------------------
+* **Stellenkommentar**: Der zu verlinkenden Stellenkommentar.
 
-Markiert den ausgewählten Text als Verweis auf den :doc:`Kommentar <global_comments>`. Folgende
+  Für einen neuen Stellenkommentar die Option "New" ausgewählt lassen und auf den |edit_img| klicken um den
+  Stellenkommentar zu bearbeiten.
+
+  Für einen Verweis auf einen bestehenden Stellenkommentar einfach den zu verlinkenden Stellenkommentar aus der Liste
+  auswählen.
+
+  Um den Stellenkommentar zu bearbeiten einfach auf |edit_img| klicken.
+
+.. |edit_img| image:: icons/edit.svg
+
+Globalkommentarverweis |verweis_apparat_img|
+--------------------------------------------
+
+.. |verweis_apparat_img| image:: icons/verweis-apparat.svg
+
+Markiert den ausgewählten Text als Verweis auf den :doc:`Apparat <global_comments>`. Folgende
 Attribute können eingestellt werden:
 
 * **Abschnitt**: Der Abschnitt auf den verwiesen werden soll. Dies ist die Kennzeichnung die für die Überschrift im
-  Kommentar vergeben wurde.
+  Apparat vergeben wurde.
 
-Seitenanfang
-------------
+Seitenanfang |seitenanfang_img|
+-------------------------------
 
-Markiert den ausgewählten Text als den Anfang einer Seite.
+.. |seitenanfang_img| image:: icons/page-begin.svg
 
-Fußnote
--------
+Markiert den ausgewählten Text als den Anfang einer Seite.
 
-Markiert den ausgewählten Text als Fußnote. Folgende Attribute können eingstellt werden:
+Fußnote |fussnote_img|
+----------------------
 
-* **Symbol**: Das Symbol, welches in der Webseite als Hinweis auf die Fußnote verwendet wird.
+.. |fussnote_img| image:: icons/footnote.svg
 
-.. important::
+Markiert den ausgewählten Text als Fußnotenmarkierung. Um den Text der Fußnote zu bearbeiten, auf den |edit_img|
+klicken.
 
-    Der Text der Fußnote wird zwar im Text des Editors bearbeitet (und auch weiter ausgezeichnet, falls notwendig),
-    aber in der Darstellung auf der Webseite wird der Fußnotentext separat angezeigt.
+Fremdsprachiger Text |foreign_img|
+----------------------------------
 
-Fremdsprachiger Text
---------------------
+.. |foreign_img| image:: icons/foreign.svg
 
 Markiert den ausgewählten Text als fremdsprachigen Text.
 
@@ -122,8 +132,10 @@ Wortspanne
 
 Markiert den ausgewählten Text als Wortspanne, generell nach einer "Seite & Zeile" Auszeichnung.
 
-Zitat
------
+Zitat |zitat_img|
+-----------------
+
+.. |zitat_img| image:: icons/quote.svg
 
 Markiert den ausgewählten Text als Zitat.
 
@@ -132,13 +144,22 @@ Lemma
 
 Markiert den ausgewählten Text als Lemma.
 
-Korrigierter Text
------------------
+Textvorlage
+-----------
 
-Markiert den ausgewählten Text als den ursprünglichen, korrigierten Text.
+Markiert den ausgewählten Text als den Originaltext aus der Vorlage.
 
-Nicht ermittelt
----------------
+Variante
+--------
+
+Markiert den ausgewählten Text als eine Variante in einer der Quellen. Folgendes Attribut kann eingestellt werden:
+
+* **Quellenkürzel**: Das Quellenkürzel der Quelle aus der die Variante stammt.
+
+Nicht ermittelt |nicht_ermittelt_img|
+-------------------------------------
+
+.. |nicht_ermittelt_img| image:: icons/nicht-ermittelt.svg
 
 Markiert den ausgewählten Text als noch zu ermittelnde Information.
 
@@ -152,18 +173,24 @@ Textgröße
 
 Für die Textgröße sind die Größen: Normal, Klein, Mittel, und Groß vorhanden.
 
-Fettdruck
----------
+Fettdruck |bold_img|
+--------------------
+
+.. |bold_img| image:: icons/bold.svg
 
 Markiert den ausgewählten Text als fettgedruckt.
 
-Kursiv
-------
+Kursiv |italic_img|
+-------------------
+
+.. |italic_img| image:: icons/italic.svg
 
 Markiert den ausgewählten Text als kursiv.
 
-Sperrung
---------
+Sperrung |sperrung_img|
+-----------------------
+
+.. |sperrung_img| image:: icons/sperrung.svg
 
 Markiert den ausgewählten Text als Sperrung.
 
@@ -173,7 +200,9 @@ Markiert den ausgewählten Text als Sperrung.
     ausgelassen werden. Das ist notwendig, damit der Text in TEI korrekt repräsentiert wird. In aktuellen Browsern kann
     das zwar vereinzelt zu leicht unschönen Darstellungen führen, aber diese werden im Laufe der Zeit ausgemerzt.
 
-Hochgestellt
-------------
+Hochgestellt |sup_img|
+----------------------
+
+.. |sup_img| image:: icons/sup.svg
 
 Markiert den ausgewählten Text als hochgestellt.
diff --git a/editor/jinja2/editor/edit.jinja2 b/editor/jinja2/editor/edit.jinja2
index e217b431dfdcd9a22bd2b36549d399835e2f7fab..cd3ba9d34aa1d93a0651b4aea43e94b3d1046884 100644
--- a/editor/jinja2/editor/edit.jinja2
+++ b/editor/jinja2/editor/edit.jinja2
@@ -631,19 +631,48 @@
                                       "type": "menubar",
                                       "entities": [
                                           {
-                                              "type": "setNodeType",
-                                              "label": "Überschrift",
-                                              "nodeType": "heading"
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "1",
+                                              "ariaLabel": "Überschrift - Ebene 1"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "2",
+                                              "ariaLabel": "Überschrift - Ebene 2"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "3",
+                                              "ariaLabel": "Überschrift - Ebene 3"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M18,18V13H13V11L18,4H20V11H21V13H20V18H18M18,11V7.42L15.45,11H18Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "4",
+                                              "ariaLabel": "Überschrift - Ebene 4"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Absatz",
-                                              "nodeType": "paragraph"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z\" /></svg>",
+                                              "nodeType": "paragraph",
+                                              "ariaLabel": "Absatz"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Vers",
-                                              "nodeType": "lineGroup"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M4,9H20V11H4V9M4,13H14V15H4V13Z\" /></svg>",
+                                              "nodeType": "lineGroup",
+                                              "ariaLabel": "Vers"
                                           }
                                       ]
                                   }
@@ -657,28 +686,38 @@
                                       "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Einzelstellenverweis",
-                                              "nodeType": "annotationMarker"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M6,7H18V9H6V7M6,11H15V13H6V11Z\" /></svg>",
+                                              "nodeType": "annotationMarker",
+                                              "ariaLabel": "Stellenkommentar"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Globalkommentarverweis",
-                                              "nodeType": "annotationGlobal"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20 2H4C2.9 2 2 2.9 2 4V16C2 17.1 2.9 18 4 18H8V21C8 21.6 8.4 22 9 22H9.5C9.7 22 10 21.9 10.2 21.7L13.9 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H13.1L10 19.1V16H4V4H20V16M8 9V11H12.5L10.7 12.8L12 14L16 10L12 6L10.8 7.2L12.5 9H8Z\" /></svg>",
+                                              "nodeType": "annotationGlobal",
+                                              "ariaLabel": "Verweis auf den Apparat"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Seitenanfang",
-                                              "nodeType": "pageBegin"
-                                          },
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M14,10V4.5L19.5,10M5,3C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V9L15,3H5Z\" /></svg>",
+                                              "nodeType": "footnoteMarker",
+                                              "ariaLabel": "Fußnote"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Fußnote",
-                                              "nodeType": "footnoteMarker"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M19,2L14,6.5V17.5L19,13V2M6.5,5C4.55,5 2.45,5.4 1,6.5V21.16C1,21.41 1.25,21.66 1.5,21.66C1.6,21.66 1.65,21.59 1.75,21.59C3.1,20.94 5.05,20.5 6.5,20.5C8.45,20.5 10.55,20.9 12,22C13.35,21.15 15.8,20.5 17.5,20.5C19.15,20.5 20.85,20.81 22.25,21.56C22.35,21.61 22.4,21.59 22.5,21.59C22.75,21.59 23,21.34 23,21.09V6.5C22.4,6.05 21.75,5.75 21,5.5V7.5L21,13V19C19.9,18.65 18.7,18.5 17.5,18.5C15.8,18.5 13.35,19.15 12,20V13L12,8.5V6.5C10.55,5.4 8.45,5 6.5,5V5Z\" /></svg>",
+                                              "nodeType": "pageBegin",
+                                              "ariaLabel": "Seitenanfang"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Fremdsprachiger Text",
-                                              "nodeType": "foreignLanguage"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z\" /></svg>",
+                                              "nodeType": "foreignLanguage",
+                                              "ariaLabel": "Fremdsprachiger Text"
                                           }
                                       ]
                                   }
@@ -719,22 +758,26 @@
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontWeightBold",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>",
+                                              "ariaLabel": "Fett"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontStyleItalic",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z\" /></svg>",
+                                              "ariaLabel": "Kursivtext"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "letterSparse",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>",
+                                              "ariaLabel": "Textsperrung"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "sup",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>",
+                                              "ariaLabel": "Hochgestellt"
                                           }
                                       ]
                                   }
@@ -747,34 +790,6 @@
                                   "activeType": "heading"
                               },
                               "entities": [
-                                  {
-                                      "type": "menubar",
-                                      "entities": [
-                                          {
-                                              "type": "selectNodeAttr",
-                                              "nodeType": "heading",
-                                              "attr": "level",
-                                              "values": [
-                                                  {
-                                                      "label": "Ebene 1",
-                                                      "value": "1"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 2",
-                                                      "value": "2"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 3",
-                                                      "value": "3"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 4",
-                                                      "value": "4"
-                                                  }
-                                              ]
-                                          }
-                                      ]
-                                  },
                                   {
                                       "type": "list",
                                       "entities": [
@@ -782,7 +797,7 @@
                                               "type": "setNodeAttrString",
                                               "nodeType": "heading",
                                               "attr": "headingId",
-                                              "label": "Navigationsmarker"
+                                              "label": "Kennzeichnung"
                                           }
                                       ]
                                   }
@@ -821,35 +836,39 @@
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "left",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Linksbündig"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "center",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Zentriert"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "right",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Rechtsbündig"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "justify",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Blocksatz"
                                           }
                                       ]
                                   }
                               ]
                           },
                           {
-                              "label": "Einzelstellenverweis",
+                              "label": "Stellenkommentar",
                               "condition": {
                                   "type": "isActive",
                                   "activeType": "annotationMarker"
@@ -868,8 +887,9 @@
                                               "type": "editNestedDoc",
                                               "nodeType": "annotationMarker",
                                               "attr": "target",
-                                              "label": "Bearbeiten",
-                                              "targetNodeType": "annotation"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z\" /></svg>",
+                                              "targetNodeType": "annotation",
+                                              "ariaLabel": "Bearbeiten"
                                           }
                                       ]
                                   }
@@ -909,8 +929,9 @@
                                               "type": "editNestedDoc",
                                               "nodeType": "footnoteMarker",
                                               "attr": "target",
-                                              "label": "Bearbeiten",
-                                              "targetNodeType": "footnote"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z\" /></svg>",
+                                              "targetNodeType": "footnote",
+                                              "ariaLabel": "Bearbeiten"
                                           }
                                       ]
                                   }
@@ -919,14 +940,15 @@
                       ],
                       "annotation": [
                           {
-                              "label": "Einzelstellenverweis",
+                              "label": "Stellenkommentar",
                               "entities": [
                                   {
                                       "type": "menubar",
                                       "entities": [
                                           {
                                               "type": "closeNested",
-                                              "label": "Schließen"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z\" /></svg>",
+                                              "ariaLabel": "Zurück zum Haupttext"
                                           }
                                       ]
                                   }
@@ -947,27 +969,52 @@
                                               "type": "setNodeType",
                                               "label": "Wortspanne",
                                               "nodeType": "wordRange"
-                                          },
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Einzelstellenverweis",
-                                              "nodeType": "annotationMarker"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M6,7H18V9H6V7M6,11H15V13H6V11Z\" /></svg>",
+                                              "nodeType": "annotationMarker",
+                                              "ariaLabel": "Stellenkommentar"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Globalkommentarverweis",
-                                              "nodeType": "annotationGlobal"
-                                          },
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20 2H4C2.9 2 2 2.9 2 4V16C2 17.1 2.9 18 4 18H8V21C8 21.6 8.4 22 9 22H9.5C9.7 22 10 21.9 10.2 21.7L13.9 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H13.1L10 19.1V16H4V4H20V16M8 9V11H12.5L10.7 12.8L12 14L16 10L12 6L10.8 7.2L12.5 9H8Z\" /></svg>",
+                                              "nodeType": "annotationGlobal",
+                                              "ariaLabel": "Verweis auf den Apparat"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Fremdsprachiger Text",
-                                              "nodeType": "foreignLanguage"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z\" /></svg>",
+                                              "nodeType": "foreignLanguage",
+                                              "ariaLabel": "Fremdsprachiger Text"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Zitat",
-                                              "nodeType": "quotation"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M14,17H17L19,13V7H13V13H16M6,17H9L11,13V7H5V13H8L6,17Z\" /></svg>",
+                                              "nodeType": "quotation",
+                                              "ariaLabel": "Zitat"
                                           },
+                                          {
+                                              "type": "setNodeType",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z\" /></svg>",
+                                              "nodeType": "missing",
+                                              "ariaLabel": "Nicht ermittelt"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
                                               "label": "Lemma",
@@ -982,11 +1029,6 @@
                                               "type": "setNodeType",
                                               "label": "Variante",
                                               "nodeType": "reading"
-                                          },
-                                          {
-                                              "type": "setNodeType",
-                                              "label": "Nicht ermittelt",
-                                              "nodeType": "missing"
                                           }
                                       ]
                                   }
@@ -1027,24 +1069,27 @@
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontWeightBold",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>",
+                                              "ariaLabel": "Fett"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "letterSparse",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>",
+                                              "ariaLabel": "Textsperrung"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "sup",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>",
+                                              "ariaLabel": "Hochgestellt"
                                           }
                                       ]
                                   }
                               ]
                           },
                           {
-                              "label": "Einzelstellenverweis",
+                              "label": "Stellenkommentar",
                               "condition": {
                                   "type": "isActive",
                                   "activeType": "annotationMarker"
@@ -1063,15 +1108,16 @@
                                               "type": "editNestedDoc",
                                               "nodeType": "annotationMarker",
                                               "attr": "target",
-                                              "label": "Edit",
-                                              "targetNodeType": "annotation"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z\" /></svg>",
+                                              "targetNodeType": "annotation",
+                                              "ariaLabel": "Bearbeiten"
                                           }
                                       ]
                                   }
                               ]
                           },
                           {
-                              "label": "Globalkommentarverweis",
+                              "label": "Verweis auf den Apparat",
                               "condition": {
                                   "type": "isActive",
                                   "activeType": "annotationGlobal"
@@ -1120,7 +1166,8 @@
                                       "entities": [
                                           {
                                               "type": "closeNested",
-                                              "label": "Schließen"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z\" /></svg>",
+                                              "ariaLabel": "Zurück zum Haupttext"
                                           }
                                       ]
                                   }
@@ -1134,23 +1181,32 @@
                                       "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Einzelstellenverweis",
-                                              "nodeType": "annotationMarker"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10M6,7H18V9H6V7M6,11H15V13H6V11Z\" /></svg>",
+                                              "nodeType": "annotationMarker",
+                                              "ariaLabel": "Stellenkommentar"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Globalkommentarverweis",
-                                              "nodeType": "annotationGlobal"
-                                          },
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20 2H4C2.9 2 2 2.9 2 4V16C2 17.1 2.9 18 4 18H8V21C8 21.6 8.4 22 9 22H9.5C9.7 22 10 21.9 10.2 21.7L13.9 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H13.1L10 19.1V16H4V4H20V16M8 9V11H12.5L10.7 12.8L12 14L16 10L12 6L10.8 7.2L12.5 9H8Z\" /></svg>",
+                                              "nodeType": "annotationGlobal",
+                                              "ariaLabel": "Verweis auf den Apparat"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Fremdsprachiger Text",
-                                              "nodeType": "foreignLanguage"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z\" /></svg>",
+                                              "nodeType": "foreignLanguage",
+                                              "ariaLabel": "Fremdsprachiger Text"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Zitat",
-                                              "nodeType": "quotation"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M14,17H17L19,13V7H13V13H16M6,17H9L11,13V7H5V13H8L6,17Z\" /></svg>",
+                                              "nodeType": "quotation",
+                                              "ariaLabel": "Zitat"
                                           }
                                       ]
                                   }
@@ -1191,22 +1247,26 @@
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontWeightBold",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>",
+                                              "ariaLabel": "Fett"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontStyleItalic",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z\" /></svg>",
+                                              "ariaLabel": "Kursivtext"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "letterSparse",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>",
+                                              "ariaLabel": "Textsperrung"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "sup",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>",
+                                              "ariaLabel": "Hochgestellt"
                                           }
                                       ]
                                   }
@@ -1632,19 +1692,48 @@
                                       "type": "menubar",
                                       "entities": [
                                           {
-                                              "type": "setNodeType",
-                                              "label": "Überschrift",
-                                              "nodeType": "heading"
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "1",
+                                              "ariaLabel": "Überschrift - Ebene 1"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "2",
+                                              "ariaLabel": "Überschrift - Ebene 2"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "3",
+                                              "ariaLabel": "Überschrift - Ebene 3"
+                                          },
+                                          {
+                                              "type": "setNodeAttrValue",
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M3,4H5V10H9V4H11V18H9V12H5V18H3V4M18,18V13H13V11L18,4H20V11H21V13H20V18H18M18,11V7.42L15.45,11H18Z\" /></svg>",
+                                              "nodeType": "heading",
+                                              "attr": "level",
+                                              "value": "4",
+                                              "ariaLabel": "Überschrift - Ebene 4"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Absatz",
-                                              "nodeType": "paragraph"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z\" /></svg>",
+                                              "nodeType": "paragraph",
+                                              "ariaLabel": "Absatz"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Quellenliste",
-                                              "nodeType": "sourceList"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M21,5C19.89,4.65 18.67,4.5 17.5,4.5C15.55,4.5 13.45,4.9 12,6C10.55,4.9 8.45,4.5 6.5,4.5C4.55,4.5 2.45,4.9 1,6V20.65C1,20.9 1.25,21.15 1.5,21.15C1.6,21.15 1.65,21.1 1.75,21.1C3.1,20.45 5.05,20 6.5,20C8.45,20 10.55,20.4 12,21.5C13.35,20.65 15.8,20 17.5,20C19.15,20 20.85,20.3 22.25,21.05C22.35,21.1 22.4,21.1 22.5,21.1C22.75,21.1 23,20.85 23,20.6V6C22.4,5.55 21.75,5.25 21,5M21,18.5C19.9,18.15 18.7,18 17.5,18C15.8,18 13.35,18.65 12,19.5V8C13.35,7.15 15.8,6.5 17.5,6.5C18.7,6.5 19.9,6.65 21,7V18.5Z\" /></svg>",
+                                              "nodeType": "sourceList",
+                                              "ariaLabel": "Quellenliste"
                                           }
                                       ]
                                   }
@@ -1665,27 +1754,46 @@
                                               "type": "setNodeType",
                                               "label": "Wortspanne",
                                               "nodeType": "wordRange"
-                                          },
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Einzelstellenverweis",
-                                              "nodeType": "annotationMarker"
-                                          },
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M20 2H4C2.9 2 2 2.9 2 4V16C2 17.1 2.9 18 4 18H8V21C8 21.6 8.4 22 9 22H9.5C9.7 22 10 21.9 10.2 21.7L13.9 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H13.1L10 19.1V16H4V4H20V16M8 9V11H12.5L10.7 12.8L12 14L16 10L12 6L10.8 7.2L12.5 9H8Z\" /></svg>",
+                                              "nodeType": "annotationGlobal",
+                                              "ariaLabel": "Verweis innerhalb des Apparat"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
-                                              "label": "Globalkommentarverweis",
-                                              "nodeType": "annotationGlobal"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z\" /></svg>",
+                                              "nodeType": "foreignLanguage",
+                                              "ariaLabel": "Fremdsprachiger Text"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Fremdsprachiger Text",
-                                              "nodeType": "foreignLanguage"
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M14,17H17L19,13V7H13V13H16M6,17H9L11,13V7H5V13H8L6,17Z\" /></svg>",
+                                              "nodeType": "quotation",
+                                              "ariaLabel": "Zitat"
                                           },
                                           {
                                               "type": "setNodeType",
-                                              "label": "Zitat",
-                                              "nodeType": "quotation"
-                                          },
+                                              "label": "<svg viewBox=\"0 0 24 24\"><path d=\"M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z\" /></svg>",
+                                              "nodeType": "missing",
+                                              "ariaLabel": "Nicht ermittelt"
+                                          }
+                                      ]
+                                  },
+                                  {
+                                      "type": "menubar",
+                                      "entities": [
                                           {
                                               "type": "setNodeType",
                                               "label": "Lemma",
@@ -1700,11 +1808,6 @@
                                               "type": "setNodeType",
                                               "label": "Variante",
                                               "nodeType": "reading"
-                                          },
-                                          {
-                                              "type": "setNodeType",
-                                              "label": "Nicht ermittelt",
-                                              "nodeType": "missing"
                                           }
                                       ]
                                   }
@@ -1745,17 +1848,20 @@
                                           {
                                               "type": "toggleMark",
                                               "markType": "fontWeightBold",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z\" /></svg>",
+                                              "ariaLabel": "Fett"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "letterSparse",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z\" /></svg>",
+                                              "ariaLabel": "Textsperrung"
                                           },
                                           {
                                               "type": "toggleMark",
                                               "markType": "sup",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z\" /></svg>",
+                                              "ariaLabel": "Hochgestellt"
                                           }
                                       ]
                                   }
@@ -1768,34 +1874,6 @@
                                   "activeType": "heading"
                               },
                               "entities": [
-                                  {
-                                      "type": "menubar",
-                                      "entities": [
-                                          {
-                                              "type": "selectNodeAttr",
-                                              "nodeType": "heading",
-                                              "attr": "level",
-                                              "values": [
-                                                  {
-                                                      "label": "Ebene 1",
-                                                      "value": "1"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 2",
-                                                      "value": "2"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 3",
-                                                      "value": "3"
-                                                  },
-                                                  {
-                                                      "label": "Ebene 4",
-                                                      "value": "4"
-                                                  }
-                                              ]
-                                          }
-                                      ]
-                                  },
                                   {
                                       "type": "list",
                                       "entities": [
@@ -1803,7 +1881,7 @@
                                               "type": "setNodeAttrString",
                                               "nodeType": "heading",
                                               "attr": "headingId",
-                                              "label": "Navigationsmarker"
+                                              "label": "Kennzeichnung"
                                           }
                                       ]
                                   }
@@ -1842,28 +1920,32 @@
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "left",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Linksbündig"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "center",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Zentriert"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "right",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Rechtsbündig"
                                           },
                                           {
                                               "type": "setNodeAttrValue",
                                               "nodeType": "paragraph",
                                               "attr": "textAlign",
                                               "value": "justify",
-                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z\" /></svg>"
+                                              "label": "<svg viewBox=\"0 0 24 24\" class=\"mdi-icon\"><path d=\"M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z\" /></svg>",
+                                              "ariaLabel": "Blocksatz"
                                           }
                                       ]
                                   }
@@ -1890,27 +1972,7 @@
                               ]
                           },
                           {
-                              "label": "Einzelstellenverweis",
-                              "condition": {
-                                  "type": "isActive",
-                                  "activeType": "annotationMarker"
-                              },
-                              "entities": [
-                                  {
-                                      "type": "list",
-                                      "entities": [
-                                          {
-                                              "type": "setNodeAttrString",
-                                              "label": "Verweisidentifikator",
-                                              "nodeType": "annotationMarker",
-                                              "attr": "target"
-                                          }
-                                      ]
-                                  }
-                              ]
-                          },
-                          {
-                              "label": "Globalkommentarverweis",
+                              "label": "Verweis innerhalb des Apparat",
                               "condition": {
                                   "type": "isActive",
                                   "activeType": "annotationGlobal"
@@ -1953,7 +2015,7 @@
                   }
               },
               "metadata": {
-                  "label": "Metadata",
+                  "label": "Metadaten",
                   "type": "MetadataEditor",
                   "schema": [
                       {
diff --git a/editor/static/editor/css/app.css b/editor/static/editor/css/app.css
index ed60daa5d9b28e74460d77bde6d0c1a31040254e..d670df11b3ff3bbc5a4e274012d4962a9b37a797 100644
--- a/editor/static/editor/css/app.css
+++ b/editor/static/editor/css/app.css
@@ -5416,8 +5416,8 @@ nav.expanded *[role="menu"] textarea {
   margin-right: 1rem; }
 
 [role="menuitem"] svg, [role="menuitem"] svg.mdi-icon {
-  width: 18px;
-  height: 18px; }
+  width: 18px !important;
+  height: 18px !important; }
 
 svg.mdi-icon {
   height: 24px;
diff --git a/scripts/tei-editor/config.js b/scripts/tei-editor/config.js
deleted file mode 100644
index 7dee8c35e12c34cc552dba74dc7542d728e5d553..0000000000000000000000000000000000000000
--- a/scripts/tei-editor/config.js
+++ /dev/null
@@ -1,2060 +0,0 @@
-(function() {
-    window.teiEditorConfig = Object.assign(window.teiEditorConfig || {}, {
-        // Configure editor tabs
-        sections: {
-
-            // ================
-            // Metadaten Header
-            // ================
-            header: {
-                title: 'Metadaten',
-                type: 'header',
-                tag: 'tei:teiHeader',
-                schema: [
-                    {
-                        "tag": 'tei:fileDesc',
-                        children: [
-                            {
-                                tag: 'tei:titleStmt',
-                                children: [
-                                    {
-                                        tag: 'tei:title',
-                                        text: 'fileDesc.titleStmt.title._text'
-                                    },
-                                    {
-                                        tag: 'tei:author',
-                                        text: 'fileDesc.titleStmt.author._text'
-                                    },
-                                    {
-                                        tag: 'tei:respStmt',
-                                        multiple: true,
-                                        deduplicate: {
-                                            key: 'attrs.xml:id',
-                                            merge: [
-                                                {
-                                                    tag: 'tei:resp',
-                                                },
-                                                {
-                                                    tag: 'tei:name'
-                                                },
-                                            ],
-                                        },
-                                        attrs: {
-                                            'xml:id': '_attrs.xml:id'
-                                        },
-                                        children: [
-                                            {
-                                                tag: 'tei:resp',
-                                                text: 'resp._text'
-                                            },
-                                            {
-                                                tag: 'tei:name',
-                                                text: 'name._text'
-                                            }
-                                        ]
-                                    }
-                                ]
-                            },
-                            {
-                                tag: 'tei:publicationStmt',
-                                children: [
-                                    {
-                                        tag: 'tei:distributor',
-                                        text: 'fileDesc.publicationStmt.distributor._text'
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        tag: 'tei:encodingDesc',
-                        children: [
-                            {
-                                tag: 'tei:classDecl',
-                                children: [
-                                    {
-                                        tag: 'tei:taxonomy',
-                                        attrs: {
-                                            'xml:id': 'encodingDesc.classDecl.taxonomy._attrs.xml:id'
-                                        },
-                                        children: [
-                                            {
-                                                tag: 'tei:bibl',
-                                                text: 'encodingDesc.classDecl.taxonomy.bibl._text'
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        tag: 'tei:sourceDesc',
-                        children: [
-                            {
-                                tag: 'tei:bibl',
-                                text: 'sourceDesc.bibl._text'
-                            }
-                        ]
-                    },
-                    {
-                        tag: 'tei:profileDesc',
-                        children: [
-                            {
-                                tag: 'tei:creation',
-                                children: [
-                                    {
-                                        tag: 'tei:date',
-                                        attrs: {
-                                            when: 'profileDesc.creation.date._attrs.when'
-                                        },
-                                        text: 'profileDesc.creation.date._text'
-                                    }
-                                ]
-                            },
-                            {
-                                tag: 'tei:textClass',
-                                children: [
-                                    {
-                                        tag: 'tei:catRef',
-                                        attrs: {
-                                            target: 'profileDesc.textClass.catRef._attrs.target'
-                                        },
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        tag: 'tei:revisionDesc',
-                        children: [
-                            {
-                                tag: 'tei:change',
-                                multiple: true,
-                                attrs: {
-                                    when: '_attrs.when',
-                                    who: '_attrs.who'
-                                },
-                                text: '_text'
-                            }
-                        ]
-                    }
-                ],
-                ui: [
-                    {
-                        title: 'Bibliographie',
-                        entries: [
-                            {
-                                type: 'single-text',
-                                label: 'Titel',
-                                path: 'fileDesc.titleStmt.title._text'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Autor',
-                                path: 'fileDesc.titleStmt.author._text'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Quelle',
-                                path: 'sourceDesc.bibl._text'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Veröffentlichungsdatum (JJJJ-MM-TT, JJJJ-MM, JJJJ)',
-                                path: 'profileDesc.creation.date._attrs.when'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Veröffentlichungsdatum (natürlichsprachlich)',
-                                path: 'profileDesc.creation.date._text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Digitale Version',
-                        entries: [
-                            {
-                                type: 'single-text',
-                                label: 'Distributor',
-                                path: 'fileDesc.publicationStmt.distributor._text'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Taxonomie: Schlüssel',
-                                path: 'encodingDesc.classDecl.taxonomy._attrs.xml:id'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Taxonomie: Name',
-                                path: 'encodingDesc.classDecl.taxonomy.bibl._text'
-                            },
-                            {
-                                type: 'single-text',
-                                label: 'Kategorie',
-                                path: 'profileDesc.textClass.catRef._attrs.target'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Verantwortliche',
-                        entries: [
-                            {
-                                type: 'multi-field',
-                                path: 'fileDesc.titleStmt.respStmt',
-                                entries: [
-                                    {
-                                        type: 'single-text',
-                                        label: 'Schlüssel',
-                                        path: '_attrs.xml:id'
-                                    },
-                                    {
-                                        type: 'single-text',
-                                        label: 'Verantwortlich für',
-                                        path: 'resp._text'
-                                    },
-                                    {
-                                        type: 'single-text',
-                                        label: 'Name',
-                                        path: 'name._text'
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Änderungsgeschichte',
-                        entries: [
-                            {
-                                type: 'multi-field',
-                                path: 'revisionDesc.change',
-                                entries: [
-                                    {
-                                        type: 'single-text',
-                                        label: 'Änderung',
-                                        path: '_text'
-                                    },
-                                    {
-                                        type: 'single-text',
-                                        label: 'Durch',
-                                        path: '_attrs.who'
-                                    },
-                                    {
-                                        type: 'single-text',
-                                        label: 'Datum (JJJJ-MM-TT, JJJJ-MM, JJJJ)',
-                                        path: '_attrs.when'
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            },
-
-            // =========
-            // Haupttext
-            // =========
-            mainText: {
-                title: 'Haupttext',
-                type: 'single-text',
-                parser: {
-                    selector: 'tei:text/tei:body',
-                },
-                serializer: {
-                    tag: 'tei:text'
-                },
-                schema: {
-                    nodes: {
-                        doc: {
-                            content: 'block+',
-                            parser: {
-                                selector: 'tei:body'
-                            },
-                            serializer: {
-                                tag: 'tei:body'
-                            }
-                        },
-                        paragraph: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:p'
-                            },
-                            serializer: {
-                                tag: 'tei:p'
-                            },
-                            attrs: {
-                                noIndent: {
-                                    default: false,
-                                    parser: {
-                                        selector: 'contains(@style, "no-indent")',
-                                        type: 'boolean'
-                                    },
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            true: 'no-indent'
-                                        }
-                                    }
-                                },
-                                textAlign: {
-                                    default: 'left',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'text-left')",
-                                            type: 'static',
-                                            value: 'left'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-center')",
-                                            type: 'static',
-                                            value: 'center'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-right')",
-                                            type: 'static',
-                                            value: 'right'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-justify')",
-                                            type: 'static',
-                                            value: 'justify'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            center: 'text-center',
-                                            right: 'text-right',
-                                            justify: 'text-justify'
-                                        }
-                                    }
-                                }
-                            },
-                        },
-                        heading: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:head'
-                            },
-                            serializer: {
-                                tag: 'tei:head'
-                            },
-                            attrs: {
-                                headingId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-heading-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-heading-id'
-                                    }
-                                },
-                                level: {
-                                    default: 1,
-                                    parser: {
-                                        selector: 'substring(@type, 7)'
-                                    },
-                                    serializer: {
-                                        attr: 'type',
-                                        value: 'level-${value}'
-                                    }
-                                }
-                            },
-                            defining: true
-                        },
-                        line: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:l'
-                            },
-                            serializer: {
-                                tag: 'tei:l'
-                            }
-                        },
-                        lineGroup: {
-                            group: 'block',
-                            content: 'line+',
-                            parser: {
-                                selector: 'tei:lg'
-                            },
-                            serializer: {
-                                tag: 'tei:lg'
-                            }
-                        },
-                        text: {
-                            group: 'inline',
-                            inline: true,
-                            parsers: [
-                                {
-                                    selector: 'tei:seg',
-                                    text: 'text()'
-                                },
-                                {
-                                    selector: 'tei:hi',
-                                    text: 'text()'
-                                },
-                            ],
-                            serializer: {
-                                tag: 'tei:seg'
-                            }
-                        },
-                        annotationGlobal: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref[@target="#global"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'global',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                },
-                                headingId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-heading-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-heading-id'
-                                    }
-                                }
-                            }
-                        },
-                        annotation: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'unknown',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                }
-                            }
-                        },
-                        pageBegin: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:pb',
-                                text: '@n'
-                            },
-                            serializer: {
-                                tag: 'tei:pb',
-                                text: {
-                                    attr: 'n'
-                                }
-                            }
-                        },
-                        footnote: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:note[@type="footnote"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:note',
-                            },
-                            attrs: {
-                                type: {
-                                    default: 'footnote',
-                                    parser: {
-                                        selector: '@type',
-                                    },
-                                    serializer: {
-                                        attr: 'type',
-                                        value: 'footnote'
-                                    }
-                                },
-                                marker: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-marker'
-                                    },
-                                    serializer: {
-                                        attr: 'data-marker'
-                                    }
-                                }
-                            }
-                        },
-                        foreignLanguage: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:foreign',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:foreign'
-                            }
-                        },
-                    },
-                    marks: {
-                        letterSparse: {
-                            parser: {
-                                selector: 'contains(@style, "letter-sparse")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'letter-sparse'
-                                    }
-                                }
-                            }
-                        },
-                        sup: {
-                            parser: {
-                                selector: 'contains(@style, "sup")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'sup'
-                                    }
-                                }
-                            }
-                        },
-                        fontSize: {
-                            parsers: [
-                                {
-                                    selector: "contains(@style, 'font-size-small')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-medium')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-large')"
-                                }
-                            ],
-                            serializer: {
-                                tag: 'tei:hi'
-                            },
-                            attrs: {
-                                size: {
-                                    default: '',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'font-size-small')",
-                                            type: 'static',
-                                            value: 'small'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-medium')",
-                                            type: 'static',
-                                            value: 'medium'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-large')",
-                                            type: 'static',
-                                            value: 'large'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            small: 'font-size-small',
-                                            medium: 'font-size-medium',
-                                            large: 'font-size-large'
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        fontWeightBold: {
-                            parser: {
-                                selector: 'contains(@style, "font-weight-bold")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'font-weight-bold'
-                                    }
-                                }
-                            }
-                        },
-                        fontStyleItalic: {
-                            parser: {
-                                selector: 'contains(@style, "font-style-italic")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'font-style-italic'
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                ui: [
-                    {
-                        title: 'Blocktypen',
-                        type: 'block-type',
-                        blocks: [
-                            {
-                                type: 'heading',
-                                label: 'Überschrift'
-                            },
-                            {
-                                type: 'paragraph',
-                                label: 'Absatz'
-                            },
-                            {
-                                type: 'lineGroup',
-                                label: 'Vers',
-                                wrapping: true
-                            },
-                            {
-                                type: 'line',
-                                label: 'Zeile'
-                            },
-                        ]
-                    },
-                    {
-                        title: 'Auszeichnungen',
-                        type: 'block-type',
-                        blocks: [
-                            {
-                                type: 'annotation',
-                                label: 'Einzelstellenverweis'
-                            },
-                            {
-                                type: 'annotationGlobal',
-                                label: 'Globalkommentarverweis'
-                            },
-                            {
-                                type: 'pageBegin',
-                                label: 'Seitenanfang'
-                            },
-                            {
-                                type: 'footnote',
-                                label: 'Fußnote'
-                            },
-                            {
-                                type: 'foreignLanguage',
-                                label: 'Fremdsprachiger Text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Überschrift',
-                        type: 'toolbar',
-                        context: 'blocks.heading',
-                        entries: [
-                            {
-                                type: 'select-attr',
-                                attr: 'level',
-                                values: [
-                                    {
-                                        key: '1',
-                                        value: 'Ebene 1'
-                                    },
-                                    {
-                                        key: '2',
-                                        value: 'Ebene 2'
-                                    },
-                                    {
-                                        key: '3',
-                                        value: 'Ebene 3'
-                                    },
-                                    {
-                                        key: '4',
-                                        value: 'Ebene 4'
-                                    },
-                                ]
-                            },
-                            {
-                                type: 'text-attr',
-                                attr: 'headingId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Absatz',
-                        type: 'toolbar',
-                        context: 'blocks.paragraph',
-                        entries: [
-                            {
-                                type: 'toggle-attr',
-                                attr: 'noIndent',
-                                label: "Nicht einrücken",
-                                icon: {
-                                    on: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M11,13H21V11H11M11,9H21V7H11M3,3V5H21V3M11,17H21V15H11M3,8V16L7,12M3,21H21V19H3V21Z" /></svg>',
-                                    off: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M11,13H21V11H11M11,9H21V7H11M3,3V5H21V3M3,21H21V19H3M3,12L7,16V8M11,17H21V15H11V17Z" /></svg>'
-                                }
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'left',
-                                label: 'Linksbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'center',
-                                label: 'Zentriert',
-                                icon: '<svg style="viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'right',
-                                label: 'Rechtsbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'justify',
-                                label: 'Block',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                        ]
-                    },
-                    {
-                        title: 'Darstellung',
-                        type: 'toolbar',
-                        context: 'marks',
-                        entries: [
-                            {
-                                type: 'select-mark-attr',
-                                mark: 'fontSize',
-                                attr: 'size',
-                                values: [
-                                    {
-                                        key: '',
-                                        label: 'Normal'
-                                    },
-                                    {
-                                        key: 'small',
-                                        label: 'Klein',
-                                    },
-                                    {
-                                        key: 'medium',
-                                        label: 'Mittel',
-                                    },
-                                    {
-                                        key: 'large',
-                                        label: 'Groß'
-                                    }
-                                ]
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'fontWeightBold',
-                                label: 'Fettdruck',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'fontStyleItalic',
-                                label: 'Kursiv',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'letterSparse',
-                                label: 'Sperrung',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'sup',
-                                label: 'Hochgestellt',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z" /></svg>'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Einzelstellenverweis',
-                        type: 'toolbar',
-                        context: 'blocks.annotation',
-                        entries: [
-                            {
-                                type: 'select-attr',
-                                attr: 'target',
-                                valueSource: 'annotations'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Globalkommentarverweis Abschnitt (optional)',
-                        type: 'toolbar',
-                        context: 'blocks.annotationGlobal',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'headingId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Fußnotenmarkierung',
-                        type: 'toolbar',
-                        context: 'blocks.footnote',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'marker',
-                                dataType: 'text'
-                            }
-                        ]
-                    }
-                ]
-            },
-
-            // ===============
-            // Globalkommentar
-            // ===============
-            globalComment: {
-                title: 'Apparat',
-                type: 'single-text',
-                parser: {
-                    selector: 'tei:text/tei:interpGrp[@type="global"]',
-                },
-                serializer: {
-                    tag: 'tei:text'
-                },
-                schema: {
-                    nodes: {
-                        doc: {
-                            content: 'block+',
-                            parser: {
-                                selector: 'tei:interpGrp[@type="global"]'
-                            },
-                            serializer: {
-                                tag: 'tei:interpGrp',
-                                attrs: {
-                                    type: 'global',
-                                    'xml:id': 'global'
-                                }
-                            }
-                        },
-                        paragraph: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:p'
-                            },
-                            serializer: {
-                                tag: 'tei:p'
-                            },
-                            attrs: {
-                                noIndent: {
-                                    default: false,
-                                    parser: {
-                                        selector: 'contains(@style, "no-indent")',
-                                        type: 'boolean'
-                                    },
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            true: 'no-indent'
-                                        }
-                                    }
-                                },
-                                textAlign: {
-                                    default: 'left',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'text-left')",
-                                            type: 'static',
-                                            value: 'left'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-center')",
-                                            type: 'static',
-                                            value: 'center'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-right')",
-                                            type: 'static',
-                                            value: 'right'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-justify')",
-                                            type: 'static',
-                                            value: 'justify'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            center: 'text-center',
-                                            right: 'text-right',
-                                            justify: 'text-justify'
-                                        }
-                                    }
-                                }
-                            },
-                        },
-                        heading: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:head'
-                            },
-                            serializer: {
-                                tag: 'tei:head'
-                            },
-                            attrs: {
-                                headingId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-heading-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-heading-id'
-                                    }
-                                },
-                                level: {
-                                    default: 1,
-                                    parser: {
-                                        selector: 'substring(@type, 7)'
-                                    },
-                                    serializer: {
-                                        attr: 'type',
-                                        value: 'level-${value}'
-                                    }
-                                }
-                            },
-                            defining: true
-                        },
-                        source: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:item'
-                            },
-                            serializer: {
-                                tag: 'tei:item'
-                            },
-                            attrs: {
-                                sourceId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-source-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-source-id',
-                                        value: '${value}'
-                                    }
-                                }
-                            }
-                        },
-                        sourceList: {
-                            group: 'block',
-                            content: 'source+',
-                            parser: {
-                                selector: 'tei:list[@type="sources"]'
-                            },
-                            serializer: {
-                                tag: 'tei:list',
-                                attrs: {
-                                    type: 'sources'
-                                }
-                            }
-                        },
-                        text: {
-                            group: 'inline',
-                            inline: true,
-                            parsers: [
-                                {
-                                    selector: 'tei:seg',
-                                    text: 'text()'
-                                },
-                                {
-                                    selector: 'tei:hi',
-                                    text: 'text()'
-                                },
-                            ],
-                            serializer: {
-                                tag: 'tei:seg'
-                            }
-                        },
-                        pageLineRef: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:citedRange[@type="page-line-ref"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:citedRange',
-                                attrs: {
-                                    type: 'page-line-ref'
-                                }
-                            }
-                        },
-                        wordRange: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:citedRange[@type="word-range"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:citedRange',
-                                attrs: {
-                                    type: 'word-range'
-                                }
-                            }
-                        },
-                        annotationGlobal: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref[@target="#global"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'global',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                },
-                                headingId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-heading-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-heading-id'
-                                    }
-                                }
-                            }
-                        },
-                        annotation: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'unknown',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                }
-                            }
-                        },
-                        foreignLanguage: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:foreign',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:foreign'
-                            }
-                        },
-                        quotation: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:q',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:q'
-                            }
-                        },
-                        lemma: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:lem',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:lem',
-                            }
-                        },
-                        sic: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:sic',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:sic',
-                            }
-                        },
-                        reading: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:rdg',
-                                text: 'text()',
-                            },
-                            serializer: {
-                                tag: 'tei:rdg',
-                            },
-                            attrs: {
-                                wit: {
-                                    default: '',
-                                    parser: {
-                                        selector: 'substring(@wit, 2)',
-                                    },
-                                    serializer: {
-                                        attr: 'wit',
-                                        value: '#${value}',
-                                    }
-                                }
-                            }
-                        },
-                        missing: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:metamark[@function="missing"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:metamark'
-                            },
-                            attrs: {
-                                function: {
-                                    default: 'missing',
-                                    parser: {
-                                        selector: '@function',
-                                    },
-                                    serializer: {
-                                        attr: 'function',
-                                        value: 'missing'
-                                    }
-                                },
-                            },
-                        },
-                    },
-                    marks: {
-                        letterSparse: {
-                            parser: {
-                                selector: 'contains(@style, "letter-sparse")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'letter-sparse'
-                                    }
-                                }
-                            }
-                        },
-                        sup: {
-                            parser: {
-                                selector: 'contains(@style, "sup")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'sup'
-                                    }
-                                }
-                            }
-                        },
-                        fontSize: {
-                            parsers: [
-                                {
-                                    selector: "contains(@style, 'font-size-small')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-medium')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-large')"
-                                }
-                            ],
-                            serializer: {
-                                tag: 'tei:hi'
-                            },
-                            attrs: {
-                                size: {
-                                    default: '',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'font-size-small')",
-                                            type: 'static',
-                                            value: 'small'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-medium')",
-                                            type: 'static',
-                                            value: 'medium'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-large')",
-                                            type: 'static',
-                                            value: 'large'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            small: 'font-size-small',
-                                            medium: 'font-size-medium',
-                                            large: 'font-size-large'
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        fontWeightBold: {
-                            parser: {
-                                selector: 'contains(@style, "font-weight-bold")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'font-weight-bold'
-                                    }
-                                }
-                            }
-                        },
-                    }
-                },
-                ui: [
-                    {
-                        title: 'Blocktypen',
-                        type: 'block-type',
-                        blocks: [
-                            {
-                                type: 'heading',
-                                label: 'Überschrift'
-                            },
-                            {
-                                type: 'paragraph',
-                                label: 'Absatz'
-                            },
-                            {
-                                type: 'sourceList',
-                                label: 'Quellenliste',
-                                wrapping: true
-                            },
-                            {
-                                type: 'source',
-                                label: 'Quelle'
-                            },
-                        ]
-                    },
-                    {
-                        title: 'Auszeichnungen',
-                        type: 'block-type',
-                        blocks: [
-                            {
-                                type: 'pageLineRef',
-                                label: 'Seite & Zeile'
-                            },
-                            {
-                                type: 'wordRange',
-                                label: 'Wortspanne'
-                            },
-                            {
-                                type: 'annotation',
-                                label: 'Einzelstellenverweis'
-                            },
-                            {
-                                type: 'annotationGlobal',
-                                label: 'Globalkommentarverweis'
-                            },
-                            {
-                                type: 'foreignLanguage',
-                                label: 'Fremdsprachiger Text'
-                            },
-                            {
-                                type: 'quotation',
-                                label: 'Zitat'
-                            },
-                            {
-                                type: 'lemma',
-                                label: 'Lemma'
-                            },
-                            {
-                                type: 'sic',
-                                label: 'Textvorlage'
-                            },
-                            {
-                                type: 'reading',
-                                label: 'Variante'
-                            },
-                            {
-                                type: 'missing',
-                                label: 'Nicht ermittelt'
-                            },
-                        ]
-                    },
-                    {
-                        title: 'Überschrift',
-                        type: 'toolbar',
-                        context: 'blocks.heading',
-                        entries: [
-                            {
-                                type: 'select-attr',
-                                attr: 'level',
-                                values: [
-                                    {
-                                        key: '1',
-                                        value: 'Ebene 1'
-                                    },
-                                    {
-                                        key: '2',
-                                        value: 'Ebene 2'
-                                    },
-                                    {
-                                        key: '3',
-                                        value: 'Ebene 3'
-                                    },
-                                    {
-                                        key: '4',
-                                        value: 'Ebene 4'
-                                    }
-                                ]
-                            },
-                            {
-                                type: 'text-attr',
-                                attr: 'headingId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Absatz',
-                        type: 'toolbar',
-                        context: 'blocks.paragraph',
-                        entries: [
-                            {
-                                type: 'toggle-attr',
-                                attr: 'noIndent',
-                                label: "Nicht einrücken",
-                                icon: {
-                                    on: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M11,13H21V11H11M11,9H21V7H11M3,3V5H21V3M11,17H21V15H11M3,8V16L7,12M3,21H21V19H3V21Z" /></svg>',
-                                    off: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M11,13H21V11H11M11,9H21V7H11M3,3V5H21V3M3,21H21V19H3M3,12L7,16V8M11,17H21V15H11V17Z" /></svg>'
-                                }
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'left',
-                                label: 'Linksbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'center',
-                                label: 'Zentriert',
-                                icon: '<svg style="viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'right',
-                                label: 'Rechtsbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'justify',
-                                label: 'Block',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Quelle',
-                        type: 'toolbar',
-                        context: 'blocks.source',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'sourceId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Darstellung',
-                        type: 'toolbar',
-                        context: 'marks',
-                        entries: [
-                            {
-                                type: 'select-mark-attr',
-                                mark: 'fontSize',
-                                attr: 'size',
-                                values: [
-                                    {
-                                        key: '',
-                                        label: 'Normal'
-                                    },
-                                    {
-                                        key: 'small',
-                                        label: 'Klein',
-                                    },
-                                    {
-                                        key: 'medium',
-                                        label: 'Mittel',
-                                    },
-                                    {
-                                        key: 'large',
-                                        label: 'Groß'
-                                    }
-                                ]
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'fontWeightBold',
-                                label: 'Fettdruck',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'letterSparse',
-                                label: 'Sperrung',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'sup',
-                                label: 'Hochgestellt',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z" /></svg>'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Einzelstellenverweis',
-                        type: 'toolbar',
-                        context: 'blocks.annotation',
-                        entries: [
-                            {
-                                type: 'select-attr',
-                                attr: 'target',
-                                valueSource: 'annotations'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Globalkommentarverweis Abschnitt (optional)',
-                        type: 'toolbar',
-                        context: 'blocks.annotationGlobal',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'headingId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Variante',
-                        type: 'toolbar',
-                        context: 'blocks.reading',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'wit',
-                                dataType: 'text',
-                            }
-                        ]
-                    },
-                ]
-            },
-
-            // ========================
-            // Einstelstellenkommentare
-            // ========================
-            annotations: {
-                title: 'Einzelstellenerläuterungen',
-                type: 'multi-text',
-                parser: {
-                    selector: 'tei:text/tei:interpGrp[@type="individual"]',
-                },
-                serializer: {
-                    tag: 'tei:text'
-                },
-                parts: {
-                    parser: {
-                        selector: 'tei:interp'
-                    },
-                    serializer: {
-                        tag: 'tei:interpGrp',
-                        attrs: {
-                            type: 'individual'
-                        }
-                    }
-                },
-                schema: {
-                    nodes: {
-                        doc: {
-                            content: 'block+',
-                            parser: {
-                                selector: 'tei:interp'
-                            },
-                            serializer: {
-                                tag: 'tei:interp'
-                            },
-                            attrs: {
-                                id: {
-                                    default: 'unknown',
-                                    parser: {
-                                        selector: '@xml:id'
-                                    },
-                                    serializer: {
-                                        attr: 'xml:id',
-                                        value: '${value}'
-                                    }
-                                }
-                            }
-                        },
-                        paragraph: {
-                            group: 'block',
-                            content: 'inline*',
-                            parser: {
-                                selector: 'tei:p'
-                            },
-                            serializer: {
-                                tag: 'tei:p'
-                            },
-                            attrs: {
-                                textAlign: {
-                                    default: 'left',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'text-left')",
-                                            type: 'static',
-                                            value: 'left'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-center')",
-                                            type: 'static',
-                                            value: 'center'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-right')",
-                                            type: 'static',
-                                            value: 'right'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'text-justify')",
-                                            type: 'static',
-                                            value: 'justify'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            center: 'text-center',
-                                            right: 'text-right',
-                                            justify: 'text-justify'
-                                        }
-                                    }
-                                }
-                            },
-                        },
-                        text: {
-                            group: 'inline',
-                            inline: true,
-                            parsers: [
-                                {
-                                    selector: 'tei:seg',
-                                    text: 'text()'
-                                },
-                                {
-                                    selector: 'tei:hi',
-                                    text: 'text()'
-                                },
-                                {
-                                    selector: 'tei:foreign',
-                                    text: 'text()'
-                                },
-                                {
-                                    selector: 'tei:q',
-                                    text: 'text()'
-                                }
-                            ],
-                            serializer: {
-                                tag: 'tei:seg'
-                            }
-                        },
-                        pageLineRef: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:citedRange[@type="page-line-ref"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:citedRange',
-                                attrs: {
-                                    type: 'page-line-ref'
-                                }
-                            }
-                        },
-                        wordRange: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:citedRange[@type="word-range"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:citedRange',
-                                attrs: {
-                                    type: 'word-range'
-                                }
-                            }
-                        },
-                        annotationGlobal: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref[@target="#global"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'global',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                },
-                                headingId: {
-                                    default: '',
-                                    parser: {
-                                        selector: '@data-heading-id'
-                                    },
-                                    serializer: {
-                                        attr: 'data-heading-id'
-                                    }
-                                }
-                            }
-                        },
-                        annotation: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:ref',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:ref'
-                            },
-                            attrs: {
-                                target: {
-                                    default: 'unknown',
-                                    parser: {
-                                        selector: 'substring(@target, 2)'
-                                    },
-                                    serializer: {
-                                        attr: 'target',
-                                        value: '#${value}'
-                                    }
-                                }
-                            }
-                        },
-                        foreignLanguage: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:foreign',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:foreign'
-                            }
-                        },
-                        quotation: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:q',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:q'
-                            }
-                        },
-                        missing: {
-                            group: 'inline',
-                            inline: true,
-                            content: 'text*',
-                            parser: {
-                                selector: 'tei:metamark[@function="missing"]',
-                                text: 'text()'
-                            },
-                            serializer: {
-                                tag: 'tei:metamark'
-                            },
-                            attrs: {
-                                function: {
-                                    default: 'missing',
-                                    serializer: {
-                                        attr: 'function',
-                                        value: 'missing'
-                                    }
-                                },
-                            },
-                        },
-                    },
-                    marks: {
-                        letterSparse: {
-                            parser: {
-                                selector: 'contains(@style, "letter-sparse")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'letter-sparse'
-                                    }
-                                }
-                            }
-                        },
-                        sup: {
-                            parser: {
-                                selector: 'contains(@style, "sup")'
-                            },
-                            serializer: {
-                                tag: 'tei:hi',
-                                attrs: {
-                                    style: {
-                                        value: 'sup'
-                                    }
-                                }
-                            }
-                        },
-                        fontSize: {
-                            parsers: [
-                                {
-                                    selector: "contains(@style, 'font-size-small')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-medium')"
-                                },
-                                {
-                                    selector: "contains(@style, 'font-size-large')"
-                                }
-                            ],
-                            serializer: {
-                                tag: 'tei:hi'
-                            },
-                            attrs: {
-                                size: {
-                                    default: '',
-                                    parsers: [
-                                        {
-                                            selector: "contains(@style, 'font-size-small')",
-                                            type: 'static',
-                                            value: 'small'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-medium')",
-                                            type: 'static',
-                                            value: 'medium'
-                                        },
-                                        {
-                                            selector: "contains(@style, 'font-size-large')",
-                                            type: 'static',
-                                            value: 'large'
-                                        }
-                                    ],
-                                    serializer: {
-                                        attr: 'style',
-                                        values: {
-                                            small: 'font-size-small',
-                                            medium: 'font-size-medium',
-                                            large: 'font-size-large'
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                    }
-                },
-                ui: [
-                    {
-                        title: 'Schlüssel',
-                        type: 'toolbar',
-                        context: 'blocks.doc',
-                        entries: [
-                            {
-                                type: 'doc-text-attr',
-                                attr: 'id'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Auszeichnungen',
-                        type: 'block-type',
-                        blocks: [
-                            {
-                                type: 'pageLineRef',
-                                label: 'Seite & Zeile'
-                            },
-                            {
-                                type: 'wordRange',
-                                label: 'Wortspanne'
-                            },
-                            {
-                                type: 'annotation',
-                                label: 'Einzelstellenverweis'
-                            },
-                            {
-                                type: 'annotationGlobal',
-                                label: 'Globalkommentarverweis'
-                            },
-                            {
-                                type: 'foreignLanguage',
-                                label: 'Fremdsprachiger Text'
-                            },
-                            {
-                                type: 'quotation',
-                                label: 'Zitat'
-                            },
-                            {
-                                type: 'missing',
-                                label: 'Nicht ermittelt'
-                            },
-                        ]
-                    },
-                    {
-                        title: 'Absatz',
-                        type: 'toolbar',
-                        context: 'blocks.paragraph',
-                        entries: [
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'left',
-                                label: 'Linksbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H15V9H3V7M3,11H21V13H3V11M3,15H15V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'center',
-                                label: 'Zentriert',
-                                icon: '<svg style="viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M7,7H17V9H7V7M3,11H21V13H3V11M7,15H17V17H7V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'right',
-                                label: 'Rechtsbündig',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M9,7H21V9H9V7M3,11H21V13H3V11M9,15H21V17H9V15M3,19H21V21H3V19Z" /></svg>'
-                            },
-                            {
-                                type: 'set-attr',
-                                attr: 'textAlign',
-                                value: 'justify',
-                                label: 'Block',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M3,3H21V5H3V3M3,7H21V9H3V7M3,11H21V13H3V11M3,15H21V17H3V15M3,19H21V21H3V19Z" /></svg>'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Styling',
-                        type: 'toolbar',
-                        context: 'marks',
-                        entries: [
-                            {
-                                type: 'select-mark-attr',
-                                mark: 'fontSize',
-                                attr: 'size',
-                                values: [
-                                    {
-                                        key: '',
-                                        label: 'Normal'
-                                    },
-                                    {
-                                        key: 'small',
-                                        label: 'Klein',
-                                    },
-                                    {
-                                        key: 'medium',
-                                        label: 'Mittel',
-                                    },
-                                    {
-                                        key: 'large',
-                                        label: 'Groß'
-                                    }
-                                ]
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'fontWeightBold',
-                                label: 'Fettdruck',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'letterSparse',
-                                label: 'Sperrung',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M7,8L2.5,12L7,16V8M17,8V16L21.5,12L17,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z" /></svg>'
-                            },
-                            {
-                                type: 'toggle-mark',
-                                mark: 'sup',
-                                label: 'Hochgestellt',
-                                icon: '<svg viewBox="0 0 24 24" class="mdi-icon"><path d="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z" /></svg>'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Einzelstellenverweis',
-                        type: 'toolbar',
-                        context: 'blocks.annotation',
-                        entries: [
-                            {
-                                type: 'select-attr',
-                                attr: 'target',
-                                valueSource: 'annotations'
-                            }
-                        ]
-                    },
-                    {
-                        title: 'Globalkommentarverweis Abschnitt (optional)',
-                        type: 'toolbar',
-                        context: 'blocks.annotationGlobal',
-                        entries: [
-                            {
-                                type: 'text-attr',
-                                attr: 'headingId',
-                                dataType: 'text'
-                            }
-                        ]
-                    },
-                ],
-                default: {
-                    type: 'doc',
-                    content: [
-                        {
-                            type: 'paragraph',
-                            content: [
-                                {
-                                    type: 'pageLineRef',
-                                    content: [
-                                        {
-                                            type: 'text',
-                                            text: 'Seite & Zeile'
-                                        }
-                                    ],
-                                },
-                                {
-                                    type: 'text',
-                                    text: ' '
-                                },
-                                {
-                                    type: 'wordRange',
-                                    content: [
-                                        {
-                                            type: 'text',
-                                            text: 'Textspanne'
-                                        }
-                                    ],
-                                }
-                            ]
-                        },
-                        {
-                            type: 'paragraph',
-                            content: [
-                                {
-                                    type: 'text',
-                                    text: 'Neuer Einzelstellenkommentar'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        }
-    });
-})();
diff --git a/theme/_icons.scss b/theme/_icons.scss
index 7622614e4c1243001430df9cf1fa04dc1803fb91..ced63d930ab48e2e09488cab9474b473acac5b60 100644
--- a/theme/_icons.scss
+++ b/theme/_icons.scss
@@ -1,6 +1,6 @@
 [role="menuitem"] svg, [role="menuitem"] svg.mdi-icon {
-    width: 18px;
-    height: 18px;
+    width: 18px !important;
+    height: 18px !important;
 }
 
 svg.mdi-icon {
diff --git a/yarn.lock b/yarn.lock
index 78569a838a0809a2c295edaeda5ebeb02eee57b5..99cce3451bcc73b0cc017135480a98b304deaf4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2348,9 +2348,9 @@ prosemirror-view@1.13.4:
     prosemirror-transform "^1.1.0"
 
 prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3:
-  version "1.13.11"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.13.11.tgz#2a284ccb290720242f4aae49f99d67d1109f0194"
-  integrity sha512-/PISZHY3HeTZGR+ptbK7HP4wTuxZa0WJCsNMDVC8z98YW+uMwl5ZpiO+FBDAHNYPas0+SUxNu2C547hcRjQLkw==
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.13.10.tgz#df441c2bb48fe71fab407d9ea26ad0731428852a"
+  integrity sha512-v5hEq2w3HFqWXMv/f2DEpwD4ijWDnIO6t3VQp8zQdOOEjx7+D8+2ep5/Y5o2Zb8ljSX+dkZWfnG96VWekpxWHg==
   dependencies:
     prosemirror-model "^1.1.0"
     prosemirror-state "^1.0.0"