From 7a46f777e5efd3b6bc08258139abde66fd42ca53 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Sun, 30 Jun 2024 23:39:22 +0200
Subject: [PATCH] make cell model labels a bit nicer

---
 .../models/de.itemis.mps.extensions.build.mps |   11 +-
 .../models/behavior.mps                       |  102 ++
 .../models/editor.mps                         |   72 +-
 .../languageModels/editor.mps                 |   31 +-
 .../languageModels/behavior.mps               |  167 ++
 .../languageModels/editor.mps                 |  121 +-
 ...de.itemis.mps.editor.htmlcell.behavior.mps |   38 +-
 .../de.itemis.mps.editor.htmlcell.editor.mps  |   28 +-
 .../languageModels/behavior.mps               |  509 +++++-
 .../languageModels/editor.mps                 | 1504 +++++++++--------
 .../languageModels/behavior.mps               |   27 +
 .../languageModels/editor.mps                 |   21 +-
 ....itemis.mps.editor.pagination.behavior.mps |   37 +
 ...de.itemis.mps.editor.pagination.editor.mps |   28 +-
 .../languageModels/editor.mps                 |    2 +
 .../models/editor.mps                         |   11 +-
 .../de.itemis.mps.editor.collapsible.mpl      |    1 +
 .../languageModels/behavior.mps               |   33 +-
 .../languageModels/editor.mps                 |  133 +-
 .../languageModels/behavior.mps               |   79 +-
 .../languageModels/editor.mps                 |   34 +-
 21 files changed, 2149 insertions(+), 840 deletions(-)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 0194c67e3..9048e2212 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -2802,6 +2802,11 @@
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1be6WiHh6Cn" role="3bR37C">
+          <node concept="3bR9La" id="1be6WiHh6Co" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6oSQRDqps34" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5807,12 +5812,6 @@
               <ref role="3bR37D" to="ffeo:7YI57w6K0iE" resolve="jetbrains.mps.lang.editor#1129914002149" />
             </node>
           </node>
-          <node concept="1SiIV0" id="6OfpnAhj8QS" role="3bR37C">
-            <node concept="3bR9La" id="6OfpnAhj8QT" role="1SiIV1">
-              <property role="3bR36h" value="true" />
-              <ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
-            </node>
-          </node>
         </node>
         <node concept="3rtmxn" id="3xFG3bj5Mmn" role="3bR31x">
           <node concept="3LXTmp" id="3xFG3bj5Mmo" role="3rtmxm">
diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/behavior.mps b/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/behavior.mps
index 21cebb7bf..962874334 100644
--- a/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/behavior.mps
+++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/behavior.mps
@@ -46,7 +46,11 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -973,5 +977,103 @@
       <node concept="3clFbS" id="6W5Xfjf4TxR" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="1be6WiH906Y">
+    <ref role="13h7C2" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
+    <node concept="13hLZK" id="1be6WiH906Z" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiH9070" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiH90dg" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiH90dh" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiH90dm" role="3clF47">
+        <node concept="3clFbF" id="1be6WiH90fG" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiH90fF" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiH90dn" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiH9tG4" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiH9tG5" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiH9tGa" role="3clF47">
+        <node concept="3clFbF" id="1be6WiH9tIA" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiH9tI_" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiH9tGb" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHa7Kr">
+    <property role="3GE5qa" value="lines" />
+    <ref role="13h7C2" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
+    <node concept="13hLZK" id="1be6WiHa7Ks" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHa7Kt" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHa7QH" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHa7QI" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa7QN" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa7Z7" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa7Z6" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa7QO" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHa85D" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHa85E" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa85J" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa88z" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa88y" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa85K" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHa8rp">
+    <property role="3GE5qa" value="lines" />
+    <ref role="13h7C2" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
+    <node concept="13hLZK" id="1be6WiHa8rq" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHa8rr" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHa8xF" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHa8xG" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa8xL" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa8Ev" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa8Eu" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa8xM" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHa8Iz" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHa8I$" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa8ID" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa8Lt" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa8Ls" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa8IE" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/editor.mps b/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/editor.mps
index 75df4094b..d0a89046d 100644
--- a/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/editor.mps
+++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout/models/editor.mps
@@ -43,13 +43,9 @@
       <concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
         <reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
       </concept>
-      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
-        <property id="1186403713874" name="color" index="Vb096" />
-      </concept>
       <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
         <property id="1186403771423" name="style" index="Vbekb" />
       </concept>
-      <concept id="1186404574412" name="jetbrains.mps.lang.editor.structure.BackgroundColorStyleClassItem" flags="ln" index="Veino" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -87,6 +83,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
+      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -228,12 +225,6 @@
   <node concept="24kQdi" id="43ViAfTtdtz">
     <property role="3GE5qa" value="lines" />
     <ref role="1XX52x" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
-    <node concept="PMmxH" id="43ViAfTtdt_" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <node concept="VPXOz" id="1a5cdpmuifs" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
     <node concept="3EZMnI" id="fIxj85y" role="6VMZX">
       <node concept="PMmxH" id="hF4Bju4" role="3EZMnx">
         <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
@@ -261,6 +252,22 @@
       </node>
       <node concept="2iRkQZ" id="i2IxuMq" role="2iSdaV" />
     </node>
+    <node concept="3EZMnI" id="1be6WiHa4m$" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+      </node>
+      <node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
+        <property role="3F0ifm" value="horizontal-line" />
+        <node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
+      </node>
+      <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+      </node>
+      <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
+    </node>
   </node>
   <node concept="24kQdi" id="43ViAfTtxbJ">
     <ref role="1XX52x" to="pvux:43ViAfTtx6N" resolve="StringStyle" />
@@ -645,9 +652,6 @@
   <node concept="24kQdi" id="7d0q5VH9fgX">
     <property role="3GE5qa" value="lines" />
     <ref role="1XX52x" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
-    <node concept="PMmxH" id="7d0q5VH9fgZ" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-    </node>
     <node concept="3EZMnI" id="7d0q5VH9fh1" role="6VMZX">
       <node concept="PMmxH" id="7d0q5VH9fh2" role="3EZMnx">
         <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
@@ -675,18 +679,48 @@
       </node>
       <node concept="2iRkQZ" id="7d0q5VH9fhb" role="2iSdaV" />
     </node>
+    <node concept="3EZMnI" id="1be6WiHa4Ac" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa4Ad" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+      </node>
+      <node concept="3F0ifn" id="1be6WiHa4Ae" role="3EZMnx">
+        <property role="3F0ifm" value="vertical-line" />
+        <node concept="Vb9p2" id="1be6WiHa4Af" role="3F10Kt" />
+      </node>
+      <node concept="PMmxH" id="1be6WiHa4Ag" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+      </node>
+      <node concept="2iRfu4" id="1be6WiHa4Ah" role="2iSdaV" />
+    </node>
   </node>
   <node concept="24kQdi" id="3ATi8gIrB_2">
     <ref role="1XX52x" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
     <node concept="3EZMnI" id="3ATi8gIrB_4" role="2wV5jI">
-      <node concept="3F0ifn" id="3ATi8gIrB_b" role="3EZMnx">
-        <property role="3F0ifm" value="top-down-layout" />
-        <node concept="Veino" id="3ATi8gIrB_n" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5_/gray" />
+      <node concept="3EZMnI" id="2peXSsL72c0" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="i0vcES5" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
         </node>
+        <node concept="3F0ifn" id="2peXSsL72c5" role="3EZMnx">
+          <property role="3F0ifm" value="top-down layout" />
+          <node concept="Vb9p2" id="1be6WiH9g4X" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="i0vcESe" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="2peXSsL72ca" role="2iSdaV" />
       </node>
-      <node concept="3F1sOY" id="3ATi8gIrB_h" role="3EZMnx">
-        <ref role="1NtTu8" to="pvux:3ATi8gIrB$A" resolve="childCell" />
+      <node concept="3EZMnI" id="1be6WiH9ace" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiH9acf" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiH9a9Y" role="3EZMnx" />
+        <node concept="3F1sOY" id="3ATi8gIrB_h" role="3EZMnx">
+          <ref role="1NtTu8" to="pvux:3ATi8gIrB$A" resolve="childCell" />
+        </node>
       </node>
       <node concept="2iRkQZ" id="3ATi8gIrB_7" role="2iSdaV" />
     </node>
diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
index 7813c18ef..be8027bba 100644
--- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
+++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps
@@ -477,14 +477,33 @@
   </node>
   <node concept="24kQdi" id="2vJRo8gAxGE">
     <ref role="1XX52x" to="91fu:2vJRo8gAxFs" resolve="NextEditor" />
-    <node concept="3F0ifn" id="2vJRo8gAxGG" role="2wV5jI">
-      <property role="3F0ifm" value="[next-editor]" />
-      <node concept="VechU" id="2vJRo8gAxIl" role="3F10Kt">
-        <property role="Vb096" value="fLwANPu/blue" />
+    <node concept="3EZMnI" id="2peXSsL72c0" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="3F0ifn" id="2peXSsL72c1" role="3EZMnx">
+        <property role="3F0ifm" value="[&gt;" />
+        <node concept="VPM3Z" id="2peXSsL72c2" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="VPXOz" id="2peXSsL72c3" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="Vb9p2" id="2peXSsL72c4" role="3F10Kt" />
       </node>
-      <node concept="VPXOz" id="7klUZA6YFa_" role="3F10Kt">
-        <property role="VOm3f" value="true" />
+      <node concept="3F0ifn" id="2peXSsL72c5" role="3EZMnx">
+        <property role="3F0ifm" value="next editor" />
+        <ref role="1k5W1q" to="tpc5:3OSQ5wtKyli" resolve="attributedCellLabel" />
+      </node>
+      <node concept="3F0ifn" id="2peXSsL72c6" role="3EZMnx">
+        <property role="3F0ifm" value="&lt;]" />
+        <node concept="VPM3Z" id="2peXSsL72c7" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="VPXOz" id="2peXSsL72c8" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="Vb9p2" id="2peXSsL72c9" role="3F10Kt" />
       </node>
+      <node concept="2iRfu4" id="2peXSsL72ca" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="59YMGDNPSRd">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
index 34bb1fbef..2308335bc 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
@@ -883,6 +883,32 @@
     <node concept="13hLZK" id="190K99K7UbO" role="13h7CW">
       <node concept="3clFbS" id="190K99K7UbP" role="2VODD2" />
     </node>
+    <node concept="13i0hz" id="1be6WiHaewv" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHaeww" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaew_" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaeDM" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaeDL" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaewA" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaewF" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHaewG" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaewL" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaeIX" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaeIW" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaewM" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="1FlH1cK0uPV">
     <ref role="13h7C2" to="2qld:1FlH1cK0tMB" resolve="Parameter_Port" />
@@ -2106,6 +2132,32 @@
       </node>
       <node concept="3THzug" id="6clvLV1rH3J" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="1be6WiHadxk" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHadxl" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHadxq" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHad$L" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHad$K" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHadxr" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHadxw" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHadxx" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHadxA" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHadDi" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHadDh" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHadxB" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="6clvLV1Sc98">
     <property role="3GE5qa" value="edgeEditor" />
@@ -11425,5 +11477,120 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="1be6WiHaabA">
+    <ref role="13h7C2" to="2qld:3GatLR3au6A" resolve="CellModel_Compartment" />
+    <node concept="13hLZK" id="1be6WiHaabB" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaabC" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaahS" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHaahT" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaahY" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaaET" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaaES" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaahZ" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaai4" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHaai5" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaaia" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaaLg" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaaLf" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaaib" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHacqg">
+    <ref role="13h7C2" to="2qld:XBYj286mvh" resolve="CellModel_Diagram" />
+    <node concept="13hLZK" id="1be6WiHacqh" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHacqi" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHacwy" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHacwz" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHacwC" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHacDP" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHacDO" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHacwD" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHacwI" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHacwJ" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHacwO" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHacJO" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHacJN" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHacwP" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHadR2">
+    <ref role="13h7C2" to="2qld:gKFhvEzf3v" resolve="CellModel_DiagramContent" />
+    <node concept="13hLZK" id="1be6WiHadR3" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHadR4" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHadWV" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHadWW" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHadX1" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHae0E" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHae0D" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHadX2" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHadX7" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHadX8" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHadXd" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHae5P" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHae5O" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHadXe" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHaeUb">
+    <ref role="13h7C2" to="2qld:rKHxOEoZfO" resolve="CellModel_Shape" />
+    <node concept="13hLZK" id="1be6WiHaeUc" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaeUd" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaf1h" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHaf1i" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaf1n" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaf3r" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaf3q" role="3clFbG">
+            <property role="Xl_RC" value="shape[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaf1o" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
index ec79c7f30..56a82486c 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
@@ -448,11 +448,21 @@
       <node concept="VPXOz" id="5qgNcfDnnxJ" role="3F10Kt">
         <property role="VOm3f" value="true" />
       </node>
-      <node concept="PMmxH" id="5qgNcfDnkpp" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <node concept="Veino" id="5qgNcfDnkqf" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5_/gray" />
+      <node concept="3EZMnI" id="1be6WiHabRh" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHabRi" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHabRj" role="3EZMnx">
+          <property role="3F0ifm" value="diagram" />
+          <node concept="Vb9p2" id="1be6WiHabRk" role="3F10Kt" />
         </node>
+        <node concept="PMmxH" id="1be6WiHabRl" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHabRm" role="2iSdaV" />
       </node>
       <node concept="3F0ifn" id="5qgNcfDnD4M" role="3EZMnx">
         <node concept="ljvvj" id="5qgNcfDnD6I" role="3F10Kt">
@@ -1178,11 +1188,21 @@
       <node concept="VPXOz" id="4KKQOHJ7LTj" role="3F10Kt">
         <property role="VOm3f" value="true" />
       </node>
-      <node concept="PMmxH" id="4KKQOHJ7LTk" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <node concept="Veino" id="4KKQOHJ7LTl" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5_/gray" />
+      <node concept="3EZMnI" id="1be6WiHaejn" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHaejo" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHaejp" role="3EZMnx">
+          <property role="3F0ifm" value="diagram box" />
+          <node concept="Vb9p2" id="1be6WiHaejq" role="3F10Kt" />
         </node>
+        <node concept="PMmxH" id="1be6WiHaejr" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHaejs" role="2iSdaV" />
       </node>
       <node concept="3F0ifn" id="4KKQOHJ7LTm" role="3EZMnx">
         <node concept="ljvvj" id="4KKQOHJ7LTn" role="3F10Kt">
@@ -1602,11 +1622,21 @@
       <node concept="VPXOz" id="5qgNcfDxJtr" role="3F10Kt">
         <property role="VOm3f" value="true" />
       </node>
-      <node concept="PMmxH" id="5qgNcfDxJts" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <node concept="Veino" id="5qgNcfDxJtt" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5_/gray" />
+      <node concept="3EZMnI" id="1be6WiHad6y" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHad6z" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHad6$" role="3EZMnx">
+          <property role="3F0ifm" value="diagram edge" />
+          <node concept="Vb9p2" id="1be6WiHad6_" role="3F10Kt" />
         </node>
+        <node concept="PMmxH" id="1be6WiHad6A" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHad6B" role="2iSdaV" />
       </node>
       <node concept="3F0ifn" id="5qgNcfDxJtu" role="3EZMnx">
         <node concept="ljvvj" id="5qgNcfDxJtv" role="3F10Kt">
@@ -2493,12 +2523,6 @@
   </node>
   <node concept="24kQdi" id="3GatLR3aIzB">
     <ref role="1XX52x" to="2qld:3GatLR3au6A" resolve="CellModel_Compartment" />
-    <node concept="PMmxH" id="3GatLR3aIEj" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      <node concept="VPXOz" id="3GatLR3n3dM" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
     <node concept="3EZMnI" id="7WiZGib1IHs" role="6VMZX">
       <node concept="PMmxH" id="7WiZGib1IHt" role="3EZMnx">
         <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
@@ -2526,6 +2550,22 @@
       </node>
       <node concept="2iRkQZ" id="7WiZGib1IHA" role="2iSdaV" />
     </node>
+    <node concept="3EZMnI" id="1be6WiHa4m$" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+      </node>
+      <node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
+        <property role="3F0ifm" value="compartment" />
+        <node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
+      </node>
+      <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+      </node>
+      <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
+    </node>
   </node>
   <node concept="24kQdi" id="3FRjz$v4XHA">
     <ref role="1XX52x" to="2qld:3FRjz$v4Kan" resolve="PortCreator" />
@@ -4220,18 +4260,6 @@
   </node>
   <node concept="24kQdi" id="rKHxOEoZm3">
     <ref role="1XX52x" to="2qld:rKHxOEoZfO" resolve="CellModel_Shape" />
-    <node concept="3EZMnI" id="rKHxOEoZmW" role="2wV5jI">
-      <node concept="3F0ifn" id="rKHxOEoZmY" role="3EZMnx">
-        <property role="3F0ifm" value="[shape|" />
-      </node>
-      <node concept="3F1sOY" id="rKHxOEoZno" role="3EZMnx">
-        <ref role="1NtTu8" to="2qld:rKHxOEoZlD" resolve="shape" />
-      </node>
-      <node concept="3F0ifn" id="rKHxOEoZnb" role="3EZMnx">
-        <property role="3F0ifm" value="|]" />
-      </node>
-      <node concept="2iRfu4" id="rKHxOEoZmZ" role="2iSdaV" />
-    </node>
     <node concept="3EZMnI" id="rKHxOEr9FU" role="6VMZX">
       <node concept="PMmxH" id="rKHxOEr9FV" role="3EZMnx">
         <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
@@ -4297,6 +4325,21 @@
       </node>
       <node concept="2iRkQZ" id="rKHxOEr9G4" role="2iSdaV" />
     </node>
+    <node concept="3EZMnI" id="1be6WiHaeQJ" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHaeQK" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+      </node>
+      <node concept="3F1sOY" id="1be6WiHafg7" role="3EZMnx">
+        <ref role="1NtTu8" to="2qld:rKHxOEoZlD" resolve="shape" />
+      </node>
+      <node concept="PMmxH" id="1be6WiHaeQN" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+      </node>
+      <node concept="2iRfu4" id="1be6WiHaeQO" role="2iSdaV" />
+    </node>
   </node>
   <node concept="24kQdi" id="gKFhvEzfRh">
     <ref role="1XX52x" to="2qld:gKFhvEzf3v" resolve="CellModel_DiagramContent" />
@@ -4304,11 +4347,21 @@
       <node concept="VPXOz" id="gKFhvEzgcX" role="3F10Kt">
         <property role="VOm3f" value="true" />
       </node>
-      <node concept="PMmxH" id="gKFhvEzgcY" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <node concept="Veino" id="gKFhvEzgcZ" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5_/gray" />
+      <node concept="3EZMnI" id="1be6WiHadJM" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHadJN" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHadJO" role="3EZMnx">
+          <property role="3F0ifm" value="diagram content" />
+          <node concept="Vb9p2" id="1be6WiHadJP" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHadJQ" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
         </node>
+        <node concept="2iRfu4" id="1be6WiHadJR" role="2iSdaV" />
       </node>
       <node concept="3F0ifn" id="gKFhvEzgd0" role="3EZMnx">
         <node concept="ljvvj" id="gKFhvEzgd1" role="3F10Kt">
diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.behavior.mps b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.behavior.mps
index 83d9bd865..534de5508 100644
--- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.behavior.mps
+++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.behavior.mps
@@ -8,9 +8,10 @@
   </languages>
   <imports>
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
-    <import index="kl84" ref="r:04146354-a55e-4279-a2c9-199d983d46c4(de.itemis.mps.editor.htmlcell.structure)" implicit="true" />
+    <import index="kl84" ref="r:04146354-a55e-4279-a2c9-199d983d46c4(de.itemis.mps.editor.htmlcell.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -38,6 +39,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -185,5 +189,37 @@
       <node concept="3clFbS" id="7XmAYSGTgVy" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="1be6WiHagcr">
+    <ref role="13h7C2" to="kl84:7XmAYSGTdxu" resolve="CellModel_HTML" />
+    <node concept="13hLZK" id="1be6WiHagcs" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHagct" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHagiI" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHagiJ" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHagiO" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHagq7" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHagq6" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHagiP" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHagiU" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHagiV" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHagj0" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHagw4" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHagw3" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHagj1" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.editor.mps b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.editor.mps
index e9d4ee0e0..485f38b64 100644
--- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.editor.mps
+++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/models/de.itemis.mps.editor.htmlcell.editor.mps
@@ -5,8 +5,8 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
   </languages>
   <imports>
+    <import index="tpc5" ref="r:00000000-0000-4000-0000-011c89590299(jetbrains.mps.lang.editor.editor)" />
     <import index="kl84" ref="r:04146354-a55e-4279-a2c9-199d983d46c4(de.itemis.mps.editor.htmlcell.structure)" implicit="true" />
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -21,6 +21,10 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
@@ -31,6 +35,9 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -39,9 +46,6 @@
   </registry>
   <node concept="24kQdi" id="7XmAYSGThy5">
     <ref role="1XX52x" to="kl84:7XmAYSGTdxu" resolve="CellModel_HTML" />
-    <node concept="PMmxH" id="7XmAYSGThy7" role="2wV5jI">
-      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-    </node>
     <node concept="3EZMnI" id="g3gUIcH" role="6VMZX">
       <node concept="3EZMnI" id="hF4vBE0" role="3EZMnx">
         <node concept="3F0ifn" id="h7FoCa2" role="3EZMnx">
@@ -54,6 +58,22 @@
       </node>
       <node concept="2iRkQZ" id="i2IxuOH" role="2iSdaV" />
     </node>
+    <node concept="3EZMnI" id="1be6WiHa4m$" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+      </node>
+      <node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
+        <property role="3F0ifm" value="html" />
+        <node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
+      </node>
+      <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+      </node>
+      <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
+    </node>
   </node>
 </model>
 
diff --git a/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/behavior.mps b/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/behavior.mps
index 5cd1e3904..0946a111d 100644
--- a/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/behavior.mps
+++ b/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/behavior.mps
@@ -4,8 +4,513 @@
   <attribute name="concise" value="true" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="diuo" ref="r:98c96203-129a-452b-86c3-5a06ed0a0d9e(de.itemis.mps.editor.math.notations.structure)" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
+        <reference id="1225194240799" name="concept" index="13h7C2" />
+        <child id="1225194240805" name="method" index="13h7CS" />
+        <child id="1225194240801" name="constructor" index="13h7CW" />
+      </concept>
+      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
+      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
+      </concept>
+      <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="13h7C7" id="1be6WiHaiLz">
+    <ref role="13h7C2" to="diuo:2_93Dm8d21u" resolve="AboveEditor" />
+    <node concept="13hLZK" id="1be6WiHaiL$" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaiL_" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaiRc" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHaiRd" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaiRi" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaiTF" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaiTE" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaiRj" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaiRo" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHaiRp" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaiRu" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaiZa" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaiZ9" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaiRv" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHaj74">
+    <ref role="13h7C2" to="diuo:7wCpClFnHKj" resolve="AbsEditor" />
+    <node concept="13hLZK" id="1be6WiHaj75" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaj76" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHajgK" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHajgL" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajgQ" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajlS" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajlR" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajgR" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHajgW" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHajgX" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajh2" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajr5" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajr4" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajh3" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHajwF">
+    <ref role="13h7C2" to="diuo:7UiI8OpiHxh" resolve="AbstractBracketsEditor" />
+    <node concept="13i0hz" id="1be6WiHajAI" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHajAJ" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajAK" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHatFT" role="3cqZAp">
+          <node concept="2OqwBi" id="1be6WiHav4j" role="3clFbG">
+            <node concept="2OqwBi" id="1be6WiHaukA" role="2Oq$k0">
+              <node concept="13iPFW" id="1be6WiHatFR" role="2Oq$k0" />
+              <node concept="2yIwOk" id="1be6WiHauJT" role="2OqNvi" />
+            </node>
+            <node concept="3n3YKJ" id="1be6WiHavpl" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajAN" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHajAO" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHajAP" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajAQ" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajAR" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajAS" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajAT" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHajwG" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHajwH" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHajGC">
+    <ref role="13h7C2" to="diuo:4r1mNB_GBCV" resolve="CustomSymbolIntegralEditor" />
+    <node concept="13i0hz" id="1be6WiHajMh" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHajMi" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajMj" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajMk" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajMl" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajMm" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHajMn" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHajMo" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajMp" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajMq" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajMr" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajMs" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHajGD" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHajGE" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHajRn">
+    <ref role="13h7C2" to="diuo:7wCpClFnJAI" resolve="IntegralEditor" />
+    <node concept="13i0hz" id="1be6WiHajXq" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHajXr" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajXs" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajXt" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajXu" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajXv" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHajXw" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHajXx" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHajXy" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHajXz" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHajX$" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHajX_" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHajRo" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHajRp" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHakra">
+    <ref role="13h7C2" to="diuo:7UiI8OnHLfb" resolve="LoopEditor" />
+    <node concept="13i0hz" id="1be6WiHakxB" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHakxC" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakxD" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakxE" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakxF" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakxG" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHakxH" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHakxI" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakxJ" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakxK" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakxL" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakxM" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHakrb" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHakrc" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHak_T">
+    <ref role="13h7C2" to="diuo:7wCpClFnJFN" resolve="NRootEditor" />
+    <node concept="13i0hz" id="1be6WiHakFW" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHakFX" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakFY" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakFZ" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakG0" role="3clFbG">
+            <property role="Xl_RC" value="nroot[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakG1" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHakG2" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHakG3" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakG4" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakG5" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakG6" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakG7" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHak_U" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHak_V" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHakJO">
+    <ref role="13h7C2" to="diuo:3p9OysaCeUt" resolve="OverreachingBracketsEditor" />
+    <node concept="13i0hz" id="1be6WiHakQF" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHakQG" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakQH" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakQI" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakQJ" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakQK" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHakQL" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHakQM" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHakQN" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHakQO" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHakQP" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHakQQ" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHakJP" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHakJQ" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHakVM">
+    <ref role="13h7C2" to="diuo:3p9OysaNeo3" resolve="OverreachingLoopEditor" />
+    <node concept="13i0hz" id="1be6WiHal2f" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHal2g" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHal2h" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHal2i" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHal2j" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHal2k" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHal2l" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHal2m" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHal2n" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHal2o" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHal2p" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHal2q" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHakVN" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHakVO" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHal5H">
+    <ref role="13h7C2" to="diuo:7wCpClFnJKS" resolve="ParenthesesEditor" />
+    <node concept="13i0hz" id="1be6WiHalbK" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHalbL" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHalbM" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHalbN" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHalbO" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHalbP" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHalbQ" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHalbR" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHalbS" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHalbT" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHalbU" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHalbV" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHal5I" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHal5J" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHalgs">
+    <ref role="13h7C2" to="diuo:7wCpClFnJPX" resolve="PowerEditor" />
+    <node concept="13i0hz" id="1be6WiHalmT" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHalmU" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHalmV" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHalmW" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHalmX" role="3clFbG">
+            <property role="Xl_RC" value="math.superscript[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHalmY" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHalmZ" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHaln0" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaln1" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaln2" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaln3" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaln4" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHalgt" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHalgu" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHaroQ">
+    <ref role="13h7C2" to="diuo:7wCpClFnJV2" resolve="SqrtEditor" />
+    <node concept="13i0hz" id="1be6WiHarvi" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHarvj" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarvk" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarvl" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarvm" role="3clFbG">
+            <property role="Xl_RC" value="sqrt[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarvn" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHarvo" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHarvp" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarvq" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarvr" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarvs" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarvt" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHaroR" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaroS" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHarzY">
+    <ref role="13h7C2" to="diuo:4r1mNB_oAsj" resolve="SubscriptEditor" />
+    <node concept="13i0hz" id="1be6WiHarE1" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHarE2" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarE3" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarE4" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarE5" role="3clFbG">
+            <property role="Xl_RC" value="math.subscript[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarE6" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHarE7" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHarE8" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarE9" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarEa" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarEb" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarEc" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHarzZ" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHar$0" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="1be6WiHarHv">
+    <ref role="13h7C2" to="diuo:4r1mNB_qwqE" resolve="SubscriptedFunctionEditor" />
+    <node concept="13i0hz" id="1be6WiHarNy" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHarNz" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarN$" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarN_" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarNA" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarNB" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHarNC" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHarND" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHarNE" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHarNF" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHarNG" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHarNH" role="3clF45" />
+    </node>
+    <node concept="13hLZK" id="1be6WiHarHw" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHarHx" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/editor.mps b/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/editor.mps
index c8503746e..a3741215a 100644
--- a/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/editor.mps
+++ b/code/math/languages/de.itemis.mps.editor.math.notations/languageModels/editor.mps
@@ -44,6 +44,7 @@
       <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
         <property id="1186403713874" name="color" index="Vb096" />
       </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
       <concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
@@ -84,6 +85,7 @@
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
+      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -167,20 +169,26 @@
   <node concept="24kQdi" id="7wCpClFoTIX">
     <ref role="1XX52x" to="diuo:7wCpClFnJFN" resolve="NRootEditor" />
     <node concept="3EZMnI" id="7wCpClFoTP9" role="2wV5jI">
-      <node concept="3F0ifn" id="7wCpClFoTPp" role="3EZMnx">
-        <property role="3F0ifm" value="nroot(" />
-      </node>
-      <node concept="3F1sOY" id="7wCpClFoTPC" role="3EZMnx">
-        <ref role="1NtTu8" to="diuo:7wCpClFoTNR" resolve="n" />
-      </node>
-      <node concept="3F0ifn" id="7wCpClFoTQs" role="3EZMnx">
-        <property role="3F0ifm" value="," />
-      </node>
-      <node concept="3F1sOY" id="7wCpClFoTPY" role="3EZMnx">
-        <ref role="1NtTu8" to="diuo:7wCpClFoTNW" resolve="body" />
-      </node>
-      <node concept="3F0ifn" id="7wCpClFoTR3" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
+      <node concept="3EZMnI" id="1be6WiHaz8q" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHaz8r" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F1sOY" id="7wCpClFoTPC" role="3EZMnx">
+          <ref role="1NtTu8" to="diuo:7wCpClFoTNR" resolve="n" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHazsF" role="3EZMnx">
+          <property role="3F0ifm" value="," />
+        </node>
+        <node concept="3F1sOY" id="1be6WiHazvC" role="3EZMnx">
+          <ref role="1NtTu8" to="diuo:7wCpClFoTNW" resolve="body" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHaz8u" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHaz8v" role="2iSdaV" />
       </node>
       <node concept="2iRfu4" id="7wCpClFoTPc" role="2iSdaV" />
     </node>
@@ -190,28 +198,32 @@
   </node>
   <node concept="24kQdi" id="7wCpClFoU3G">
     <ref role="1XX52x" to="diuo:7wCpClFnJV2" resolve="SqrtEditor" />
-    <node concept="3EZMnI" id="7wCpClFoU8A" role="2wV5jI">
-      <node concept="3F0ifn" id="7wCpClFoU8Q" role="3EZMnx">
-        <property role="3F0ifm" value="sqrt(" />
+    <node concept="PMmxH" id="3p9Oysa57xQ" role="6VMZX">
+      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+    </node>
+    <node concept="3EZMnI" id="1be6WiHa_Nz" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa_N$" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
       </node>
-      <node concept="3F1sOY" id="7wCpClFoU9a" role="3EZMnx">
+      <node concept="3F1sOY" id="1be6WiHa_Vz" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:7wCpClFoU95" resolve="body" />
       </node>
-      <node concept="3F0ifn" id="7wCpClFoU9w" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
+      <node concept="PMmxH" id="1be6WiHa_NB" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
       </node>
-      <node concept="2iRfu4" id="7wCpClFoU8D" role="2iSdaV" />
-    </node>
-    <node concept="PMmxH" id="3p9Oysa57xQ" role="6VMZX">
-      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+      <node concept="2iRfu4" id="1be6WiHa_NC" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="7wCpClFt5it">
     <ref role="1XX52x" to="diuo:7wCpClFnJPX" resolve="PowerEditor" />
     <node concept="3EZMnI" id="7wCpClFt5nt" role="2wV5jI">
       <node concept="2iRfu4" id="7wCpClFt5nu" role="2iSdaV" />
-      <node concept="3F0ifn" id="7wCpClFt5nB" role="3EZMnx">
-        <property role="3F0ifm" value="math.superscript(" />
+      <node concept="PMmxH" id="1be6WiHa_kC" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
       </node>
       <node concept="3F1sOY" id="7wCpClFt5nP" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:7wCpClFt0P1" resolve="nomal" />
@@ -222,9 +234,11 @@
       <node concept="3F1sOY" id="7wCpClFt5oE" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:7wCpClFt0P6" resolve="superscript" />
       </node>
-      <node concept="3F0ifn" id="7wCpClFt5pg" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
+      <node concept="PMmxH" id="1be6WiHa_nF" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
       </node>
+      <node concept="3F0ifn" id="7wCpClFt5pg" role="3EZMnx" />
     </node>
     <node concept="PMmxH" id="3p9Oysa57xL" role="6VMZX">
       <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
@@ -233,122 +247,141 @@
   <node concept="24kQdi" id="7UiI8OoPbWH">
     <ref role="1XX52x" to="diuo:7UiI8OnHLfb" resolve="LoopEditor" />
     <node concept="3EZMnI" id="7UiI8OoPc4X" role="2wV5jI">
-      <node concept="3F0ifn" id="7UiI8OoXK$3" role="3EZMnx">
-        <property role="3F0ifm" value="LOOP" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OoPcbr" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OoPcbt" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OoPc55" role="3EZMnx">
-          <property role="3F0ifm" value="lower:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OoPc5a" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPg" resolve="lower" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OoPcbw" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OoPcct" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OoPccv" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OoPccx" role="3EZMnx">
-          <property role="3F0ifm" value="upper:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OoPccU" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPf" resolve="upper" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OoPccy" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OoPcdj" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OoPcdl" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OoPcdn" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OoPcdP" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPe" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OoPcdo" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OoPcej" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OoPcel" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OoPcen" role="3EZMnx">
-          <property role="3F0ifm" value="symbol:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OoPceU" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OoPc63" resolve="symbol" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OoPceo" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="QvUN5N1AwN" role="3EZMnx">
-        <node concept="VPM3Z" id="QvUN5N1AwO" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="QvUN5N1AwP" role="3EZMnx">
-          <property role="3F0ifm" value="parentheses:" />
-        </node>
-        <node concept="3F0A7n" id="hgVOqGz" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
-          <node concept="pkWqt" id="hNs0J1L" role="pqm2j">
-            <node concept="3clFbS" id="hNs0J1M" role="2VODD2">
-              <node concept="3clFbF" id="hNs0Tny" role="3cqZAp">
-                <node concept="2OqwBi" id="hNs0UUt" role="3clFbG">
-                  <node concept="2OqwBi" id="hNs0TOr" role="2Oq$k0">
-                    <node concept="pncrf" id="hNs0Tnz" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="7sJd_4s0r4Q" role="2OqNvi">
-                      <ref role="3Tt5mk" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
-                    </node>
-                  </node>
-                  <node concept="3w_OXm" id="hNs0WvT" role="2OqNvi" />
-                </node>
-              </node>
+      <node concept="3EZMnI" id="1be6WiHay1F" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHay1G" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHay1H" role="3EZMnx">
+          <property role="3F0ifm" value="loop" />
+          <node concept="Vb9p2" id="1be6WiHay1I" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHay1J" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHay1K" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHayp3" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHayp4" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHayjj" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHayz6" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHayz7" role="2iSdaV" />
+          <node concept="3EZMnI" id="7UiI8OoPcbr" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OoPcbt" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OoPc55" role="3EZMnx">
+              <property role="3F0ifm" value="lower:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OoPc5a" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPg" resolve="lower" />
             </node>
+            <node concept="2iRfu4" id="7UiI8OoPcbw" role="2iSdaV" />
           </node>
-          <node concept="lj46D" id="36NC8ylTQE5" role="3F10Kt">
-            <property role="VOm3f" value="true" />
+          <node concept="3EZMnI" id="7UiI8OoPcct" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OoPccv" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OoPccx" role="3EZMnx">
+              <property role="3F0ifm" value="upper:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OoPccU" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPf" resolve="upper" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OoPccy" role="2iSdaV" />
           </node>
-          <node concept="OXEIz" id="6sOCibSXwsI" role="P5bDN">
-            <node concept="PvTIS" id="6sOCibSXywb" role="OY2wv">
-              <node concept="MLZmj" id="6sOCibSXywc" role="PvTIR">
-                <node concept="3clFbS" id="6sOCibSXywd" role="2VODD2">
-                  <node concept="3clFbF" id="6sOCibSXywe" role="3cqZAp">
-                    <node concept="2ShNRf" id="6sOCibSXywf" role="3clFbG">
-                      <node concept="Tc6Ow" id="6sOCibSXFAi" role="2ShVmc">
-                        <node concept="17QB3L" id="6sOCibSXFAk" role="HW$YZ" />
-                        <node concept="Xl_RD" id="6sOCibSXFAz" role="HW$Y0">
-                          <property role="Xl_RC" value="true" />
-                        </node>
-                        <node concept="Xl_RD" id="6sOCibSXFAB" role="HW$Y0">
-                          <property role="Xl_RC" value="false" />
+          <node concept="3EZMnI" id="7UiI8OoPcdj" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OoPcdl" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OoPcdn" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OoPcdP" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPe" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OoPcdo" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="7UiI8OoPcej" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OoPcel" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OoPcen" role="3EZMnx">
+              <property role="3F0ifm" value="symbol:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OoPceU" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OoPc63" resolve="symbol" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OoPceo" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="QvUN5N1AwN" role="3EZMnx">
+            <node concept="VPM3Z" id="QvUN5N1AwO" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="QvUN5N1AwP" role="3EZMnx">
+              <property role="3F0ifm" value="parentheses:" />
+            </node>
+            <node concept="3F0A7n" id="hgVOqGz" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
+              <node concept="pkWqt" id="hNs0J1L" role="pqm2j">
+                <node concept="3clFbS" id="hNs0J1M" role="2VODD2">
+                  <node concept="3clFbF" id="hNs0Tny" role="3cqZAp">
+                    <node concept="2OqwBi" id="hNs0UUt" role="3clFbG">
+                      <node concept="2OqwBi" id="hNs0TOr" role="2Oq$k0">
+                        <node concept="pncrf" id="hNs0Tnz" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="7sJd_4s0r4Q" role="2OqNvi">
+                          <ref role="3Tt5mk" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
                         </node>
                       </node>
+                      <node concept="3w_OXm" id="hNs0WvT" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="1oHujT" id="6sOCibSXFAD" role="OY2wv">
-              <property role="1oHujS" value="query" />
-              <node concept="1oIgkG" id="6sOCibSXFAE" role="1oHujR">
-                <node concept="3clFbS" id="6sOCibSXFAF" role="2VODD2">
-                  <node concept="3clFbF" id="6sOCibSXFAG" role="3cqZAp">
-                    <node concept="37vLTI" id="6sOCibSXFAN" role="3clFbG">
-                      <node concept="2ShNRf" id="6sOCibSXFAQ" role="37vLTx">
-                        <node concept="2fJWfE" id="5wUAOoBBfnC" role="2ShVmc">
-                          <node concept="3Tqbb2" id="5wUAOoBBfnD" role="3zrR0E">
-                            <ref role="ehGHo" to="x4fh:7sJd_4rZNOZ" resolve="BooleanFunction" />
+              <node concept="lj46D" id="36NC8ylTQE5" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="OXEIz" id="6sOCibSXwsI" role="P5bDN">
+                <node concept="PvTIS" id="6sOCibSXywb" role="OY2wv">
+                  <node concept="MLZmj" id="6sOCibSXywc" role="PvTIR">
+                    <node concept="3clFbS" id="6sOCibSXywd" role="2VODD2">
+                      <node concept="3clFbF" id="6sOCibSXywe" role="3cqZAp">
+                        <node concept="2ShNRf" id="6sOCibSXywf" role="3clFbG">
+                          <node concept="Tc6Ow" id="6sOCibSXFAi" role="2ShVmc">
+                            <node concept="17QB3L" id="6sOCibSXFAk" role="HW$YZ" />
+                            <node concept="Xl_RD" id="6sOCibSXFAz" role="HW$Y0">
+                              <property role="Xl_RC" value="true" />
+                            </node>
+                            <node concept="Xl_RD" id="6sOCibSXFAB" role="HW$Y0">
+                              <property role="Xl_RC" value="false" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="2OqwBi" id="6sOCibSXFAI" role="37vLTJ">
-                        <node concept="3GMtW1" id="6sOCibSXFAH" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="7sJd_4s0oQO" role="2OqNvi">
-                          <ref role="3Tt5mk" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1oHujT" id="6sOCibSXFAD" role="OY2wv">
+                  <property role="1oHujS" value="query" />
+                  <node concept="1oIgkG" id="6sOCibSXFAE" role="1oHujR">
+                    <node concept="3clFbS" id="6sOCibSXFAF" role="2VODD2">
+                      <node concept="3clFbF" id="6sOCibSXFAG" role="3cqZAp">
+                        <node concept="37vLTI" id="6sOCibSXFAN" role="3clFbG">
+                          <node concept="2ShNRf" id="6sOCibSXFAQ" role="37vLTx">
+                            <node concept="2fJWfE" id="5wUAOoBBfnC" role="2ShVmc">
+                              <node concept="3Tqbb2" id="5wUAOoBBfnD" role="3zrR0E">
+                                <ref role="ehGHo" to="x4fh:7sJd_4rZNOZ" resolve="BooleanFunction" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="6sOCibSXFAI" role="37vLTJ">
+                            <node concept="3GMtW1" id="6sOCibSXFAH" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7sJd_4s0oQO" role="2OqNvi">
+                              <ref role="3Tt5mk" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -356,63 +389,63 @@
                 </node>
               </node>
             </node>
+            <node concept="3F1sOY" id="hNs0XVA" role="3EZMnx">
+              <property role="1cu_pB" value="hQNNVxO/attractsRecursively" />
+              <property role="2ru_X1" value="true" />
+              <ref role="1NtTu8" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
+              <node concept="3EZMnI" id="4Tiud0Td6Qf" role="2ruayu">
+                <node concept="VPM3Z" id="4Tiud0Td6Qg" role="3F10Kt">
+                  <property role="VOm3f" value="false" />
+                </node>
+                <node concept="l2Vlx" id="4Tiud0Td6Qh" role="2iSdaV" />
+              </node>
+            </node>
+            <node concept="2iRfu4" id="QvUN5N1AwR" role="2iSdaV" />
           </node>
-        </node>
-        <node concept="3F1sOY" id="hNs0XVA" role="3EZMnx">
-          <property role="1cu_pB" value="hQNNVxO/attractsRecursively" />
-          <property role="2ru_X1" value="true" />
-          <ref role="1NtTu8" to="diuo:7sJd_4s02pi" resolve="showParenthesesQuery" />
-          <node concept="3EZMnI" id="4Tiud0Td6Qf" role="2ruayu">
-            <node concept="VPM3Z" id="4Tiud0Td6Qg" role="3F10Kt">
+          <node concept="3EZMnI" id="3p9Oys9ZZaN" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9Oys9ZZaP" role="3F10Kt">
               <property role="VOm3f" value="false" />
             </node>
-            <node concept="l2Vlx" id="4Tiud0Td6Qh" role="2iSdaV" />
-          </node>
-        </node>
-        <node concept="2iRfu4" id="QvUN5N1AwR" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9Oys9ZZaN" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9Oys9ZZaP" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9Oys9ZZaR" role="3EZMnx">
-          <property role="3F0ifm" value="open paranthesis:" />
-        </node>
-        <node concept="3F1sOY" id="3p9Oysa0088" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9Oys9ZZbv" resolve="leftParanthesis" />
-        </node>
-        <node concept="2iRfu4" id="3p9Oys9ZZaS" role="2iSdaV" />
-        <node concept="pkWqt" id="3p9Oysa009b" role="pqm2j">
-          <node concept="3clFbS" id="3p9Oysa009c" role="2VODD2">
-            <node concept="3clFbF" id="3p9Oysa00jC" role="3cqZAp">
-              <node concept="2OqwBi" id="3p9Oysa00ts" role="3clFbG">
-                <node concept="pncrf" id="3p9Oysa00jB" role="2Oq$k0" />
-                <node concept="3TrcHB" id="3p9Oysa016q" role="2OqNvi">
-                  <ref role="3TsBF5" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
+            <node concept="3F0ifn" id="3p9Oys9ZZaR" role="3EZMnx">
+              <property role="3F0ifm" value="open paranthesis:" />
+            </node>
+            <node concept="3F1sOY" id="3p9Oysa0088" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9Oys9ZZbv" resolve="leftParanthesis" />
+            </node>
+            <node concept="2iRfu4" id="3p9Oys9ZZaS" role="2iSdaV" />
+            <node concept="pkWqt" id="3p9Oysa009b" role="pqm2j">
+              <node concept="3clFbS" id="3p9Oysa009c" role="2VODD2">
+                <node concept="3clFbF" id="3p9Oysa00jC" role="3cqZAp">
+                  <node concept="2OqwBi" id="3p9Oysa00ts" role="3clFbG">
+                    <node concept="pncrf" id="3p9Oysa00jB" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="3p9Oysa016q" role="2OqNvi">
+                      <ref role="3TsBF5" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="3EZMnI" id="3p9Oysa008c" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9Oysa008d" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9Oysa008e" role="3EZMnx">
-          <property role="3F0ifm" value="close paranthesis:" />
-        </node>
-        <node concept="3F1sOY" id="3p9Oysa0097" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9Oys9ZZby" resolve="rightParanthesis" />
-        </node>
-        <node concept="2iRfu4" id="3p9Oysa008g" role="2iSdaV" />
-        <node concept="pkWqt" id="3p9Oysa01jv" role="pqm2j">
-          <node concept="3clFbS" id="3p9Oysa01jw" role="2VODD2">
-            <node concept="3clFbF" id="3p9Oysa01jx" role="3cqZAp">
-              <node concept="2OqwBi" id="3p9Oysa01jy" role="3clFbG">
-                <node concept="pncrf" id="3p9Oysa01jz" role="2Oq$k0" />
-                <node concept="3TrcHB" id="3p9Oysa01j$" role="2OqNvi">
-                  <ref role="3TsBF5" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
+          <node concept="3EZMnI" id="3p9Oysa008c" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9Oysa008d" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9Oysa008e" role="3EZMnx">
+              <property role="3F0ifm" value="close paranthesis:" />
+            </node>
+            <node concept="3F1sOY" id="3p9Oysa0097" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9Oys9ZZby" resolve="rightParanthesis" />
+            </node>
+            <node concept="2iRfu4" id="3p9Oysa008g" role="2iSdaV" />
+            <node concept="pkWqt" id="3p9Oysa01jv" role="pqm2j">
+              <node concept="3clFbS" id="3p9Oysa01jw" role="2VODD2">
+                <node concept="3clFbF" id="3p9Oysa01jx" role="3cqZAp">
+                  <node concept="2OqwBi" id="3p9Oysa01jy" role="3clFbG">
+                    <node concept="pncrf" id="3p9Oysa01jz" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="3p9Oysa01j$" role="2OqNvi">
+                      <ref role="3TsBF5" to="diuo:QvUN5N1Ano" resolve="showParentheses" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -468,64 +501,86 @@
   </node>
   <node concept="24kQdi" id="7UiI8OpiHB2">
     <ref role="1XX52x" to="diuo:7UiI8OpiHxh" resolve="AbstractBracketsEditor" />
-    <node concept="3EZMnI" id="7UiI8OpiHG0" role="2wV5jI">
-      <node concept="2iRfu4" id="7UiI8OpiHG1" role="2iSdaV" />
-      <node concept="PMmxH" id="7UiI8OpiHG8" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+    <node concept="PMmxH" id="3p9Oysa57pB" role="6VMZX">
+      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+    </node>
+    <node concept="3EZMnI" id="1be6WiHaseP" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHaseQ" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
       </node>
-      <node concept="3F1sOY" id="7UiI8OpiHGn" role="3EZMnx">
+      <node concept="3F1sOY" id="1be6WiHasm3" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:7UiI8OpiHGj" resolve="body" />
       </node>
-      <node concept="VPXOz" id="7UiI8OpiHHW" role="3F10Kt">
-        <property role="VOm3f" value="true" />
+      <node concept="PMmxH" id="1be6WiHaseT" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
       </node>
-    </node>
-    <node concept="PMmxH" id="3p9Oysa57pB" role="6VMZX">
-      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+      <node concept="2iRfu4" id="1be6WiHaseU" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="7UiI8OpiHPZ">
     <ref role="1XX52x" to="diuo:7UiI8OpiHL1" resolve="BracketsEditor" />
     <node concept="3EZMnI" id="7UiI8OpiNyr" role="2wV5jI">
-      <node concept="3F0ifn" id="7UiI8OpiNys" role="3EZMnx">
-        <property role="3F0ifm" value="BRACKETS" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OpiNyD" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OpiNyE" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OpiNyF" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OpiNyG" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiHGj" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OpiNyH" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OpiNyI" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OpiNyJ" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OpiNyK" role="3EZMnx">
-          <property role="3F0ifm" value="left bracket:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OpiNyL" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiN_2" resolve="leftBracket" />
-        </node>
-        <node concept="2iRfu4" id="7UiI8OpiNyM" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="7UiI8OpiNB3" role="3EZMnx">
-        <node concept="VPM3Z" id="7UiI8OpiNB4" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="7UiI8OpiNB5" role="3EZMnx">
-          <property role="3F0ifm" value="right bracket:" />
-        </node>
-        <node concept="3F1sOY" id="7UiI8OpiNB6" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiN_a" resolve="rightBracket" />
+      <node concept="3EZMnI" id="1be6WiHav$m" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHav$n" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHavL1" role="3EZMnx">
+          <property role="3F0ifm" value="brackets" />
+          <node concept="Vb9p2" id="1be6WiHavMI" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHav$p" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHav$q" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHawhk" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHawhl" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHawf9" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHawkp" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHawkq" role="2iSdaV" />
+          <node concept="3EZMnI" id="7UiI8OpiNyD" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OpiNyE" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OpiNyF" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OpiNyG" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiHGj" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OpiNyH" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="7UiI8OpiNyI" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OpiNyJ" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OpiNyK" role="3EZMnx">
+              <property role="3F0ifm" value="left bracket:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OpiNyL" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiN_2" resolve="leftBracket" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OpiNyM" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="7UiI8OpiNB3" role="3EZMnx">
+            <node concept="VPM3Z" id="7UiI8OpiNB4" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="7UiI8OpiNB5" role="3EZMnx">
+              <property role="3F0ifm" value="right bracket:" />
+            </node>
+            <node concept="3F1sOY" id="7UiI8OpiNB6" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiN_a" resolve="rightBracket" />
+            </node>
+            <node concept="2iRfu4" id="7UiI8OpiNB7" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="7UiI8OpiNB7" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="7UiI8OpiNyN" role="2iSdaV" />
       <node concept="VPXOz" id="7UiI8OpiNyO" role="3F10Kt">
@@ -539,33 +594,52 @@
   <node concept="24kQdi" id="73f6OzXtcxP">
     <ref role="1XX52x" to="diuo:2_93Dm8d21u" resolve="AboveEditor" />
     <node concept="3EZMnI" id="73f6OzXtkRP" role="2wV5jI">
-      <node concept="3F0ifn" id="73f6OzXtkRQ" role="3EZMnx">
-        <property role="3F0ifm" value="ABOVE" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="73f6OzXtkS3" role="3EZMnx">
-        <node concept="VPM3Z" id="73f6OzXtkS4" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="73f6OzXtkS5" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="73f6OzXtkS6" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:73f6OzXtcxF" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="73f6OzXtkS7" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="73f6OzXtkS8" role="3EZMnx">
-        <node concept="VPM3Z" id="73f6OzXtkS9" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="73f6OzXtkSa" role="3EZMnx">
-          <property role="3F0ifm" value="symbol:" />
-        </node>
-        <node concept="3F1sOY" id="73f6OzXtkSb" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:73f6OzXtcxH" resolve="symbol" />
+      <node concept="3EZMnI" id="1be6WiHa4m$" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
+          <property role="3F0ifm" value="above" />
+          <node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHaiwd" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHaiwe" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHaiui" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHaiFT" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHaiFU" role="2iSdaV" />
+          <node concept="3EZMnI" id="73f6OzXtkS3" role="3EZMnx">
+            <node concept="VPM3Z" id="73f6OzXtkS4" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="73f6OzXtkS5" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="73f6OzXtkS6" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:73f6OzXtcxF" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="73f6OzXtkS7" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="73f6OzXtkS8" role="3EZMnx">
+            <node concept="VPM3Z" id="73f6OzXtkS9" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="73f6OzXtkSa" role="3EZMnx">
+              <property role="3F0ifm" value="symbol:" />
+            </node>
+            <node concept="3F1sOY" id="73f6OzXtkSb" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:73f6OzXtcxH" resolve="symbol" />
+            </node>
+            <node concept="2iRfu4" id="73f6OzXtkSc" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="73f6OzXtkSc" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="73f6OzXtkSd" role="2iSdaV" />
       <node concept="VPXOz" id="73f6OzXtkSe" role="3F10Kt">
@@ -579,69 +653,88 @@
   <node concept="24kQdi" id="4XhobVTYc3P">
     <ref role="1XX52x" to="diuo:7wCpClFnJAI" resolve="IntegralEditor" />
     <node concept="3EZMnI" id="4XhobVTYc6T" role="2wV5jI">
-      <node concept="3F0ifn" id="4XhobVTYc6U" role="3EZMnx">
-        <property role="3F0ifm" value="INTEGRAL" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="4XhobVTYc6X" role="3EZMnx">
-        <node concept="VPM3Z" id="4XhobVTYc6Y" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4XhobVTYc6Z" role="3EZMnx">
-          <property role="3F0ifm" value="lower:" />
-        </node>
-        <node concept="3F1sOY" id="4XhobVTYc70" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4XhobVTYc26" resolve="lower" />
-        </node>
-        <node concept="2iRfu4" id="4XhobVTYc71" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4XhobVTYc72" role="3EZMnx">
-        <node concept="VPM3Z" id="4XhobVTYc73" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4XhobVTYc74" role="3EZMnx">
-          <property role="3F0ifm" value="upper:" />
-        </node>
-        <node concept="3F1sOY" id="4XhobVTYc75" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4XhobVTYc25" resolve="upper" />
-        </node>
-        <node concept="2iRfu4" id="4XhobVTYc76" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4XhobVTYc77" role="3EZMnx">
-        <node concept="VPM3Z" id="4XhobVTYc78" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4XhobVTYc79" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="4XhobVTYc7a" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4XhobVTYc24" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="4XhobVTYc7b" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4XhobVU9YHe" role="3EZMnx">
-        <node concept="VPM3Z" id="4XhobVU9YHg" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4XhobVU9YHi" role="3EZMnx">
-          <property role="3F0ifm" value="variable:" />
-        </node>
-        <node concept="3F1sOY" id="4XhobVU9YHK" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4XhobVU9YGg" resolve="variable" />
-        </node>
-        <node concept="2iRfu4" id="4XhobVU9YHj" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="QvUN5N4SLS" role="3EZMnx">
-        <node concept="VPM3Z" id="QvUN5N4SLT" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="QvUN5N4SLU" role="3EZMnx">
-          <property role="3F0ifm" value="parentheses:" />
-        </node>
-        <node concept="3F0A7n" id="QvUN5N4SLV" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:QvUN5N4Szt" resolve="showParentheses" />
+      <node concept="3EZMnI" id="1be6WiHax0R" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHax0S" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHax0T" role="3EZMnx">
+          <property role="3F0ifm" value="integral" />
+          <node concept="Vb9p2" id="1be6WiHax0U" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHax0V" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHax0W" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHax8b" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHax8c" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHax5B" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHaxaP" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHaxaQ" role="2iSdaV" />
+          <node concept="3EZMnI" id="4XhobVTYc6X" role="3EZMnx">
+            <node concept="VPM3Z" id="4XhobVTYc6Y" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4XhobVTYc6Z" role="3EZMnx">
+              <property role="3F0ifm" value="lower:" />
+            </node>
+            <node concept="3F1sOY" id="4XhobVTYc70" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4XhobVTYc26" resolve="lower" />
+            </node>
+            <node concept="2iRfu4" id="4XhobVTYc71" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4XhobVTYc72" role="3EZMnx">
+            <node concept="VPM3Z" id="4XhobVTYc73" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4XhobVTYc74" role="3EZMnx">
+              <property role="3F0ifm" value="upper:" />
+            </node>
+            <node concept="3F1sOY" id="4XhobVTYc75" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4XhobVTYc25" resolve="upper" />
+            </node>
+            <node concept="2iRfu4" id="4XhobVTYc76" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4XhobVTYc77" role="3EZMnx">
+            <node concept="VPM3Z" id="4XhobVTYc78" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4XhobVTYc79" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="4XhobVTYc7a" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4XhobVTYc24" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="4XhobVTYc7b" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4XhobVU9YHe" role="3EZMnx">
+            <node concept="VPM3Z" id="4XhobVU9YHg" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4XhobVU9YHi" role="3EZMnx">
+              <property role="3F0ifm" value="variable:" />
+            </node>
+            <node concept="3F1sOY" id="4XhobVU9YHK" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4XhobVU9YGg" resolve="variable" />
+            </node>
+            <node concept="2iRfu4" id="4XhobVU9YHj" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="QvUN5N4SLS" role="3EZMnx">
+            <node concept="VPM3Z" id="QvUN5N4SLT" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="QvUN5N4SLU" role="3EZMnx">
+              <property role="3F0ifm" value="parentheses:" />
+            </node>
+            <node concept="3F0A7n" id="QvUN5N4SLV" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:QvUN5N4Szt" resolve="showParentheses" />
+            </node>
+            <node concept="2iRfu4" id="QvUN5N4SLW" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="QvUN5N4SLW" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="4XhobVTYc7h" role="2iSdaV" />
       <node concept="VPXOz" id="4XhobVTYc7i" role="3F10Kt">
@@ -655,8 +748,9 @@
   <node concept="24kQdi" id="4r1mNB_oAxx">
     <ref role="1XX52x" to="diuo:4r1mNB_oAsj" resolve="SubscriptEditor" />
     <node concept="3EZMnI" id="4r1mNB_oA_c" role="2wV5jI">
-      <node concept="3F0ifn" id="4r1mNB_oA_e" role="3EZMnx">
-        <property role="3F0ifm" value="math.subscript[" />
+      <node concept="PMmxH" id="1be6WiHaALN" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
       </node>
       <node concept="3F1sOY" id="4r1mNB_oAB6" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:4r1mNB_oAvD" resolve="normal" />
@@ -667,8 +761,9 @@
       <node concept="3F1sOY" id="4r1mNB_oACb" role="3EZMnx">
         <ref role="1NtTu8" to="diuo:4r1mNB_oAwf" resolve="subscript" />
       </node>
-      <node concept="3F0ifn" id="4r1mNB_oAAa" role="3EZMnx">
-        <property role="3F0ifm" value="]" />
+      <node concept="PMmxH" id="1be6WiHaAVc" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
       </node>
       <node concept="2iRfu4" id="4r1mNB_oA_f" role="2iSdaV" />
     </node>
@@ -679,45 +774,64 @@
   <node concept="24kQdi" id="4r1mNB_qwtz">
     <ref role="1XX52x" to="diuo:4r1mNB_qwqE" resolve="SubscriptedFunctionEditor" />
     <node concept="3EZMnI" id="4r1mNB_qwJt" role="2wV5jI">
-      <node concept="3F0ifn" id="4r1mNB_qwJu" role="3EZMnx">
-        <property role="3F0ifm" value="SUBSCRIPED FUNCTION" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_qwJx" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_qwJy" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_qwJz" role="3EZMnx">
-          <property role="3F0ifm" value="function name:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_qwJ$" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_qwrb" resolve="functionName" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_qwJ_" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_qwJA" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_qwJB" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_qwJC" role="3EZMnx">
-          <property role="3F0ifm" value="subscript:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_qwJD" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_qwrL" resolve="subscript" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_qwJE" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_qwJF" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_qwJG" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_qwJH" role="3EZMnx">
-          <property role="3F0ifm" value="argument:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_qwJI" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_qwss" resolve="argument" />
+      <node concept="3EZMnI" id="1be6WiHaA6a" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHaA6b" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHaA6c" role="3EZMnx">
+          <property role="3F0ifm" value="subscriped function" />
+          <node concept="Vb9p2" id="1be6WiHaA6d" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHaA6e" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHaA6f" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHaAmm" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHaAmn" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHaAkm" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHaAoQ" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHaAoR" role="2iSdaV" />
+          <node concept="3EZMnI" id="4r1mNB_qwJx" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_qwJy" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_qwJz" role="3EZMnx">
+              <property role="3F0ifm" value="function name:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_qwJ$" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_qwrb" resolve="functionName" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_qwJ_" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_qwJA" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_qwJB" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_qwJC" role="3EZMnx">
+              <property role="3F0ifm" value="subscript:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_qwJD" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_qwrL" resolve="subscript" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_qwJE" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_qwJF" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_qwJG" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_qwJH" role="3EZMnx">
+              <property role="3F0ifm" value="argument:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_qwJI" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_qwss" resolve="argument" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_qwJJ" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="4r1mNB_qwJJ" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="4r1mNB_qwJP" role="2iSdaV" />
       <node concept="VPXOz" id="4r1mNB_qwJQ" role="3F10Kt">
@@ -731,81 +845,100 @@
   <node concept="24kQdi" id="4r1mNB_GBII">
     <ref role="1XX52x" to="diuo:4r1mNB_GBCV" resolve="CustomSymbolIntegralEditor" />
     <node concept="3EZMnI" id="4r1mNB_GBMV" role="2wV5jI">
-      <node concept="3F0ifn" id="4r1mNB_GBMW" role="3EZMnx">
-        <property role="3F0ifm" value="INTEGRAL" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_GBMZ" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_GBN0" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_GBN1" role="3EZMnx">
-          <property role="3F0ifm" value="lower:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_GBN2" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_GBCY" resolve="lower" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_GBN3" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_GBN4" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_GBN5" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_GBN6" role="3EZMnx">
-          <property role="3F0ifm" value="upper:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_GBN7" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_GBCX" resolve="upper" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_GBN8" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_GBN9" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_GBNa" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_GBNb" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_GBNc" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_GBCW" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_GBNd" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_GBNe" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_GBNf" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_GBNg" role="3EZMnx">
-          <property role="3F0ifm" value="variable:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_GBNh" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_GBCZ" resolve="variable" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_GBNi" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="4r1mNB_GSlo" role="3EZMnx">
-        <node concept="VPM3Z" id="4r1mNB_GSlp" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="4r1mNB_GSlq" role="3EZMnx">
-          <property role="3F0ifm" value="symbol:" />
-        </node>
-        <node concept="3F1sOY" id="4r1mNB_GSlr" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:4r1mNB_GBG9" resolve="symbol" />
-        </node>
-        <node concept="2iRfu4" id="4r1mNB_GSls" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="QvUN5N4SDo" role="3EZMnx">
-        <node concept="VPM3Z" id="QvUN5N4SDp" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="QvUN5N4SDq" role="3EZMnx">
-          <property role="3F0ifm" value="parentheses:" />
-        </node>
-        <node concept="3F0A7n" id="QvUN5N4SDr" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:QvUN5N4qHZ" resolve="showParentheses" />
+      <node concept="3EZMnI" id="1be6WiHawtF" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHawtG" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHawtH" role="3EZMnx">
+          <property role="3F0ifm" value="integral" />
+          <node concept="Vb9p2" id="1be6WiHawtI" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHawtJ" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHawtK" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHawDG" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHawDH" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHawBt" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHawHf" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHawHg" role="2iSdaV" />
+          <node concept="3EZMnI" id="4r1mNB_GBMZ" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_GBN0" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_GBN1" role="3EZMnx">
+              <property role="3F0ifm" value="lower:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_GBN2" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_GBCY" resolve="lower" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_GBN3" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_GBN4" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_GBN5" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_GBN6" role="3EZMnx">
+              <property role="3F0ifm" value="upper:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_GBN7" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_GBCX" resolve="upper" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_GBN8" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_GBN9" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_GBNa" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_GBNb" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_GBNc" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_GBCW" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_GBNd" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_GBNe" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_GBNf" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_GBNg" role="3EZMnx">
+              <property role="3F0ifm" value="variable:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_GBNh" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_GBCZ" resolve="variable" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_GBNi" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="4r1mNB_GSlo" role="3EZMnx">
+            <node concept="VPM3Z" id="4r1mNB_GSlp" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="4r1mNB_GSlq" role="3EZMnx">
+              <property role="3F0ifm" value="symbol:" />
+            </node>
+            <node concept="3F1sOY" id="4r1mNB_GSlr" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:4r1mNB_GBG9" resolve="symbol" />
+            </node>
+            <node concept="2iRfu4" id="4r1mNB_GSls" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="QvUN5N4SDo" role="3EZMnx">
+            <node concept="VPM3Z" id="QvUN5N4SDp" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="QvUN5N4SDq" role="3EZMnx">
+              <property role="3F0ifm" value="parentheses:" />
+            </node>
+            <node concept="3F0A7n" id="QvUN5N4SDr" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:QvUN5N4qHZ" resolve="showParentheses" />
+            </node>
+            <node concept="2iRfu4" id="QvUN5N4SDs" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="QvUN5N4SDs" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="4r1mNB_GBNj" role="2iSdaV" />
       <node concept="VPXOz" id="4r1mNB_GBNk" role="3F10Kt">
@@ -819,105 +952,124 @@
   <node concept="24kQdi" id="3p9OysaCeX6">
     <ref role="1XX52x" to="diuo:3p9OysaCeUt" resolve="OverreachingBracketsEditor" />
     <node concept="3EZMnI" id="3p9OysaCeZf" role="2wV5jI">
-      <node concept="3F0ifn" id="3p9OysaCeZg" role="3EZMnx">
-        <property role="3F0ifm" value="OVERREACHING BRACKETS" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCeZj" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCeZk" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCeZl" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaCeZm" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiHGj" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCeZn" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCeZo" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCeZp" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCeZq" role="3EZMnx">
-          <property role="3F0ifm" value="left bracket:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaCeZr" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiN_2" resolve="leftBracket" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCeZs" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCeZt" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCeZu" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCeZv" role="3EZMnx">
-          <property role="3F0ifm" value="right bracket:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaCeZw" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OpiN_a" resolve="rightBracket" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCeZx" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCf0A" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCf0C" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCf0E" role="3EZMnx">
-          <property role="3F0ifm" value="overreach top:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaCf18" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaCeVh" resolve="overreachTop" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCf0F" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCf1c" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCf1d" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCf1e" role="3EZMnx">
-          <property role="3F0ifm" value="overreach bottom:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaCf1f" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaCeWc" resolve="overreachBottom" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCf1g" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCf1J" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCf1K" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCf1L" role="3EZMnx">
-          <property role="3F0ifm" value="inset left factor" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaCf1M" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaCeWf" resolve="insetLeft" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCf1N" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaCf2n" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaCf2o" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaCf2p" role="3EZMnx">
-          <property role="3F0ifm" value="inset right factor:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaCf2q" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaCeWj" resolve="insetRight" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaCf2r" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="2TqkE2kEzRJ" role="3EZMnx">
-        <node concept="VPM3Z" id="2TqkE2kEzRK" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="2TqkE2kEzRL" role="3EZMnx">
-          <property role="3F0ifm" value="align to centerY:" />
-        </node>
-        <node concept="3F0A7n" id="2TqkE2kEzRM" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:2TqkE2kEzyV" resolve="alignToCenterY" />
+      <node concept="3EZMnI" id="1be6WiHazSz" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHazS$" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHazS_" role="3EZMnx">
+          <property role="3F0ifm" value="overreaching brackets" />
+          <node concept="Vb9p2" id="1be6WiHazSA" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHazSB" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHazSC" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHa$fe" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHa$ff" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHa$cr" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHa$ix" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHa$iy" role="2iSdaV" />
+          <node concept="3EZMnI" id="3p9OysaCeZj" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCeZk" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCeZl" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaCeZm" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiHGj" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCeZn" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCeZo" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCeZp" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCeZq" role="3EZMnx">
+              <property role="3F0ifm" value="left bracket:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaCeZr" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiN_2" resolve="leftBracket" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCeZs" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCeZt" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCeZu" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCeZv" role="3EZMnx">
+              <property role="3F0ifm" value="right bracket:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaCeZw" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OpiN_a" resolve="rightBracket" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCeZx" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCf0A" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCf0C" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCf0E" role="3EZMnx">
+              <property role="3F0ifm" value="overreach top:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaCf18" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaCeVh" resolve="overreachTop" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCf0F" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCf1c" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCf1d" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCf1e" role="3EZMnx">
+              <property role="3F0ifm" value="overreach bottom:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaCf1f" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaCeWc" resolve="overreachBottom" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCf1g" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCf1J" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCf1K" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCf1L" role="3EZMnx">
+              <property role="3F0ifm" value="inset left factor" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaCf1M" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaCeWf" resolve="insetLeft" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCf1N" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaCf2n" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaCf2o" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaCf2p" role="3EZMnx">
+              <property role="3F0ifm" value="inset right factor:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaCf2q" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaCeWj" resolve="insetRight" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaCf2r" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="2TqkE2kEzRJ" role="3EZMnx">
+            <node concept="VPM3Z" id="2TqkE2kEzRK" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="2TqkE2kEzRL" role="3EZMnx">
+              <property role="3F0ifm" value="align to centerY:" />
+            </node>
+            <node concept="3F0A7n" id="2TqkE2kEzRM" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:2TqkE2kEzyV" resolve="alignToCenterY" />
+            </node>
+            <node concept="2iRfu4" id="2TqkE2kEzRN" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="2TqkE2kEzRN" role="2iSdaV" />
       </node>
       <node concept="2EHx9g" id="3p9OysaCeZy" role="2iSdaV" />
       <node concept="VPXOz" id="3p9OysaCeZz" role="3F10Kt">
@@ -931,143 +1083,161 @@
   <node concept="24kQdi" id="3p9OysaNeq4">
     <ref role="1XX52x" to="diuo:3p9OysaNeo3" resolve="OverreachingLoopEditor" />
     <node concept="3EZMnI" id="3p9OysaNeFU" role="2wV5jI">
-      <node concept="3F0ifn" id="3p9OysaNeFV" role="3EZMnx">
-        <property role="3F0ifm" value="OVERREACHING LOOP" />
-        <ref role="1k5W1q" node="1Wl9xzO4GTy" resolve="Caption" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeFY" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeFZ" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeG0" role="3EZMnx">
-          <property role="3F0ifm" value="lower:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeG1" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPg" resolve="lower" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeG2" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeG3" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeG4" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeG5" role="3EZMnx">
-          <property role="3F0ifm" value="upper:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeG6" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPf" resolve="upper" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeG7" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeG8" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeG9" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeGa" role="3EZMnx">
-          <property role="3F0ifm" value="body:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeGb" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8Op1nPe" resolve="body" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeGc" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeGd" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeGe" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeGf" role="3EZMnx">
-          <property role="3F0ifm" value="symbol:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeGg" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:7UiI8OoPc63" resolve="symbol" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeGh" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeGn" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeGo" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeGp" role="3EZMnx">
-          <property role="3F0ifm" value="open paranthesis:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeGq" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9Oys9ZZbv" resolve="leftParanthesis" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeGr" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNeGy" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNeGz" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNeG$" role="3EZMnx">
-          <property role="3F0ifm" value="close paranthesis:" />
-        </node>
-        <node concept="3F1sOY" id="3p9OysaNeG_" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9Oys9ZZby" resolve="rightParanthesis" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNeGA" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNfDk" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNfDl" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNfDm" role="3EZMnx">
-          <property role="3F0ifm" value="overreach top:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaNfDn" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaNepe" resolve="overreachTop" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNfDo" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNfDp" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNfDq" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNfDr" role="3EZMnx">
-          <property role="3F0ifm" value="overreach bottom:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaNfDs" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaNepf" resolve="overreachBottom" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNfDt" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNfDu" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNfDv" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNfDw" role="3EZMnx">
-          <property role="3F0ifm" value="inset left factor" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaNfDx" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaNepg" resolve="insetLeft" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNfDy" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="3p9OysaNfDz" role="3EZMnx">
-        <node concept="VPM3Z" id="3p9OysaNfD$" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="3p9OysaNfD_" role="3EZMnx">
-          <property role="3F0ifm" value="inset right factor:" />
-        </node>
-        <node concept="3F0A7n" id="3p9OysaNfDA" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:3p9OysaNeph" resolve="insetRight" />
-        </node>
-        <node concept="2iRfu4" id="3p9OysaNfDB" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="2TqkE2kEFmU" role="3EZMnx">
-        <node concept="VPM3Z" id="2TqkE2kEFmV" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-        <node concept="3F0ifn" id="2TqkE2kEFmW" role="3EZMnx">
-          <property role="3F0ifm" value="align to centerY:" />
-        </node>
-        <node concept="3F0A7n" id="2TqkE2kEFmX" role="3EZMnx">
-          <ref role="1NtTu8" to="diuo:2TqkE2kEFlM" resolve="alignToCenterY" />
+      <node concept="3EZMnI" id="1be6WiHa$Bx" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHa$By" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHa$Bz" role="3EZMnx">
+          <property role="3F0ifm" value="overreaching loop" />
+          <node concept="Vb9p2" id="1be6WiHa$B$" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHa$B_" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHa$BA" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHa$RY" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHa$RZ" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHa$Pl" role="3EZMnx" />
+        <node concept="3EZMnI" id="1be6WiHa$XX" role="3EZMnx">
+          <node concept="2iRkQZ" id="1be6WiHa$XY" role="2iSdaV" />
+          <node concept="3EZMnI" id="3p9OysaNeFY" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeFZ" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeG0" role="3EZMnx">
+              <property role="3F0ifm" value="lower:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeG1" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPg" resolve="lower" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeG2" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNeG3" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeG4" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeG5" role="3EZMnx">
+              <property role="3F0ifm" value="upper:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeG6" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPf" resolve="upper" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeG7" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNeG8" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeG9" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeGa" role="3EZMnx">
+              <property role="3F0ifm" value="body:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeGb" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8Op1nPe" resolve="body" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeGc" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNeGd" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeGe" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeGf" role="3EZMnx">
+              <property role="3F0ifm" value="symbol:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeGg" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:7UiI8OoPc63" resolve="symbol" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeGh" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNeGn" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeGo" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeGp" role="3EZMnx">
+              <property role="3F0ifm" value="open paranthesis:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeGq" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9Oys9ZZbv" resolve="leftParanthesis" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeGr" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNeGy" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNeGz" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNeG$" role="3EZMnx">
+              <property role="3F0ifm" value="close paranthesis:" />
+            </node>
+            <node concept="3F1sOY" id="3p9OysaNeG_" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9Oys9ZZby" resolve="rightParanthesis" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNeGA" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNfDk" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNfDl" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNfDm" role="3EZMnx">
+              <property role="3F0ifm" value="overreach top:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaNfDn" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaNepe" resolve="overreachTop" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNfDo" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNfDp" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNfDq" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNfDr" role="3EZMnx">
+              <property role="3F0ifm" value="overreach bottom:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaNfDs" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaNepf" resolve="overreachBottom" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNfDt" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNfDu" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNfDv" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNfDw" role="3EZMnx">
+              <property role="3F0ifm" value="inset left factor" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaNfDx" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaNepg" resolve="insetLeft" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNfDy" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="3p9OysaNfDz" role="3EZMnx">
+            <node concept="VPM3Z" id="3p9OysaNfD$" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="3p9OysaNfD_" role="3EZMnx">
+              <property role="3F0ifm" value="inset right factor:" />
+            </node>
+            <node concept="3F0A7n" id="3p9OysaNfDA" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:3p9OysaNeph" resolve="insetRight" />
+            </node>
+            <node concept="2iRfu4" id="3p9OysaNfDB" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="2TqkE2kEFmU" role="3EZMnx">
+            <node concept="VPM3Z" id="2TqkE2kEFmV" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="3F0ifn" id="2TqkE2kEFmW" role="3EZMnx">
+              <property role="3F0ifm" value="align to centerY:" />
+            </node>
+            <node concept="3F0A7n" id="2TqkE2kEFmX" role="3EZMnx">
+              <ref role="1NtTu8" to="diuo:2TqkE2kEFlM" resolve="alignToCenterY" />
+            </node>
+            <node concept="2iRfu4" id="2TqkE2kEFmY" role="2iSdaV" />
+          </node>
         </node>
-        <node concept="2iRfu4" id="2TqkE2kEFmY" role="2iSdaV" />
       </node>
-      <node concept="3F0ifn" id="3p9OysaNfxr" role="3EZMnx" />
       <node concept="2EHx9g" id="3p9OysaNeGH" role="2iSdaV" />
       <node concept="VPXOz" id="3p9OysaNeGI" role="3F10Kt">
         <property role="VOm3f" value="true" />
diff --git a/code/math/languages/de.itemis.mps.editor.math/languageModels/behavior.mps b/code/math/languages/de.itemis.mps.editor.math/languageModels/behavior.mps
index 68ac777c9..2e4e61fca 100644
--- a/code/math/languages/de.itemis.mps.editor.math/languageModels/behavior.mps
+++ b/code/math/languages/de.itemis.mps.editor.math/languageModels/behavior.mps
@@ -17,6 +17,7 @@
     <import index="x4fh" ref="r:6d7e624e-8f0d-49a1-aae8-a4cb94dbe189(de.itemis.mps.editor.math.structure)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -634,6 +635,32 @@
         <ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
       </node>
     </node>
+    <node concept="13i0hz" id="1be6WiHahCr" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHahCs" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHahCx" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHai9r" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHai9q" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHahCy" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHahCB" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHahCC" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHahCH" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaify" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaifx" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHahCI" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="70CVChQj1$J">
     <ref role="13h7C2" to="x4fh:19RCnNmEwGZ" resolve="ChildCellDecl" />
diff --git a/code/math/languages/de.itemis.mps.editor.math/languageModels/editor.mps b/code/math/languages/de.itemis.mps.editor.math/languageModels/editor.mps
index 3c0710926..468c46d97 100644
--- a/code/math/languages/de.itemis.mps.editor.math/languageModels/editor.mps
+++ b/code/math/languages/de.itemis.mps.editor.math/languageModels/editor.mps
@@ -36,6 +36,7 @@
       <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
         <child id="1186402402630" name="styles" index="V601i" />
       </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -43,6 +44,9 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
       <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
         <property id="1238091709220" name="labelName" index="1413C4" />
       </concept>
@@ -93,8 +97,21 @@
   <node concept="24kQdi" id="9L22EoX1XI">
     <ref role="1XX52x" to="x4fh:1lPTJf7_6lc" resolve="CellModel_MathBase" />
     <node concept="3EZMnI" id="9L22EoX1Yz" role="2wV5jI">
-      <node concept="3F0ifn" id="9L22EoX1YE" role="3EZMnx">
-        <property role="3F0ifm" value="math" />
+      <node concept="3EZMnI" id="1be6WiHa4m$" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="1be6WiHa4mA" role="3EZMnx">
+          <property role="3F0ifm" value="math" />
+          <node concept="Vb9p2" id="1be6WiHa4mB" role="3F10Kt" />
+        </node>
+        <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
       </node>
       <node concept="3EZMnI" id="5fk$COuBDmu" role="3EZMnx">
         <property role="S$Qs1" value="true" />
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.behavior.mps b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.behavior.mps
index 5f30c248f..e8465bdf3 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.behavior.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.behavior.mps
@@ -13,6 +13,7 @@
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -39,12 +40,16 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -188,5 +193,37 @@
       <node concept="3Tqbb2" id="37CVl9iBSes" role="3clF45" />
     </node>
   </node>
+  <node concept="13h7C7" id="1be6WiHaBUM">
+    <ref role="13h7C2" to="1d4c:2iSRtQtBV$6" resolve="Paginate_CellModel" />
+    <node concept="13hLZK" id="1be6WiHaBUN" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHaBUO" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaC1u" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHaC1v" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaC1$" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaCgZ" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaCgY" role="3clFbG">
+            <property role="Xl_RC" value="paginate[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaC1_" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHaC1E" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHaC1F" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHaC1K" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHaCy0" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHaCxZ" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHaC1L" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.editor.mps b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.editor.mps
index 46fdcd834..669b5b1a7 100644
--- a/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.editor.mps
+++ b/code/pagination/languages/de.itemis.mps.editor.pagination/models/de.itemis.mps.editor.pagination.editor.mps
@@ -5,8 +5,8 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
   </languages>
   <imports>
+    <import index="tpc5" ref="r:00000000-0000-4000-0000-011c89590299(jetbrains.mps.lang.editor.editor)" />
     <import index="1d4c" ref="r:7f43e4ab-5881-4ab5-a0b9-d27c04d2a2ce(de.itemis.mps.editor.pagination.structure)" implicit="true" />
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -25,14 +25,13 @@
       <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
         <child id="1186402402630" name="styles" index="V601i" />
       </concept>
-      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
-        <property id="1186403713874" name="color" index="Vb096" />
-      </concept>
-      <concept id="1186404574412" name="jetbrains.mps.lang.editor.structure.BackgroundColorStyleClassItem" flags="ln" index="Veino" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
       <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
       <concept id="3982520150113085419" name="jetbrains.mps.lang.editor.structure.StyleAttributeDeclaration" flags="ig" index="3t5Usi">
         <child id="3982520150113147643" name="defaultValue" index="3t49C2" />
         <child id="3982520150113092206" name="valueType" index="3t5Oan" />
@@ -68,17 +67,20 @@
   <node concept="24kQdi" id="2iSRtQtCL7D">
     <ref role="1XX52x" to="1d4c:2iSRtQtBV$6" resolve="Paginate_CellModel" />
     <node concept="3EZMnI" id="1ndn0Iae4WT" role="2wV5jI">
-      <node concept="3EZMnI" id="2iSRtQtCL7F" role="3EZMnx">
-        <node concept="PMmxH" id="1ndn0Iam711" role="3EZMnx">
-          <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-          <node concept="Veino" id="1ndn0Iam71J" role="3F10Kt">
-            <property role="Vb096" value="fLJRk5_/gray" />
-          </node>
+      <node concept="3EZMnI" id="1be6WiHa$Bx" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="1be6WiHa$By" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
         </node>
-        <node concept="2iRfu4" id="2iSRtQtCL7I" role="2iSdaV" />
-        <node concept="3F1sOY" id="2iSRtQtCL7S" role="3EZMnx">
+        <node concept="3F1sOY" id="1be6WiHaBSF" role="3EZMnx">
           <ref role="1NtTu8" to="1d4c:2iSRtQtCL7w" resolve="collectionToPaginate" />
         </node>
+        <node concept="PMmxH" id="1be6WiHa$B_" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
+        </node>
+        <node concept="2iRfu4" id="1be6WiHa$BA" role="2iSdaV" />
       </node>
       <node concept="3EZMnI" id="1ndn0Iae54k" role="3EZMnx">
         <node concept="3F0ifn" id="1ndn0IadIhW" role="3EZMnx">
diff --git a/code/richtext/languages/de.slisson.richtext.customcell/languageModels/editor.mps b/code/richtext/languages/de.slisson.richtext.customcell/languageModels/editor.mps
index 4f6d139ec..a9c423017 100644
--- a/code/richtext/languages/de.slisson.richtext.customcell/languageModels/editor.mps
+++ b/code/richtext/languages/de.slisson.richtext.customcell/languageModels/editor.mps
@@ -25,6 +25,7 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -110,6 +111,7 @@
         </node>
         <node concept="3F0ifn" id="h7YH7Ww" role="3EZMnx">
           <property role="3F0ifm" value="custom factory cell" />
+          <node concept="Vb9p2" id="1be6WiHaDTa" role="3F10Kt" />
         </node>
         <node concept="PMmxH" id="h7TN$Ex" role="3EZMnx">
           <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/models/editor.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/models/editor.mps
index 3ad840eea..52e1152a8 100644
--- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/models/editor.mps
+++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/models/editor.mps
@@ -25,6 +25,7 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -51,6 +52,7 @@
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -110,14 +112,19 @@
         </node>
         <node concept="3F0ifn" id="h7YH7Ww" role="3EZMnx">
           <property role="3F0ifm" value="custom factory cell" />
+          <node concept="Vb9p2" id="1be6WiHaCCw" role="3F10Kt" />
         </node>
         <node concept="PMmxH" id="h7TN$Ex" role="3EZMnx">
           <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
         </node>
         <node concept="2iRfu4" id="i2IxuT6" role="2iSdaV" />
       </node>
-      <node concept="3F1sOY" id="2af7$rtteQX" role="3EZMnx">
-        <ref role="1NtTu8" to="myud:fBEZMko" resolve="childCellModel" />
+      <node concept="3EZMnI" id="1be6WiHaCUu" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHaCUv" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHaCSj" role="3EZMnx" />
+        <node concept="3F1sOY" id="2af7$rtteQX" role="3EZMnx">
+          <ref role="1NtTu8" to="myud:fBEZMko" resolve="childCellModel" />
+        </node>
       </node>
       <node concept="2iRkQZ" id="2af7$rtteQv" role="2iSdaV" />
     </node>
diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl b/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl
index 6b70b9942..36870b824 100644
--- a/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl
+++ b/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl
@@ -106,6 +106,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false" scope="generate-into">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false" scope="generate-into">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/behavior.mps b/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/behavior.mps
index 31dd3fcb4..13a352b6a 100644
--- a/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/behavior.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/behavior.mps
@@ -7,7 +7,8 @@
   </languages>
   <imports>
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
-    <import index="o1st" ref="r:bca3993a-2dc4-4449-a654-c9f2fa86dc9c(de.itemis.mps.editor.collapsible.structure)" implicit="true" />
+    <import index="o1st" ref="r:bca3993a-2dc4-4449-a654-c9f2fa86dc9c(de.itemis.mps.editor.collapsible.structure)" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" implicit="true" />
@@ -40,8 +41,12 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -143,6 +148,32 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="1be6WiHa93Q" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHa93R" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa93W" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa9a5" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa9a4" role="3clFbG">
+            <property role="Xl_RC" value="[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa93X" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHa942" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHa943" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHa948" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHa9hE" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHa9hD" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHa949" role="3clF45" />
+    </node>
   </node>
   <node concept="13h7C7" id="1$t5g3Q$5tR">
     <ref role="13h7C2" to="o1st:1$t5g3Q$5tQ" resolve="ConceptFunction_GetNodeSize" />
diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/editor.mps b/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/editor.mps
index eb2b0c3d5..15062f756 100644
--- a/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/editor.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.collapsible/languageModels/editor.mps
@@ -6,6 +6,7 @@
   </languages>
   <imports>
     <import index="o1st" ref="r:bca3993a-2dc4-4449-a654-c9f2fa86dc9c(de.itemis.mps.editor.collapsible.structure)" />
+    <import index="tpc5" ref="r:00000000-0000-4000-0000-011c89590299(jetbrains.mps.lang.editor.editor)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -20,10 +21,10 @@
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
-      <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
-        <property id="1186403713874" name="color" index="Vb096" />
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
-      <concept id="1186404574412" name="jetbrains.mps.lang.editor.structure.BackgroundColorStyleClassItem" flags="ln" index="Veino" />
+      <concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2" />
       <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
         <property id="1186414551515" name="flag" index="VOm3f" />
       </concept>
@@ -33,6 +34,9 @@
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
@@ -49,6 +53,7 @@
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1198256887712" name="jetbrains.mps.lang.editor.structure.CellModel_Indent" flags="ng" index="3XFhqQ" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -57,80 +62,84 @@
   <node concept="24kQdi" id="48DYfEsZk_F">
     <ref role="1XX52x" to="o1st:48DYfEsZko6" resolve="CellModel_Collapsible" />
     <node concept="3EZMnI" id="48DYfEt2oLV" role="2wV5jI">
-      <node concept="3F0ifn" id="48DYfEtfaYm" role="3EZMnx">
-        <property role="3F0ifm" value="collapsible" />
-        <node concept="Veino" id="5qgNcfDnkqf" role="3F10Kt">
-          <property role="Vb096" value="fLJRk5A/lightGray" />
+      <node concept="3EZMnI" id="2peXSsL72c0" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+        <node concept="PMmxH" id="i0vcES5" role="3EZMnx">
+          <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
         </node>
-      </node>
-      <node concept="3F0ifn" id="48DYfEtlLIs" role="3EZMnx">
-        <node concept="VPM3Z" id="48DYfEtlV9x" role="3F10Kt">
-          <property role="VOm3f" value="false" />
+        <node concept="3F0ifn" id="2peXSsL72c5" role="3EZMnx">
+          <property role="3F0ifm" value="collapsible" />
+          <node concept="Vb9p2" id="1be6WiH9g4X" role="3F10Kt" />
         </node>
-      </node>
-      <node concept="3EZMnI" id="48DYfEtlHqA" role="3EZMnx">
-        <node concept="VPM3Z" id="48DYfEtlHqC" role="3F10Kt">
-          <property role="VOm3f" value="false" />
+        <node concept="PMmxH" id="i0vcESe" role="3EZMnx">
+          <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+          <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
         </node>
-        <node concept="3F0ifn" id="48DYfEtlQso" role="3EZMnx">
-          <property role="3F0ifm" value="  " />
-          <node concept="VPM3Z" id="48DYfEtlV9D" role="3F10Kt">
+        <node concept="2iRfu4" id="2peXSsL72ca" role="2iSdaV" />
+      </node>
+      <node concept="3EZMnI" id="1be6WiHa9y1" role="3EZMnx">
+        <node concept="2iRfu4" id="1be6WiHa9y2" role="2iSdaV" />
+        <node concept="3XFhqQ" id="1be6WiHa9vu" role="3EZMnx" />
+        <node concept="3EZMnI" id="48DYfEtlHqA" role="3EZMnx">
+          <node concept="VPM3Z" id="48DYfEtlHqC" role="3F10Kt">
             <property role="VOm3f" value="false" />
           </node>
-        </node>
-        <node concept="3EZMnI" id="48DYfEtfjLg" role="3EZMnx">
-          <node concept="3EZMnI" id="48DYfEtbZqY" role="3EZMnx">
-            <node concept="VPM3Z" id="48DYfEtbZr0" role="3F10Kt">
+          <node concept="3F0ifn" id="48DYfEtlQso" role="3EZMnx">
+            <property role="3F0ifm" value="  " />
+            <node concept="VPM3Z" id="48DYfEtlV9D" role="3F10Kt">
               <property role="VOm3f" value="false" />
             </node>
-            <node concept="VPXOz" id="48DYfEtjv02" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="48DYfEtfdFM" role="3EZMnx">
-              <property role="3F0ifm" value="collapsed" />
-            </node>
-            <node concept="3F1sOY" id="48DYfEtbZrj" role="3EZMnx">
-              <ref role="1NtTu8" to="o1st:48DYfEtbX_p" resolve="collapsedCell" />
-              <node concept="VPXOz" id="48DYfEtjv0C" role="3F10Kt">
+          </node>
+          <node concept="3EZMnI" id="48DYfEtfjLg" role="3EZMnx">
+            <node concept="3EZMnI" id="48DYfEtbZqY" role="3EZMnx">
+              <node concept="VPM3Z" id="48DYfEtbZr0" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
+              <node concept="VPXOz" id="48DYfEtjv02" role="3F10Kt">
                 <property role="VOm3f" value="true" />
               </node>
+              <node concept="3F0ifn" id="48DYfEtfdFM" role="3EZMnx">
+                <property role="3F0ifm" value="collapsed" />
+              </node>
+              <node concept="3F1sOY" id="48DYfEtbZrj" role="3EZMnx">
+                <ref role="1NtTu8" to="o1st:48DYfEtbX_p" resolve="collapsedCell" />
+                <node concept="VPXOz" id="48DYfEtjv0C" role="3F10Kt">
+                  <property role="VOm3f" value="true" />
+                </node>
+              </node>
+              <node concept="2iRfu4" id="48DYfEtbZr3" role="2iSdaV" />
             </node>
-            <node concept="2iRfu4" id="48DYfEtbZr3" role="2iSdaV" />
-          </node>
-          <node concept="3EZMnI" id="48DYfEtfdGn" role="3EZMnx">
-            <node concept="VPM3Z" id="48DYfEtfdGo" role="3F10Kt">
-              <property role="VOm3f" value="false" />
-            </node>
-            <node concept="VPXOz" id="48DYfEtjv0c" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="3F0ifn" id="48DYfEtfdGp" role="3EZMnx">
-              <property role="3F0ifm" value="expanded" />
-            </node>
-            <node concept="3F1sOY" id="48DYfEtfdGq" role="3EZMnx">
-              <ref role="1NtTu8" to="o1st:48DYfEt2oMe" resolve="expandedCell" />
-              <node concept="VPXOz" id="48DYfEtjv0y" role="3F10Kt">
+            <node concept="3EZMnI" id="48DYfEtfdGn" role="3EZMnx">
+              <node concept="VPM3Z" id="48DYfEtfdGo" role="3F10Kt">
+                <property role="VOm3f" value="false" />
+              </node>
+              <node concept="VPXOz" id="48DYfEtjv0c" role="3F10Kt">
                 <property role="VOm3f" value="true" />
               </node>
+              <node concept="3F0ifn" id="48DYfEtfdGp" role="3EZMnx">
+                <property role="3F0ifm" value="expanded" />
+              </node>
+              <node concept="3F1sOY" id="48DYfEtfdGq" role="3EZMnx">
+                <ref role="1NtTu8" to="o1st:48DYfEt2oMe" resolve="expandedCell" />
+                <node concept="VPXOz" id="48DYfEtjv0y" role="3F10Kt">
+                  <property role="VOm3f" value="true" />
+                </node>
+              </node>
+              <node concept="2iRfu4" id="48DYfEtfdGr" role="2iSdaV" />
             </node>
-            <node concept="2iRfu4" id="48DYfEtfdGr" role="2iSdaV" />
-          </node>
-          <node concept="VPM3Z" id="48DYfEtfjLi" role="3F10Kt">
-            <property role="VOm3f" value="false" />
+            <node concept="VPM3Z" id="48DYfEtfjLi" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="2EHx9g" id="48DYfEtfjMk" role="2iSdaV" />
           </node>
-          <node concept="2EHx9g" id="48DYfEtfjMk" role="2iSdaV" />
-        </node>
-        <node concept="3F0ifn" id="48DYfEtlQvy" role="3EZMnx">
-          <property role="3F0ifm" value="  " />
-          <node concept="VPM3Z" id="48DYfEtlV9K" role="3F10Kt">
-            <property role="VOm3f" value="false" />
+          <node concept="3F0ifn" id="48DYfEtlQvy" role="3EZMnx">
+            <property role="3F0ifm" value="  " />
+            <node concept="VPM3Z" id="48DYfEtlV9K" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
           </node>
-        </node>
-        <node concept="2iRfu4" id="48DYfEtlHqF" role="2iSdaV" />
-      </node>
-      <node concept="3F0ifn" id="48DYfEtlLLG" role="3EZMnx">
-        <node concept="VPM3Z" id="48DYfEtlV9R" role="3F10Kt">
-          <property role="VOm3f" value="false" />
+          <node concept="2iRfu4" id="48DYfEtlHqF" role="2iSdaV" />
         </node>
       </node>
       <node concept="2iRkQZ" id="48DYfEtbZqF" role="2iSdaV" />
diff --git a/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/behavior.mps b/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/behavior.mps
index 5e81e2c13..64effbf33 100644
--- a/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/behavior.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/behavior.mps
@@ -4,7 +4,82 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="9b3t" ref="r:89097a7d-e3bb-45b9-bbd8-21e9e897dd54(de.itemis.mps.editor.dropdown.structure)" />
+    <import index="tpcb" ref="r:00000000-0000-4000-0000-011c89590297(jetbrains.mps.lang.editor.behavior)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
+        <reference id="1225194240799" name="concept" index="13h7C2" />
+        <child id="1225194240805" name="method" index="13h7CS" />
+        <child id="1225194240801" name="constructor" index="13h7CW" />
+      </concept>
+      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
+      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="13h7C7" id="1be6WiHafBf">
+    <ref role="13h7C2" to="9b3t:_i_acSf54w" resolve="CellModel_DropDown" />
+    <node concept="13hLZK" id="1be6WiHafBg" role="13h7CW">
+      <node concept="3clFbS" id="1be6WiHafBh" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHafHF" role="13h7CS">
+      <property role="TrG5h" value="getOpeningText" />
+      <ref role="13i0hy" to="tpcb:hKxU$w9" resolve="getOpeningText" />
+      <node concept="3Tm1VV" id="1be6WiHafHG" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHafHL" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHafRS" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHafRR" role="3clFbG">
+            <property role="Xl_RC" value="dropdown[" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHafHM" role="3clF45" />
+    </node>
+    <node concept="13i0hz" id="1be6WiHafHR" role="13h7CS">
+      <property role="TrG5h" value="getClosingText" />
+      <ref role="13i0hy" to="tpcb:hKxUEwj" resolve="getClosingText" />
+      <node concept="3Tm1VV" id="1be6WiHafHS" role="1B3o_S" />
+      <node concept="3clFbS" id="1be6WiHafHX" role="3clF47">
+        <node concept="3clFbF" id="1be6WiHafZP" role="3cqZAp">
+          <node concept="Xl_RD" id="1be6WiHafZO" role="3clFbG">
+            <property role="Xl_RC" value="]" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="1be6WiHafHY" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/editor.mps b/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/editor.mps
index 74378c7f0..25a2868d5 100644
--- a/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/editor.mps
+++ b/code/widgets/languages/de.itemis.mps.editor.dropdown/languageModels/editor.mps
@@ -20,10 +20,9 @@
       <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
         <reference id="1078939183255" name="editorComponent" index="PMmxG" />
       </concept>
-      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
-        <property id="1186414551515" name="flag" index="VOm3f" />
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
-      <concept id="1186414976055" name="jetbrains.mps.lang.editor.structure.DrawBorderStyleClassItem" flags="ln" index="VPXOz" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
@@ -31,12 +30,6 @@
         <child id="1106270802874" name="cellLayout" index="2iSdaV" />
         <child id="1073389446424" name="childCellModel" index="3EZMnx" />
       </concept>
-      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
-        <property id="1073389577007" name="text" index="3F0ifm" />
-      </concept>
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
-        <child id="1219418656006" name="styleItem" index="3F10Kt" />
-      </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -45,20 +38,23 @@
   </registry>
   <node concept="24kQdi" id="_i_acSf75t">
     <ref role="1XX52x" to="9b3t:_i_acSf54w" resolve="CellModel_DropDown" />
-    <node concept="3EZMnI" id="_i_acSfcTc" role="2wV5jI">
-      <node concept="3F0ifn" id="_i_acSfcTe" role="3EZMnx">
-        <property role="3F0ifm" value="dropdown" />
+    <node concept="PMmxH" id="hF4FFz6" role="6VMZX">
+      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+    </node>
+    <node concept="3EZMnI" id="1be6WiHa4m$" role="2wV5jI">
+      <ref role="1k5W1q" to="tpc5:hX5ZSzR" resolve="borderedCollection" />
+      <node concept="PMmxH" id="1be6WiHa4m_" role="3EZMnx">
+        <ref role="PMmxG" to="tpc5:h7TMiuR" resolve="_OpenTag" />
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
       </node>
-      <node concept="3F1sOY" id="_i_acSfcTm" role="3EZMnx">
+      <node concept="3F1sOY" id="1be6WiHaf_7" role="3EZMnx">
         <ref role="1NtTu8" to="9b3t:_i_acSf75m" resolve="labelCell" />
       </node>
-      <node concept="2iRfu4" id="_i_acSfcTf" role="2iSdaV" />
-      <node concept="VPXOz" id="_i_acSfih1" role="3F10Kt">
-        <property role="VOm3f" value="true" />
+      <node concept="PMmxH" id="1be6WiHa4mC" role="3EZMnx">
+        <ref role="1k5W1q" to="tpc5:i12920y" resolve="tag" />
+        <ref role="PMmxG" to="tpc5:h7TMK$j" resolve="_CloseTag" />
       </node>
-    </node>
-    <node concept="PMmxH" id="hF4FFz6" role="6VMZX">
-      <ref role="PMmxG" to="tpc5:hF4ssnw" resolve="_CellModel_Common" />
+      <node concept="2iRfu4" id="1be6WiHa4mD" role="2iSdaV" />
     </node>
   </node>
 </model>