From 94d2c2c3673bdd801c17597af95f1121d2750a14 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Sep 2024 09:06:17 +0200
Subject: [PATCH 1/3] editor.diagram: add support for grid snapping

---
 CHANGELOG.md                                  |    1 +
 .../languageModels/editor.mps                 |   50 +
 .../languageModels/editor.mps                 |   14 +
 .../generator/template/main@generator.mps     |  466 ++++++
 .../languageModels/behavior.mps               |   58 +
 .../languageModels/editor.mps                 |   95 ++
 .../languageModels/structure.mps              |   34 +
 .../editor/diagram/demoentities/sandbox.mps   |    4 +-
 .../mps/editor/diagram/runtime/jgraph.mps     | 1465 ++++++++++++++---
 .../mps/editor/diagram/runtime/model.mps      |  101 ++
 .../de.itemis.mps.extensions.changelog.mps    |  110 ++
 11 files changed, 2131 insertions(+), 267 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 519128c65..e95898f0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
 
 ### Added
 
+- *de.itemis.mps.editor.diagram*: Diagrams can now show a grid that is used for snapping elements to it. It can be configured (visibility, grid snapping, grid color/size) in the editor definition of the diagram itself.
 - A module stub solution *MPS.Kotlin* was added to support referencing Kotlin classes and libraries from MPS.ThirdParty.
 
 ## August 2024
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
index a6eb9b7f5..8d7c144e7 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
@@ -14,6 +14,7 @@
     <import index="tc27" ref="r:92d28f3c-6acc-431a-94ba-30cd184d2da4(de.itemis.mps.editor.diagram.runtime.substitute)" />
     <import index="wo6c" ref="r:de91083f-90a8-4dd4-83b1-8a92d65ab81d(de.itemis.mps.editor.diagram.shapes)" />
     <import index="vgho" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:org.eclipse.elk.core.math(de.itemis.mps.editor.diagram.runtime/)" />
+    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="88j9" ref="r:20c4aa5c-ab36-4815-af32-01895ee9c2f5(de.itemis.mps.editor.diagram.editor)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -58,6 +59,7 @@
       </concept>
       <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
+      <concept id="1221057094638" name="jetbrains.mps.lang.editor.structure.QueryFunction_Integer" flags="in" index="1cFabM" />
       <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>
@@ -93,6 +95,7 @@
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
+      <concept id="1176809959526" name="jetbrains.mps.lang.editor.structure.QueryFunction_Color" flags="in" index="3ZlJ5R" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -124,6 +127,9 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -162,6 +168,9 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
@@ -219,6 +228,10 @@
         <child id="1742468285817538342" name="disableNodeEditing" index="2gDVEa" />
         <child id="53713348769907228" name="autoLayoutOnChange" index="2hB_ot" />
         <child id="2060885462441433843" name="allowElementsBelowRequiredSize" index="2F3Mqr" />
+        <child id="3401785396303280005" name="gridColor" index="1bWipe" />
+        <child id="7349833668006295675" name="gridSize" index="3ehQaW" />
+        <child id="5128117196760806289" name="useGridSnapping" index="3wlkzU" />
+        <child id="5128117196760806288" name="showGrid" index="3wlkzV" />
         <child id="8637411062076630380" name="connectionTypes" index="1xLlFP" />
         <child id="7858611447550199305" name="syncWithModelOnlyOnOpening" index="3y0MdK" />
         <child id="8637411062062914773" name="paletteFolder" index="1y_2dc" />
@@ -880,6 +893,43 @@
           </node>
         </node>
       </node>
+      <node concept="1cFabM" id="6nZQGuFTYEq" role="3ehQaW">
+        <node concept="3clFbS" id="6nZQGuFTYEr" role="2VODD2">
+          <node concept="3clFbF" id="6nZQGuFTZ5W" role="3cqZAp">
+            <node concept="3cmrfG" id="6nZQGuFTZBR" role="3clFbG">
+              <property role="3cmrfH" value="5" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="pkWqt" id="6nZQGuG5umb" role="3wlkzV">
+        <node concept="3clFbS" id="6nZQGuG5umc" role="2VODD2">
+          <node concept="3clFbF" id="6nZQGuG5uzJ" role="3cqZAp">
+            <node concept="3clFbT" id="6nZQGuG5uzI" role="3clFbG">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="pkWqt" id="6nZQGuG5Fj1" role="3wlkzU">
+        <node concept="3clFbS" id="6nZQGuG5Fj2" role="2VODD2">
+          <node concept="3clFbF" id="6nZQGuG5F$_" role="3cqZAp">
+            <node concept="3clFbT" id="6nZQGuG5F$$" role="3clFbG">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3ZlJ5R" id="2WP$sH_3F$E" role="1bWipe">
+        <node concept="3clFbS" id="2WP$sH_3F$F" role="2VODD2">
+          <node concept="3clFbF" id="2WP$sH_3Ght" role="3cqZAp">
+            <node concept="10M0yZ" id="2WP$sH_3GlE" role="3clFbG">
+              <ref role="3cqZAo" to="z60i:~Color.BLUE" resolve="BLUE" />
+              <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
   <node concept="2ABfQD" id="4_qW8fWM_gV">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
index 377492249..529e774f8 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
@@ -469,6 +469,20 @@
         <property role="3clFbU" value="true" />
       </node>
     </node>
+    <node concept="3t5Usi" id="4sEIQIBKTSa" role="V601i">
+      <property role="TrG5h" value="__show-grid-button" />
+      <node concept="10P_77" id="4sEIQIBKTSb" role="3t5Oan" />
+      <node concept="3clFbT" id="4sEIQIBKTSc" role="3t49C2">
+        <property role="3clFbU" value="true" />
+      </node>
+    </node>
+    <node concept="3t5Usi" id="4sEIQIBKU2v" role="V601i">
+      <property role="TrG5h" value="__use_grid-snapping-button" />
+      <node concept="10P_77" id="4sEIQIBKU2w" role="3t5Oan" />
+      <node concept="3clFbT" id="4sEIQIBKU2x" role="3t49C2">
+        <property role="3clFbU" value="true" />
+      </node>
+    </node>
     <node concept="3t5Usi" id="74e51JhIQfJ" role="V601i">
       <property role="TrG5h" value="__root-button-creator" />
       <node concept="1ajhzC" id="74e51JhIQiK" role="3t5Oan">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index 8a29e185d..611405ac2 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -6161,6 +6161,112 @@
                                                     </node>
                                                   </node>
                                                 </node>
+                                                <node concept="2tJIrI" id="4sEIQIBwHcp" role="jymVt" />
+                                                <node concept="3clFb_" id="4sEIQIBwIXv" role="jymVt">
+                                                  <property role="TrG5h" value="showTheGrid" />
+                                                  <node concept="3clFbS" id="4sEIQIBwIXw" role="3clF47">
+                                                    <node concept="3cpWs6" id="4sEIQIBwIXx" role="3cqZAp">
+                                                      <node concept="3clFbT" id="4sEIQIBwIXy" role="3cqZAk" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm6S6" id="4sEIQIBwIXz" role="1B3o_S" />
+                                                  <node concept="10P_77" id="4sEIQIBwIX$" role="3clF45" />
+                                                  <node concept="29HgVG" id="4sEIQIBwIX_" role="lGtFl">
+                                                    <node concept="3NFfHV" id="4sEIQIBwIXA" role="3NFExx">
+                                                      <node concept="3clFbS" id="4sEIQIBwIXB" role="2VODD2">
+                                                        <node concept="3clFbF" id="4sEIQIBwIXC" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="4sEIQIBwIXD" role="3clFbG">
+                                                            <node concept="30H73N" id="4sEIQIBwIXE" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="4sEIQIBwIXF" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="2qld:4sEIQIBvZeh" resolve="useGridSnapping" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="6nZQGuFIEKf" role="jymVt" />
+                                                <node concept="3clFb_" id="6nZQGuFIBcj" role="jymVt">
+                                                  <property role="TrG5h" value="getTheGridSize" />
+                                                  <node concept="3clFbS" id="6nZQGuFIBck" role="3clF47">
+                                                    <node concept="3cpWs6" id="6nZQGuFIBcl" role="3cqZAp">
+                                                      <node concept="3cmrfG" id="6nZQGuFIUld" role="3cqZAk">
+                                                        <property role="3cmrfH" value="0" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm6S6" id="6nZQGuFIBcn" role="1B3o_S" />
+                                                  <node concept="10Oyi0" id="6nZQGuFIR16" role="3clF45" />
+                                                  <node concept="29HgVG" id="6nZQGuFIBcp" role="lGtFl">
+                                                    <ref role="2rW$FS" to="tpc3:hG092go" resolve="query_method" />
+                                                    <node concept="3NFfHV" id="6nZQGuFIBcq" role="3NFExx">
+                                                      <node concept="3clFbS" id="6nZQGuFIBcr" role="2VODD2">
+                                                        <node concept="3clFbF" id="6nZQGuFIBcs" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="6nZQGuFIBct" role="3clFbG">
+                                                            <node concept="30H73N" id="6nZQGuFIBcu" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="6nZQGuFIBcv" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="2qld:6nZQGuFIbxV" resolve="gridSize" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="2WP$sH$LpBs" role="jymVt" />
+                                                <node concept="3clFb_" id="2WP$sH$LjQX" role="jymVt">
+                                                  <property role="TrG5h" value="getTheGridColor" />
+                                                  <node concept="3clFbS" id="2WP$sH$LjQY" role="3clF47">
+                                                    <node concept="3cpWs6" id="2WP$sH$LjQZ" role="3cqZAp">
+                                                      <node concept="10Nm6u" id="2WP$sH$LzVC" role="3cqZAk" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm6S6" id="2WP$sH$LjR1" role="1B3o_S" />
+                                                  <node concept="3uibUv" id="2WP$sH$LtkB" role="3clF45">
+                                                    <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+                                                  </node>
+                                                  <node concept="29HgVG" id="2WP$sH$LjR3" role="lGtFl">
+                                                    <ref role="2rW$FS" to="tpc3:hG092go" resolve="query_method" />
+                                                    <node concept="3NFfHV" id="2WP$sH$LjR4" role="3NFExx">
+                                                      <node concept="3clFbS" id="2WP$sH$LjR5" role="2VODD2">
+                                                        <node concept="3clFbF" id="2WP$sH$LjR6" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="2WP$sH$LjR7" role="3clFbG">
+                                                            <node concept="30H73N" id="2WP$sH$LjR8" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="2WP$sH$LjR9" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="2qld:2WP$sH$Lbu5" resolve="gridColor" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="4sEIQIBwHcq" role="jymVt" />
+                                                <node concept="3clFb_" id="4sEIQIBwWNH" role="jymVt">
+                                                  <property role="TrG5h" value="useTheGridSnapping" />
+                                                  <node concept="3clFbS" id="4sEIQIBwWNI" role="3clF47">
+                                                    <node concept="3cpWs6" id="4sEIQIBwWNJ" role="3cqZAp">
+                                                      <node concept="3clFbT" id="4sEIQIBwWNK" role="3cqZAk" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm6S6" id="4sEIQIBwWNL" role="1B3o_S" />
+                                                  <node concept="10P_77" id="4sEIQIBwWNM" role="3clF45" />
+                                                  <node concept="29HgVG" id="4sEIQIBwWNN" role="lGtFl">
+                                                    <node concept="3NFfHV" id="4sEIQIBwWNO" role="3NFExx">
+                                                      <node concept="3clFbS" id="4sEIQIBwWNP" role="2VODD2">
+                                                        <node concept="3clFbF" id="4sEIQIBwWNQ" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="4sEIQIBwWNR" role="3clFbG">
+                                                            <node concept="30H73N" id="4sEIQIBwWNS" role="2Oq$k0" />
+                                                            <node concept="3TrEf2" id="4sEIQIBwWNT" role="2OqNvi">
+                                                              <ref role="3Tt5mk" to="2qld:4sEIQIBvZeg" resolve="showGrid" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                                 <node concept="2tJIrI" id="1MpJ6yS8QN5" role="jymVt" />
                                                 <node concept="3clFb_" id="4m$$SBGcTQF" role="jymVt">
                                                   <property role="TrG5h" value="runAutoLayoutOnInit" />
@@ -6627,6 +6733,300 @@
                                                     <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                                                   </node>
                                                 </node>
+                                                <node concept="2tJIrI" id="4sEIQIBw6Xw" role="jymVt" />
+                                                <node concept="3clFb_" id="4sEIQIBwdfN" role="jymVt">
+                                                  <property role="TrG5h" value="showGrid" />
+                                                  <node concept="3clFbS" id="4sEIQIBwdfO" role="3clF47">
+                                                    <node concept="3cpWs8" id="4sEIQIBwdfP" role="3cqZAp">
+                                                      <node concept="3cpWsn" id="4sEIQIBwdfQ" role="3cpWs9">
+                                                        <property role="TrG5h" value="flag" />
+                                                        <node concept="10P_77" id="4sEIQIBwdfR" role="1tU5fm" />
+                                                        <node concept="3clFbT" id="4sEIQIBwdfS" role="33vP2m" />
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3clFbF" id="4sEIQIBwdfT" role="3cqZAp">
+                                                      <node concept="37vLTI" id="4sEIQIBwdfU" role="3clFbG">
+                                                        <node concept="37vLTw" id="4sEIQIBwdfV" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="4sEIQIBwdfQ" resolve="flag" />
+                                                        </node>
+                                                        <node concept="1rXfSq" id="4sEIQIBxInr" role="37vLTx">
+                                                          <ref role="37wK5l" node="4sEIQIBwIXv" resolve="showTheGrid" />
+                                                          <node concept="1ZhdrF" id="4sEIQIBxLl$" role="lGtFl">
+                                                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                                            <node concept="3$xsQk" id="4sEIQIBxLl_" role="3$ytzL">
+                                                              <node concept="3clFbS" id="4sEIQIBxLlA" role="2VODD2">
+                                                                <node concept="3clFbF" id="4sEIQIBxPyR" role="3cqZAp">
+                                                                  <node concept="2OqwBi" id="4sEIQIBxPyS" role="3clFbG">
+                                                                    <node concept="1iwH70" id="4sEIQIBxPyT" role="2OqNvi">
+                                                                      <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
+                                                                      <node concept="2OqwBi" id="4sEIQIBxPyU" role="1iwH7V">
+                                                                        <node concept="30H73N" id="4sEIQIBxPyV" role="2Oq$k0" />
+                                                                        <node concept="3TrEf2" id="4sEIQIBxPyW" role="2OqNvi">
+                                                                          <ref role="3Tt5mk" to="2qld:4sEIQIBvZeg" resolve="showGrid" />
+                                                                        </node>
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="1iwH7S" id="4sEIQIBxPyX" role="2Oq$k0" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="1W57fq" id="4sEIQIBwdg7" role="lGtFl">
+                                                        <node concept="3IZrLx" id="4sEIQIBwdg8" role="3IZSJc">
+                                                          <node concept="3clFbS" id="4sEIQIBwdg9" role="2VODD2">
+                                                            <node concept="3clFbF" id="4sEIQIBwdga" role="3cqZAp">
+                                                              <node concept="3y3z36" id="4sEIQIBwdgb" role="3clFbG">
+                                                                <node concept="10Nm6u" id="4sEIQIBwdgc" role="3uHU7w" />
+                                                                <node concept="2OqwBi" id="4sEIQIBwdgd" role="3uHU7B">
+                                                                  <node concept="30H73N" id="4sEIQIBwdge" role="2Oq$k0" />
+                                                                  <node concept="3TrEf2" id="4sEIQIBwdgf" role="2OqNvi">
+                                                                    <ref role="3Tt5mk" to="2qld:4sEIQIBvZeg" resolve="showGrid" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3cpWs6" id="4sEIQIBwdgg" role="3cqZAp">
+                                                      <node concept="37vLTw" id="4sEIQIBwdgh" role="3cqZAk">
+                                                        <ref role="3cqZAo" node="4sEIQIBwdfQ" resolve="flag" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm1VV" id="4sEIQIBwdgi" role="1B3o_S" />
+                                                  <node concept="10P_77" id="4sEIQIBwdgj" role="3clF45" />
+                                                  <node concept="2AHcQZ" id="4sEIQIBwdgk" role="2AJF6D">
+                                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="6nZQGuFIvOK" role="jymVt" />
+                                                <node concept="3clFb_" id="6nZQGuFH4RH" role="jymVt">
+                                                  <property role="TrG5h" value="getGridSize" />
+                                                  <node concept="3Tm1VV" id="6nZQGuFH4RI" role="1B3o_S" />
+                                                  <node concept="10Oyi0" id="6nZQGuFH4RJ" role="3clF45" />
+                                                  <node concept="2AHcQZ" id="6nZQGuFH4RN" role="2AJF6D">
+                                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                                  </node>
+                                                  <node concept="3clFbS" id="6nZQGuFH4RP" role="3clF47">
+                                                    <node concept="3cpWs8" id="6nZQGuFJ0UF" role="3cqZAp">
+                                                      <node concept="3cpWsn" id="6nZQGuFJ0UI" role="3cpWs9">
+                                                        <property role="TrG5h" value="size" />
+                                                        <node concept="10Oyi0" id="6nZQGuFJ0UE" role="1tU5fm" />
+                                                        <node concept="3cmrfG" id="6nZQGuFJ7Hg" role="33vP2m">
+                                                          <property role="3cmrfH" value="10" />
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3clFbF" id="6nZQGuFJsP0" role="3cqZAp">
+                                                      <node concept="37vLTI" id="6nZQGuFJy3s" role="3clFbG">
+                                                        <node concept="1rXfSq" id="6nZQGuFJAG_" role="37vLTx">
+                                                          <ref role="37wK5l" node="6nZQGuFIBcj" resolve="getTheGridSize" />
+                                                          <node concept="1ZhdrF" id="6nZQGuFJD$7" role="lGtFl">
+                                                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                                            <node concept="3$xsQk" id="6nZQGuFJD$8" role="3$ytzL">
+                                                              <node concept="3clFbS" id="6nZQGuFJD$9" role="2VODD2">
+                                                                <node concept="3clFbF" id="6nZQGuFJGhr" role="3cqZAp">
+                                                                  <node concept="2OqwBi" id="6nZQGuFJGhs" role="3clFbG">
+                                                                    <node concept="1iwH70" id="6nZQGuFJGht" role="2OqNvi">
+                                                                      <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
+                                                                      <node concept="2OqwBi" id="6nZQGuFJGhu" role="1iwH7V">
+                                                                        <node concept="30H73N" id="6nZQGuFJGhv" role="2Oq$k0" />
+                                                                        <node concept="3TrEf2" id="6nZQGuFJGhw" role="2OqNvi">
+                                                                          <ref role="3Tt5mk" to="2qld:6nZQGuFIbxV" resolve="gridSize" />
+                                                                        </node>
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="1iwH7S" id="6nZQGuFJGhx" role="2Oq$k0" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                        <node concept="37vLTw" id="6nZQGuFJsOY" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="6nZQGuFJ0UI" resolve="size" />
+                                                        </node>
+                                                      </node>
+                                                      <node concept="1W57fq" id="6nZQGuFK6JN" role="lGtFl">
+                                                        <node concept="3IZrLx" id="6nZQGuFK6JQ" role="3IZSJc">
+                                                          <node concept="3clFbS" id="6nZQGuFK6JR" role="2VODD2">
+                                                            <node concept="3clFbF" id="6nZQGuFK6JX" role="3cqZAp">
+                                                              <node concept="3y3z36" id="6nZQGuFKpZr" role="3clFbG">
+                                                                <node concept="10Nm6u" id="6nZQGuFKu4M" role="3uHU7w" />
+                                                                <node concept="2OqwBi" id="6nZQGuFKha$" role="3uHU7B">
+                                                                  <node concept="30H73N" id="6nZQGuFKfGL" role="2Oq$k0" />
+                                                                  <node concept="3TrEf2" id="6nZQGuFKk$_" role="2OqNvi">
+                                                                    <ref role="3Tt5mk" to="2qld:6nZQGuFIbxV" resolve="gridSize" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3cpWs6" id="6nZQGuFJWd9" role="3cqZAp">
+                                                      <node concept="37vLTw" id="6nZQGuFK294" role="3cqZAk">
+                                                        <ref role="3cqZAo" node="6nZQGuFJ0UI" resolve="size" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="2WP$sH$LMTP" role="jymVt" />
+                                                <node concept="3clFb_" id="2WP$sH$LDMx" role="jymVt">
+                                                  <property role="TrG5h" value="getGridColor" />
+                                                  <node concept="3Tm1VV" id="2WP$sH$LDMy" role="1B3o_S" />
+                                                  <node concept="2AHcQZ" id="2WP$sH$LDM$" role="2AJF6D">
+                                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                                  </node>
+                                                  <node concept="3clFbS" id="2WP$sH$LDM_" role="3clF47">
+                                                    <node concept="3cpWs8" id="2WP$sH$LDMA" role="3cqZAp">
+                                                      <node concept="3cpWsn" id="2WP$sH$LDMB" role="3cpWs9">
+                                                        <property role="TrG5h" value="color" />
+                                                        <node concept="3uibUv" id="2WP$sH$LUHX" role="1tU5fm">
+                                                          <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+                                                        </node>
+                                                        <node concept="10Nm6u" id="2WP$sH$M3DV" role="33vP2m" />
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3clFbF" id="2WP$sH$LDME" role="3cqZAp">
+                                                      <node concept="37vLTI" id="2WP$sH$LDMF" role="3clFbG">
+                                                        <node concept="37vLTw" id="2WP$sH$LDMR" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="size" />
+                                                        </node>
+                                                        <node concept="1rXfSq" id="2WP$sH$M9xS" role="37vLTx">
+                                                          <ref role="37wK5l" node="2WP$sH$LjQX" resolve="getTheGridColor" />
+                                                          <node concept="1ZhdrF" id="2WP$sH$MeqY" role="lGtFl">
+                                                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                                            <node concept="3$xsQk" id="2WP$sH$MeqZ" role="3$ytzL">
+                                                              <node concept="3clFbS" id="2WP$sH$Mer0" role="2VODD2">
+                                                                <node concept="3clFbF" id="2WP$sH$Mm3k" role="3cqZAp">
+                                                                  <node concept="2OqwBi" id="2WP$sH$Mm3l" role="3clFbG">
+                                                                    <node concept="1iwH70" id="2WP$sH$Mm3m" role="2OqNvi">
+                                                                      <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
+                                                                      <node concept="2OqwBi" id="2WP$sH$Mm3n" role="1iwH7V">
+                                                                        <node concept="30H73N" id="2WP$sH$Mm3o" role="2Oq$k0" />
+                                                                        <node concept="3TrEf2" id="2WP$sH$Mm3p" role="2OqNvi">
+                                                                          <ref role="3Tt5mk" to="2qld:2WP$sH$Lbu5" resolve="gridColor" />
+                                                                        </node>
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="1iwH7S" id="2WP$sH$Mm3q" role="2Oq$k0" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="1W57fq" id="2WP$sH$LDMS" role="lGtFl">
+                                                        <node concept="3IZrLx" id="2WP$sH$LDMT" role="3IZSJc">
+                                                          <node concept="3clFbS" id="2WP$sH$LDMU" role="2VODD2">
+                                                            <node concept="3clFbF" id="2WP$sH$LDMV" role="3cqZAp">
+                                                              <node concept="3y3z36" id="2WP$sH$LDMW" role="3clFbG">
+                                                                <node concept="10Nm6u" id="2WP$sH$LDMX" role="3uHU7w" />
+                                                                <node concept="2OqwBi" id="2WP$sH$LDMY" role="3uHU7B">
+                                                                  <node concept="30H73N" id="2WP$sH$LDMZ" role="2Oq$k0" />
+                                                                  <node concept="3TrEf2" id="2WP$sH$LDN0" role="2OqNvi">
+                                                                    <ref role="3Tt5mk" to="2qld:2WP$sH$Lbu5" resolve="gridColor" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3cpWs6" id="2WP$sH$LDN1" role="3cqZAp">
+                                                      <node concept="37vLTw" id="2WP$sH$LDN2" role="3cqZAk">
+                                                        <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="size" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3uibUv" id="2WP$sH$MxS6" role="3clF45">
+                                                    <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+                                                  </node>
+                                                </node>
+                                                <node concept="2tJIrI" id="4sEIQIBwtCH" role="jymVt" />
+                                                <node concept="3clFb_" id="4sEIQIBwvBX" role="jymVt">
+                                                  <property role="TrG5h" value="useGridSnapping" />
+                                                  <node concept="3clFbS" id="4sEIQIBwvBY" role="3clF47">
+                                                    <node concept="3cpWs8" id="4sEIQIBwvBZ" role="3cqZAp">
+                                                      <node concept="3cpWsn" id="4sEIQIBwvC0" role="3cpWs9">
+                                                        <property role="TrG5h" value="flag" />
+                                                        <node concept="10P_77" id="4sEIQIBwvC1" role="1tU5fm" />
+                                                        <node concept="3clFbT" id="4sEIQIBwvC2" role="33vP2m" />
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3clFbF" id="4sEIQIBwvC3" role="3cqZAp">
+                                                      <node concept="37vLTI" id="4sEIQIBwvC4" role="3clFbG">
+                                                        <node concept="37vLTw" id="4sEIQIBwvC5" role="37vLTJ">
+                                                          <ref role="3cqZAo" node="4sEIQIBwvC0" resolve="flag" />
+                                                        </node>
+                                                        <node concept="1rXfSq" id="4sEIQIBxsFz" role="37vLTx">
+                                                          <ref role="37wK5l" node="4sEIQIBwWNH" resolve="useTheGridSnapping" />
+                                                          <node concept="1ZhdrF" id="4sEIQIBxvlp" role="lGtFl">
+                                                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                                                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                                            <node concept="3$xsQk" id="4sEIQIBxvlq" role="3$ytzL">
+                                                              <node concept="3clFbS" id="4sEIQIBxvlr" role="2VODD2">
+                                                                <node concept="3clFbF" id="4sEIQIBxy6a" role="3cqZAp">
+                                                                  <node concept="2OqwBi" id="4sEIQIBxy6b" role="3clFbG">
+                                                                    <node concept="1iwH70" id="4sEIQIBxy6c" role="2OqNvi">
+                                                                      <ref role="1iwH77" to="tpc3:hG092go" resolve="query_method" />
+                                                                      <node concept="2OqwBi" id="4sEIQIBxy6d" role="1iwH7V">
+                                                                        <node concept="30H73N" id="4sEIQIBxy6e" role="2Oq$k0" />
+                                                                        <node concept="3TrEf2" id="4sEIQIBxy6f" role="2OqNvi">
+                                                                          <ref role="3Tt5mk" to="2qld:4sEIQIBvZeh" resolve="useGridSnapping" />
+                                                                        </node>
+                                                                      </node>
+                                                                    </node>
+                                                                    <node concept="1iwH7S" id="4sEIQIBxy6g" role="2Oq$k0" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="1W57fq" id="4sEIQIBwvCh" role="lGtFl">
+                                                        <node concept="3IZrLx" id="4sEIQIBwvCi" role="3IZSJc">
+                                                          <node concept="3clFbS" id="4sEIQIBwvCj" role="2VODD2">
+                                                            <node concept="3clFbF" id="4sEIQIBwvCk" role="3cqZAp">
+                                                              <node concept="3y3z36" id="4sEIQIBwvCl" role="3clFbG">
+                                                                <node concept="10Nm6u" id="4sEIQIBwvCm" role="3uHU7w" />
+                                                                <node concept="2OqwBi" id="4sEIQIBwvCn" role="3uHU7B">
+                                                                  <node concept="30H73N" id="4sEIQIBwvCo" role="2Oq$k0" />
+                                                                  <node concept="3TrEf2" id="4sEIQIBwvCp" role="2OqNvi">
+                                                                    <ref role="3Tt5mk" to="2qld:4sEIQIBvZeh" resolve="useGridSnapping" />
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="3cpWs6" id="4sEIQIBwvCq" role="3cqZAp">
+                                                      <node concept="37vLTw" id="4sEIQIBwvCr" role="3cqZAk">
+                                                        <ref role="3cqZAo" node="4sEIQIBwvC0" resolve="flag" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tm1VV" id="4sEIQIBwvCs" role="1B3o_S" />
+                                                  <node concept="10P_77" id="4sEIQIBwvCt" role="3clF45" />
+                                                  <node concept="2AHcQZ" id="4sEIQIBwvCu" role="2AJF6D">
+                                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                                  </node>
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
@@ -16790,6 +17190,72 @@
         </node>
         <node concept="raruj" id="2ZU2kH0jCRx" role="lGtFl" />
       </node>
+      <node concept="3clFbF" id="4sEIQIBNCAb" role="3cqZAp">
+        <node concept="2OqwBi" id="4sEIQIBNCAc" role="3clFbG">
+          <node concept="37vLTw" id="4sEIQIBNCAd" role="2Oq$k0">
+            <ref role="3cqZAo" node="5ZBOFE3$Ijz" resolve="styleDiagram" />
+          </node>
+          <node concept="liA8E" id="4sEIQIBNCAe" role="2OqNvi">
+            <ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
+            <node concept="1Z6Ecs" id="4sEIQIBNCAf" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:4sEIQIBKTSa" resolve="__show-grid-button" />
+            </node>
+            <node concept="3clFbT" id="4sEIQIBNCAg" role="37wK5m">
+              <property role="3clFbU" value="true" />
+              <node concept="17Uvod" id="4sEIQIBNCAh" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="4sEIQIBNCAi" role="3zH0cK">
+                  <node concept="3clFbS" id="4sEIQIBNCAj" role="2VODD2">
+                    <node concept="3clFbF" id="4sEIQIBNCAk" role="3cqZAp">
+                      <node concept="2OqwBi" id="4sEIQIBNCAl" role="3clFbG">
+                        <node concept="30H73N" id="4sEIQIBNCAm" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="4sEIQIBNCAn" role="2OqNvi">
+                          <ref role="3TsBF5" to="2qld:4sEIQIBNARD" resolve="hasShowGridButton" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="raruj" id="4sEIQIBNCAo" role="lGtFl" />
+      </node>
+      <node concept="3clFbF" id="4sEIQIBND5H" role="3cqZAp">
+        <node concept="2OqwBi" id="4sEIQIBND5I" role="3clFbG">
+          <node concept="37vLTw" id="4sEIQIBND5J" role="2Oq$k0">
+            <ref role="3cqZAo" node="5ZBOFE3$Ijz" resolve="styleDiagram" />
+          </node>
+          <node concept="liA8E" id="4sEIQIBND5K" role="2OqNvi">
+            <ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
+            <node concept="1Z6Ecs" id="4sEIQIBND5L" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:4sEIQIBKU2v" resolve="__use_grid-snapping-button" />
+            </node>
+            <node concept="3clFbT" id="4sEIQIBND5M" role="37wK5m">
+              <property role="3clFbU" value="true" />
+              <node concept="17Uvod" id="4sEIQIBND5N" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="4sEIQIBND5O" role="3zH0cK">
+                  <node concept="3clFbS" id="4sEIQIBND5P" role="2VODD2">
+                    <node concept="3clFbF" id="4sEIQIBND5Q" role="3cqZAp">
+                      <node concept="2OqwBi" id="4sEIQIBND5R" role="3clFbG">
+                        <node concept="30H73N" id="4sEIQIBND5S" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="4sEIQIBND5T" role="2OqNvi">
+                          <ref role="3TsBF5" to="2qld:4sEIQIBNAVE" resolve="hasUseGridSnappingButton" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="raruj" id="4sEIQIBND5U" role="lGtFl" />
+      </node>
       <node concept="3clFbF" id="2ZU2kH0jEIM" role="3cqZAp">
         <node concept="2OqwBi" id="2ZU2kH0jEIN" role="3clFbG">
           <node concept="37vLTw" id="2ZU2kH0jEIO" role="2Oq$k0">
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 609e6738b..f3865b9a8 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
@@ -10473,6 +10473,64 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbF" id="4sEIQIBNL$4" role="3cqZAp">
+                  <node concept="2OqwBi" id="4sEIQIBNL$5" role="3clFbG">
+                    <node concept="37vLTw" id="4sEIQIBNL$6" role="2Oq$k0">
+                      <ref role="3cqZAo" node="74e51Ji6bH0" resolve="buttons" />
+                    </node>
+                    <node concept="TSZUe" id="4sEIQIBNL$7" role="2OqNvi">
+                      <node concept="2ShNRf" id="4sEIQIBNL$8" role="25WWJ7">
+                        <node concept="1pGfFk" id="4sEIQIBNL$9" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="r3rm:4sEIQIBu97K" resolve="ToggleGridDiagramButton" />
+                          <node concept="10M0yZ" id="4sEIQIBNL$c" role="37wK5m">
+                            <ref role="1PxDUh" to="r3rm:2KWY$Um6wZH" resolve="ContextButton" />
+                            <ref role="3cqZAo" to="r3rm:17I5kyiXMqc" resolve="DEFAULT_BUTTON_SIZE" />
+                          </node>
+                          <node concept="37vLTw" id="4sEIQIBNL$e" role="37wK5m">
+                            <ref role="3cqZAo" to="r3rm:45TnPEv7YRN" resolve="mxCellState" />
+                            <node concept="2c44te" id="4sEIQIBNL$f" role="lGtFl">
+                              <node concept="2pJPEk" id="4sEIQIBNL$g" role="2c44t1">
+                                <node concept="2pJPED" id="4sEIQIBNL$h" role="2pJPEn">
+                                  <ref role="2pJxaS" to="2qld:gTQ80DJ" resolve="ConceptFunctionParameter_mxCellState" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4sEIQIBNLF8" role="3cqZAp">
+                  <node concept="2OqwBi" id="4sEIQIBNLF9" role="3clFbG">
+                    <node concept="37vLTw" id="4sEIQIBNLFa" role="2Oq$k0">
+                      <ref role="3cqZAo" node="74e51Ji6bH0" resolve="buttons" />
+                    </node>
+                    <node concept="TSZUe" id="4sEIQIBNLFb" role="2OqNvi">
+                      <node concept="2ShNRf" id="4sEIQIBNLFc" role="25WWJ7">
+                        <node concept="1pGfFk" id="4sEIQIBNLFd" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="r3rm:4sEIQIBMnTa" resolve="ToggleGridSnappingDiagramButton" />
+                          <node concept="10M0yZ" id="4sEIQIBNLFg" role="37wK5m">
+                            <ref role="1PxDUh" to="r3rm:2KWY$Um6wZH" resolve="ContextButton" />
+                            <ref role="3cqZAo" to="r3rm:17I5kyiXMqc" resolve="DEFAULT_BUTTON_SIZE" />
+                          </node>
+                          <node concept="37vLTw" id="4sEIQIBNLFi" role="37wK5m">
+                            <ref role="3cqZAo" to="r3rm:45TnPEv7YRN" resolve="mxCellState" />
+                            <node concept="2c44te" id="4sEIQIBNLFj" role="lGtFl">
+                              <node concept="2pJPEk" id="4sEIQIBNLFk" role="2c44t1">
+                                <node concept="2pJPED" id="4sEIQIBNLFl" role="2pJPEn">
+                                  <ref role="2pJxaS" to="2qld:gTQ80DJ" resolve="ConceptFunctionParameter_mxCellState" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbF" id="74e51Ji6nNI" role="3cqZAp">
                   <node concept="2OqwBi" id="74e51Ji6nNJ" role="3clFbG">
                     <node concept="37vLTw" id="74e51Ji6nNK" role="2Oq$k0">
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 41c35cf49..75c40173e 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
@@ -1179,6 +1179,63 @@
               <property role="VOm3f" value="true" />
             </node>
           </node>
+          <node concept="3EZMnI" id="4sEIQIBw07g" role="3EZMnx">
+            <node concept="2iRfu4" id="4sEIQIBw07h" role="2iSdaV" />
+            <node concept="3F0ifn" id="4sEIQIBw07i" role="3EZMnx">
+              <property role="3F0ifm" value="show grid" />
+            </node>
+            <node concept="3F1sOY" id="4sEIQIBw07j" role="3EZMnx">
+              <property role="1$x2rV" value="false" />
+              <ref role="1NtTu8" to="2qld:4sEIQIBvZeg" resolve="showGrid" />
+              <node concept="VPXOz" id="4sEIQIBw07k" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+            <node concept="VPM3Z" id="4sEIQIBw07l" role="3F10Kt" />
+            <node concept="VPXOz" id="4sEIQIBw07m" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3EZMnI" id="6nZQGuFIkLk" role="3EZMnx">
+            <node concept="2iRfu4" id="6nZQGuFIkLl" role="2iSdaV" />
+            <node concept="3F0ifn" id="6nZQGuFIkLm" role="3EZMnx">
+              <property role="3F0ifm" value="grid size" />
+            </node>
+            <node concept="3F1sOY" id="6nZQGuFIm7_" role="3EZMnx">
+              <ref role="1NtTu8" to="2qld:6nZQGuFIbxV" resolve="gridSize" />
+            </node>
+            <node concept="VPM3Z" id="6nZQGuFIkLo" role="3F10Kt" />
+            <node concept="VPXOz" id="6nZQGuFIkLp" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3EZMnI" id="2WP$sH$Lcw7" role="3EZMnx">
+            <node concept="2iRfu4" id="2WP$sH$Lcw8" role="2iSdaV" />
+            <node concept="3F0ifn" id="2WP$sH$Lcw9" role="3EZMnx">
+              <property role="3F0ifm" value="grid color" />
+            </node>
+            <node concept="3F1sOY" id="2WP$sH$Lcwa" role="3EZMnx">
+              <ref role="1NtTu8" to="2qld:2WP$sH$Lbu5" resolve="gridColor" />
+            </node>
+            <node concept="VPM3Z" id="2WP$sH$Lcwb" role="3F10Kt" />
+            <node concept="VPXOz" id="2WP$sH$Lcwc" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3EZMnI" id="4sEIQIBw07n" role="3EZMnx">
+            <node concept="2iRfu4" id="4sEIQIBw07o" role="2iSdaV" />
+            <node concept="3F0ifn" id="4sEIQIBw07p" role="3EZMnx">
+              <property role="3F0ifm" value="use grid snapping" />
+            </node>
+            <node concept="3F1sOY" id="4sEIQIBw07q" role="3EZMnx">
+              <ref role="1NtTu8" to="2qld:4sEIQIBvZeh" resolve="useGridSnapping" />
+            </node>
+            <node concept="VPM3Z" id="4sEIQIBw07r" role="3F10Kt" />
+            <node concept="VPXOz" id="4sEIQIBw07s" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3F0ifn" id="4sEIQIBw07f" role="3EZMnx" />
         </node>
         <node concept="2iRfu4" id="5qgNcfDnGw9" role="2iSdaV" />
         <node concept="3F0ifn" id="5qgNcfDnGxf" role="3EZMnx" />
@@ -5822,6 +5879,44 @@
           </node>
         </node>
       </node>
+      <node concept="3gTLQM" id="4sEIQIBNBov" role="3EZMnx">
+        <node concept="3Fmcul" id="4sEIQIBNBow" role="3FoqZy">
+          <node concept="3clFbS" id="4sEIQIBNBox" role="2VODD2">
+            <node concept="3cpWs6" id="4sEIQIBNBoy" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBNBoz" role="3cqZAk">
+                <node concept="pncrf" id="4sEIQIBNBo$" role="2Oq$k0" />
+                <node concept="2qgKlT" id="4sEIQIBNBo_" role="2OqNvi">
+                  <ref role="37wK5l" to="nh7q:4h7S3973QQF" resolve="getBooleanPropertyCheckBox" />
+                  <node concept="1Q80Hx" id="4sEIQIBNBoA" role="37wK5m" />
+                  <node concept="355D3s" id="4sEIQIBNBoB" role="37wK5m">
+                    <ref role="355D3t" to="2qld:5ZBOFE3vobP" resolve="DiagramButtonConfig" />
+                    <ref role="355D3u" to="2qld:4sEIQIBNARD" resolve="hasShowGridButton" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3gTLQM" id="4sEIQIBNB_f" role="3EZMnx">
+        <node concept="3Fmcul" id="4sEIQIBNB_g" role="3FoqZy">
+          <node concept="3clFbS" id="4sEIQIBNB_h" role="2VODD2">
+            <node concept="3cpWs6" id="4sEIQIBNB_i" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBNB_j" role="3cqZAk">
+                <node concept="pncrf" id="4sEIQIBNB_k" role="2Oq$k0" />
+                <node concept="2qgKlT" id="4sEIQIBNB_l" role="2OqNvi">
+                  <ref role="37wK5l" to="nh7q:4h7S3973QQF" resolve="getBooleanPropertyCheckBox" />
+                  <node concept="1Q80Hx" id="4sEIQIBNB_m" role="37wK5m" />
+                  <node concept="355D3s" id="4sEIQIBNB_n" role="37wK5m">
+                    <ref role="355D3t" to="2qld:5ZBOFE3vobP" resolve="DiagramButtonConfig" />
+                    <ref role="355D3u" to="2qld:4sEIQIBNAVE" resolve="hasUseGridSnappingButton" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="3gTLQM" id="2pXhcZQn1Db" role="3EZMnx">
         <node concept="3Fmcul" id="2pXhcZQn1Dc" role="3FoqZy">
           <node concept="3clFbS" id="2pXhcZQn1Dd" role="2VODD2">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
index bb442e11e..2d4f976df 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
@@ -216,6 +216,30 @@
       <property role="20kJfa" value="allowElementsBelowRequiredSize" />
       <ref role="20lvS9" to="tpc2:gCpkWun" resolve="QueryFunction_NodeCondition" />
     </node>
+    <node concept="1TJgyj" id="4sEIQIBvZeg" role="1TKVEi">
+      <property role="IQ2ns" value="5128117196760806288" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="showGrid" />
+      <ref role="20lvS9" to="tpc2:gCpkWun" resolve="QueryFunction_NodeCondition" />
+    </node>
+    <node concept="1TJgyj" id="6nZQGuFIbxV" role="1TKVEi">
+      <property role="IQ2ns" value="7349833668006295675" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="gridSize" />
+      <ref role="20lvS9" to="tpc2:hLcFafI" resolve="QueryFunction_Integer" />
+    </node>
+    <node concept="1TJgyj" id="2WP$sH$Lbu5" role="1TKVEi">
+      <property role="IQ2ns" value="3401785396303280005" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="gridColor" />
+      <ref role="20lvS9" to="tpc2:h7ZlJ1A" resolve="QueryFunction_Color" />
+    </node>
+    <node concept="1TJgyj" id="4sEIQIBvZeh" role="1TKVEi">
+      <property role="IQ2ns" value="5128117196760806289" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="useGridSnapping" />
+      <ref role="20lvS9" to="tpc2:gCpkWun" resolve="QueryFunction_NodeCondition" />
+    </node>
     <node concept="1TJgyj" id="5qgNcfDnbtd" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="contentQuery" />
@@ -2194,6 +2218,16 @@
       <property role="TrG5h" value="hasTranslateToOriginButton" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
+    <node concept="1TJgyi" id="4sEIQIBNARD" role="1TKVEl">
+      <property role="IQ2nx" value="5128117196765949417" />
+      <property role="TrG5h" value="hasShowGridButton" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
+    <node concept="1TJgyi" id="4sEIQIBNAVE" role="1TKVEl">
+      <property role="IQ2nx" value="5128117196765949674" />
+      <property role="TrG5h" value="hasUseGridSnappingButton" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyi" id="2ZU2kH0jB7A" role="1TKVEl">
       <property role="IQ2nx" value="3457085882766356966" />
       <property role="TrG5h" value="hasPNGExportButton" />
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps
index 2c37b2791..bc522299d 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps
@@ -488,11 +488,11 @@
                 </node>
               </node>
             </node>
-            <node concept="2VclrF" id="1MpJ6yR4V35" role="2Vcluh">
+            <node concept="2VclrF" id="2WP$sH_4coA" role="2Vcluh">
               <property role="2Vclpx" value="1096.00048828125" />
               <property role="2Vclpz" value="481.00005" />
             </node>
-            <node concept="2VclrF" id="1MpJ6yR4V36" role="2Vcluh">
+            <node concept="2VclrF" id="2WP$sH_4coB" role="2Vcluh">
               <property role="2Vclpx" value="1096.00048828125" />
               <property role="2Vclpz" value="332.00005" />
             </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index fa7c88b07..d4cd6d7e6 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -135,7 +135,7 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
-    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" implicit="true" />
+    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -23957,11 +23957,39 @@
             <node concept="3clFbT" id="oV$vBQ82qt" role="37wK5m" />
           </node>
         </node>
-        <node concept="3clFbF" id="2IqJp3xS7oT" role="3cqZAp">
-          <node concept="1rXfSq" id="2IqJp3xS7oS" role="3clFbG">
-            <ref role="37wK5l" to="1njx:~mxGraph.setGridEnabled(boolean)" resolve="setGridEnabled" />
-            <node concept="3clFbT" id="2IqJp3xS7AC" role="37wK5m">
-              <property role="3clFbU" value="false" />
+        <node concept="3clFbF" id="4sEIQIB_SEg" role="3cqZAp">
+          <node concept="1rXfSq" id="4sEIQIB_SEe" role="3clFbG">
+            <ref role="37wK5l" node="4sEIQIBvdGL" resolve="toggleGridSnapping" />
+            <node concept="2OqwBi" id="1HGmlJVABDX" role="37wK5m">
+              <node concept="2OqwBi" id="1HGmlJVAADZ" role="2Oq$k0">
+                <node concept="37vLTw" id="1HGmlJVAA8C" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5P3ZJ9cZkC1" resolve="model" />
+                </node>
+                <node concept="liA8E" id="1HGmlJVABgq" role="2OqNvi">
+                  <ref role="37wK5l" to="nkm5:lNQZNowrwP" resolve="getDiagramAccessor" />
+                </node>
+              </node>
+              <node concept="liA8E" id="1HGmlJVAQLa" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:1HGmlJVAqBb" resolve="useGridSnapping" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6nZQGuFGie1" role="3cqZAp">
+          <node concept="1rXfSq" id="6nZQGuFGidZ" role="3clFbG">
+            <ref role="37wK5l" to="1njx:~mxGraph.setGridSize(int)" resolve="setGridSize" />
+            <node concept="2OqwBi" id="6nZQGuFGqNp" role="37wK5m">
+              <node concept="2OqwBi" id="6nZQGuFGp0$" role="2Oq$k0">
+                <node concept="37vLTw" id="6nZQGuFGoCb" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5P3ZJ9cZkC1" resolve="model" />
+                </node>
+                <node concept="liA8E" id="6nZQGuFGpXG" role="2OqNvi">
+                  <ref role="37wK5l" to="nkm5:lNQZNowrwP" resolve="getDiagramAccessor" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6nZQGuFGr_G" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:6nZQGuFEBnv" resolve="getGridSize" />
+              </node>
             </node>
           </node>
         </node>
@@ -24472,6 +24500,26 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4sEIQIBv7od" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBvdGL" role="jymVt">
+      <property role="TrG5h" value="toggleGridSnapping" />
+      <node concept="3clFbS" id="4sEIQIBvdGO" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBvszy" role="3cqZAp">
+          <node concept="1rXfSq" id="4sEIQIBvsz$" role="3clFbG">
+            <ref role="37wK5l" to="1njx:~mxGraph.setGridEnabled(boolean)" resolve="setGridEnabled" />
+            <node concept="37vLTw" id="4sEIQIBvzgL" role="37wK5m">
+              <ref role="3cqZAo" node="4sEIQIBve3l" resolve="flag" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4sEIQIBvaBD" role="1B3o_S" />
+      <node concept="3cqZAl" id="4sEIQIBvd0J" role="3clF45" />
+      <node concept="37vLTG" id="4sEIQIBve3l" role="3clF46">
+        <property role="TrG5h" value="flag" />
+        <node concept="10P_77" id="4sEIQIBve3k" role="1tU5fm" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="lG49Fj$FsE" role="jymVt" />
     <node concept="3clFb_" id="519t3kwBp5z" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -27987,6 +28035,27 @@
             <ref role="3cqZAo" node="190K99KyNKm" resolve="graph" />
           </node>
         </node>
+        <node concept="3cpWs8" id="2WP$sH$MRkT" role="3cqZAp">
+          <node concept="3cpWsn" id="2WP$sH$MRkU" role="3cpWs9">
+            <property role="TrG5h" value="diagramAccessor" />
+            <node concept="3uibUv" id="2WP$sH$KJjq" role="1tU5fm">
+              <ref role="3uigEE" to="nkm5:4teJTSBwQIn" resolve="IDiagramAccessor" />
+            </node>
+            <node concept="2OqwBi" id="2WP$sH$MRkV" role="33vP2m">
+              <node concept="liA8E" id="2WP$sH$MRkW" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:lNQZNowrwP" resolve="getDiagramAccessor" />
+              </node>
+              <node concept="2OqwBi" id="2WP$sH$MRkX" role="2Oq$k0">
+                <node concept="37vLTw" id="2WP$sH$MRkY" role="2Oq$k0">
+                  <ref role="3cqZAo" node="190K99KyNKm" resolve="graph" />
+                </node>
+                <node concept="liA8E" id="2WP$sH$MRkZ" role="2OqNvi">
+                  <ref role="37wK5l" node="zdi$i4F31o" resolve="getRootDiagramModel" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="190K99KySAr" role="3cqZAp">
           <node concept="2OqwBi" id="190K99KySCa" role="3clFbG">
             <node concept="37vLTw" id="190K99KySAq" role="2Oq$k0">
@@ -28047,14 +28116,43 @@
             </node>
           </node>
         </node>
-        <node concept="1X3_iC" id="5GwePVE4wyF" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="3clFbF" id="6zxgcXl_UEw" role="8Wnug">
-            <node concept="1rXfSq" id="6zxgcXl_UEv" role="3clFbG">
-              <ref role="37wK5l" to="p8va:~mxGraphComponent.setGridVisible(boolean)" resolve="setGridVisible" />
-              <node concept="3clFbT" id="6zxgcXl_UQb" role="37wK5m">
-                <property role="3clFbU" value="true" />
+        <node concept="3clFbF" id="4sEIQIB_D2f" role="3cqZAp">
+          <node concept="1rXfSq" id="4sEIQIB_D2d" role="3clFbG">
+            <ref role="37wK5l" to="p8va:~mxGraphComponent.setGridVisible(boolean)" resolve="setGridVisible" />
+            <node concept="2OqwBi" id="1HGmlJVB5YP" role="37wK5m">
+              <node concept="liA8E" id="1HGmlJVB5YT" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:1HGmlJVAr8P" resolve="showGrid" />
+              </node>
+              <node concept="37vLTw" id="2WP$sH$MRl0" role="2Oq$k0">
+                <ref role="3cqZAo" node="2WP$sH$MRkU" resolve="diagramAccessor" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2WP$sH$N5wb" role="3cqZAp">
+          <node concept="3clFbS" id="2WP$sH$N5wd" role="3clFbx">
+            <node concept="3clFbF" id="2WP$sH$NkNL" role="3cqZAp">
+              <node concept="1rXfSq" id="2WP$sH$NkNJ" role="3clFbG">
+                <ref role="37wK5l" to="p8va:~mxGraphComponent.setGridColor(java.awt.Color)" resolve="setGridColor" />
+                <node concept="2OqwBi" id="2WP$sH$NnA8" role="37wK5m">
+                  <node concept="37vLTw" id="2WP$sH$NnA9" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2WP$sH$MRkU" resolve="diagramAccessor" />
+                  </node>
+                  <node concept="liA8E" id="2WP$sH$NnAa" role="2OqNvi">
+                    <ref role="37wK5l" to="nkm5:2WP$sH$Jy7Y" resolve="getGridColor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2WP$sH$Nd$S" role="3clFbw">
+            <node concept="10Nm6u" id="2WP$sH$Nh9j" role="3uHU7w" />
+            <node concept="2OqwBi" id="2WP$sH$N9Fq" role="3uHU7B">
+              <node concept="37vLTw" id="2WP$sH$N8vN" role="2Oq$k0">
+                <ref role="3cqZAo" node="2WP$sH$MRkU" resolve="diagramAccessor" />
+              </node>
+              <node concept="liA8E" id="2WP$sH$Nc3d" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:2WP$sH$Jy7Y" resolve="getGridColor" />
               </node>
             </node>
           </node>
@@ -30785,7 +30883,7 @@
                 <node concept="3clFbS" id="74e51JiCl9N" role="1bW5cS">
                   <node concept="3clFbF" id="74e51JiC$_j" role="3cqZAp">
                     <node concept="1rXfSq" id="74e51JiC$_i" role="3clFbG">
-                      <ref role="37wK5l" node="74e51JlviKx" resolve="updateButtonVisibility" />
+                      <ref role="37wK5l" node="74e51JlviKx" resolve="setButtonVisibilityFromStyle" />
                       <node concept="37vLTw" id="74e51JiCIDR" role="37wK5m">
                         <ref role="3cqZAo" node="74e51JiAe1W" resolve="style" />
                       </node>
@@ -67781,15 +67879,13 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="90HpR_0JDu" role="3cqZAp" />
-        <node concept="3clFbF" id="90HpR_0Lim" role="3cqZAp">
-          <node concept="37vLTI" id="90HpR_0MxH" role="3clFbG">
-            <node concept="3clFbT" id="90HpR_0Ngg" role="37vLTx">
-              <property role="3clFbU" value="false" />
-            </node>
-            <node concept="37vLTw" id="90HpR_0Lik" role="37vLTJ">
-              <ref role="3cqZAo" node="5ZBOFE3_mn8" resolve="hasLayoutDiagramButton" />
+        <node concept="3clFbF" id="4sEIQIBVp1O" role="3cqZAp">
+          <node concept="1rXfSq" id="4sEIQIBVp1M" role="3clFbG">
+            <ref role="37wK5l" node="4sEIQIBVZAk" resolve="setButtonVisibility" />
+            <node concept="1Z6Ecs" id="4sEIQIBWqFU" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:5ZBOFE3$JmS" resolve="__layout-diagram-button" />
             </node>
+            <node concept="3clFbT" id="4sEIQIBWwBK" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -88675,26 +88771,18 @@
         <property role="3clFbU" value="true" />
       </node>
     </node>
-    <node concept="312cEg" id="5ZBOFE3_mn8" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="hasLayoutDiagramButton" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tmbuc" id="5ZBOFE3_fsm" role="1B3o_S" />
-      <node concept="10P_77" id="5ZBOFE3_mh3" role="1tU5fm" />
-      <node concept="37vLTw" id="6HawCQIB5oB" role="33vP2m">
-        <ref role="3cqZAo" node="6HawCQIB0FS" resolve="DEFAULT_BOOL_VALUE" />
+    <node concept="312cEg" id="4sEIQIBJ96M" role="jymVt">
+      <property role="TrG5h" value="buttonVisibility" />
+      <node concept="3Tmbuc" id="4sEIQIBJ96N" role="1B3o_S" />
+      <node concept="3rvAFt" id="4sEIQIBJ96O" role="1tU5fm">
+        <node concept="10Oyi0" id="4sEIQIBJ96P" role="3rvQeY" />
+        <node concept="10P_77" id="4sEIQIBJ96Q" role="3rvSg0" />
       </node>
-    </node>
-    <node concept="312cEg" id="6OfpnAffHXN" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="hasSyncWithModelButton" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tmbuc" id="6OfpnAffHXO" role="1B3o_S" />
-      <node concept="10P_77" id="6OfpnAffHXP" role="1tU5fm" />
-      <node concept="37vLTw" id="6OfpnAffHXQ" role="33vP2m">
-        <ref role="3cqZAo" node="6HawCQIB0FS" resolve="DEFAULT_BOOL_VALUE" />
+      <node concept="2ShNRf" id="4sEIQIBJ96R" role="33vP2m">
+        <node concept="3rGOSV" id="4sEIQIBJ96S" role="2ShVmc">
+          <node concept="10Oyi0" id="4sEIQIBJ96T" role="3rHrn6" />
+          <node concept="10P_77" id="4sEIQIBJ96U" role="3rHtpV" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5ZBOFE3_8K1" role="jymVt" />
@@ -88712,7 +88800,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1yAlWL_OOGq" role="jymVt" />
+    <node concept="2tJIrI" id="4sEIQIBIR2E" role="jymVt" />
     <node concept="3clFbW" id="1yAlWL_AmBN" role="jymVt">
       <node concept="3cqZAl" id="1yAlWL_AmBO" role="3clF45" />
       <node concept="3Tm1VV" id="1yAlWL_AmBP" role="1B3o_S" />
@@ -88802,6 +88890,25 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4sEIQIBILee" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBIMwd" role="jymVt">
+      <property role="TrG5h" value="getButtonVisibilityMap" />
+      <node concept="3Tm1VV" id="4sEIQIBIMwf" role="1B3o_S" />
+      <node concept="3rvAFt" id="4sEIQIBIMwg" role="3clF45">
+        <node concept="10Oyi0" id="4sEIQIBIMwh" role="3rvQeY" />
+        <node concept="10P_77" id="4sEIQIBIMwi" role="3rvSg0" />
+      </node>
+      <node concept="3clFbS" id="4sEIQIBIMwl" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBJfKp" role="3cqZAp">
+          <node concept="37vLTw" id="4sEIQIBJfKo" role="3clFbG">
+            <ref role="3cqZAo" node="4sEIQIBJ96M" resolve="buttonVisibility" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBIMwm" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="1yAlWL_OO$6" role="jymVt" />
     <node concept="3clFb_" id="1JWQbhaZPxN" role="jymVt">
       <property role="TrG5h" value="getContextButtonContainer" />
@@ -88822,6 +88929,39 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4sEIQIBKCTb" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBKDPI" role="jymVt">
+      <property role="TrG5h" value="getStyleButtonAttributes" />
+      <node concept="3clFbS" id="4sEIQIBKDPJ" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBKDPK" role="3cqZAp">
+          <node concept="2OqwBi" id="4sEIQIBKDPL" role="3clFbG">
+            <node concept="2OqwBi" id="4sEIQIBKDPM" role="2Oq$k0">
+              <node concept="2ShNRf" id="4sEIQIBKDPN" role="2Oq$k0">
+                <node concept="3g6Rrh" id="4sEIQIBKDPO" role="2ShVmc">
+                  <node concept="1Z6Ecs" id="4sEIQIBKDPP" role="3g7hyw">
+                    <ref role="1Z6EpT" to="swi3:5ZBOFE3$JmS" resolve="__layout-diagram-button" />
+                  </node>
+                  <node concept="1Z6Ecs" id="4sEIQIBKDPQ" role="3g7hyw">
+                    <ref role="1Z6EpT" to="swi3:6OfpnAf7iDG" resolve="__sync-with-model-button" />
+                  </node>
+                  <node concept="3uibUv" id="4sEIQIBKDPZ" role="3g7fb8">
+                    <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
+                  </node>
+                </node>
+              </node>
+              <node concept="39bAoz" id="4sEIQIBKDQ0" role="2OqNvi" />
+            </node>
+            <node concept="ANE8D" id="4sEIQIBKDQ1" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4sEIQIBKDQ2" role="1B3o_S" />
+      <node concept="_YKpA" id="4sEIQIBKDQ3" role="3clF45">
+        <node concept="3uibUv" id="4sEIQIBKDQ4" role="_ZDj9">
+          <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6HawCQIfijg" role="jymVt" />
     <node concept="3clFb_" id="6HawCQIfmqJ" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -88830,39 +88970,31 @@
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <node concept="3clFbS" id="6HawCQIfmqK" role="3clF47">
-        <node concept="3clFbF" id="6HawCQIfmqL" role="3cqZAp">
-          <node concept="37vLTI" id="6HawCQIgq1q" role="3clFbG">
-            <node concept="37vLTw" id="6HawCQIgp11" role="37vLTJ">
-              <ref role="3cqZAo" node="5ZBOFE3_mn8" resolve="hasLayoutDiagramButton" />
-            </node>
-            <node concept="2OqwBi" id="6HawCQIfmqM" role="37vLTx">
-              <node concept="37vLTw" id="6HawCQIfmqN" role="2Oq$k0">
-                <ref role="3cqZAo" node="6HawCQIfmqS" resolve="style" />
-              </node>
-              <node concept="liA8E" id="6HawCQIfmqO" role="2OqNvi">
-                <ref role="37wK5l" to="hox0:~Style.get(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="get" />
-                <node concept="1Z6Ecs" id="6HawCQIfmqP" role="37wK5m">
-                  <ref role="1Z6EpT" to="swi3:5ZBOFE3$JmS" resolve="__layout-diagram-button" />
+        <node concept="3clFbF" id="4sEIQIBKz9S" role="3cqZAp">
+          <node concept="2OqwBi" id="4sEIQIBKz9T" role="3clFbG">
+            <node concept="2es0OD" id="4sEIQIBKz9V" role="2OqNvi">
+              <node concept="1bVj0M" id="4sEIQIBKz9W" role="23t8la">
+                <node concept="3clFbS" id="4sEIQIBKz9X" role="1bW5cS">
+                  <node concept="3clFbF" id="4sEIQIBKz9Y" role="3cqZAp">
+                    <node concept="1rXfSq" id="4sEIQIBKz9Z" role="3clFbG">
+                      <ref role="37wK5l" node="74e51JlviKx" resolve="setButtonVisibilityFromStyle" />
+                      <node concept="37vLTw" id="4sEIQIBKza0" role="37wK5m">
+                        <ref role="3cqZAo" node="6HawCQIfmqS" resolve="style" />
+                      </node>
+                      <node concept="37vLTw" id="4sEIQIBKza1" role="37wK5m">
+                        <ref role="3cqZAo" node="4sEIQIBKza2" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6OfpnAffTv2" role="3cqZAp">
-          <node concept="37vLTI" id="6OfpnAffVy0" role="3clFbG">
-            <node concept="2OqwBi" id="6OfpnAffWmZ" role="37vLTx">
-              <node concept="37vLTw" id="6OfpnAffWn0" role="2Oq$k0">
-                <ref role="3cqZAo" node="6HawCQIfmqS" resolve="style" />
-              </node>
-              <node concept="liA8E" id="6OfpnAffWn1" role="2OqNvi">
-                <ref role="37wK5l" to="hox0:~Style.get(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="get" />
-                <node concept="1Z6Ecs" id="6OfpnAffWn2" role="37wK5m">
-                  <ref role="1Z6EpT" to="swi3:6OfpnAf7iDG" resolve="__sync-with-model-button" />
+                <node concept="Rh6nW" id="4sEIQIBKza2" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4sEIQIBKza3" role="1tU5fm" />
                 </node>
               </node>
             </node>
-            <node concept="37vLTw" id="6OfpnAffTv0" role="37vLTJ">
-              <ref role="3cqZAo" node="6OfpnAffHXN" resolve="hasSyncWithModelButton" />
+            <node concept="1rXfSq" id="4sEIQIBKPby" role="2Oq$k0">
+              <ref role="37wK5l" node="4sEIQIBKDPI" resolve="getStyleButtonAttributes" />
             </node>
           </node>
         </node>
@@ -88884,23 +89016,28 @@
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <node concept="3clFbS" id="6HawCQIALYg" role="3clF47">
-        <node concept="3clFbF" id="6HawCQIATDa" role="3cqZAp">
-          <node concept="37vLTI" id="6HawCQIATDb" role="3clFbG">
-            <node concept="37vLTw" id="6HawCQIATDc" role="37vLTJ">
-              <ref role="3cqZAo" node="5ZBOFE3_mn8" resolve="hasLayoutDiagramButton" />
-            </node>
-            <node concept="37vLTw" id="6HawCQIB6Ou" role="37vLTx">
-              <ref role="3cqZAo" node="6HawCQIB0FS" resolve="DEFAULT_BOOL_VALUE" />
+        <node concept="3clFbF" id="4sEIQIBL30f" role="3cqZAp">
+          <node concept="2OqwBi" id="4sEIQIBL4qd" role="3clFbG">
+            <node concept="1rXfSq" id="4sEIQIBL30h" role="2Oq$k0">
+              <ref role="37wK5l" node="4sEIQIBKDPI" resolve="getStyleButtonAttributes" />
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6OfpnAffKYh" role="3cqZAp">
-          <node concept="37vLTI" id="6OfpnAffMM1" role="3clFbG">
-            <node concept="37vLTw" id="6OfpnAffRda" role="37vLTx">
-              <ref role="3cqZAo" node="6HawCQIB0FS" resolve="DEFAULT_BOOL_VALUE" />
-            </node>
-            <node concept="37vLTw" id="6OfpnAffKYf" role="37vLTJ">
-              <ref role="3cqZAo" node="6OfpnAffHXN" resolve="hasSyncWithModelButton" />
+            <node concept="2es0OD" id="4sEIQIBL8Fo" role="2OqNvi">
+              <node concept="1bVj0M" id="4sEIQIBL8Fq" role="23t8la">
+                <node concept="3clFbS" id="4sEIQIBL8Fr" role="1bW5cS">
+                  <node concept="3clFbF" id="4sEIQIBLcwy" role="3cqZAp">
+                    <node concept="1rXfSq" id="4sEIQIBLcwx" role="3clFbG">
+                      <ref role="37wK5l" node="74e51JlviKR" resolve="resetButtonVisibility" />
+                      <node concept="37vLTw" id="4sEIQIBLfzy" role="37wK5m">
+                        <ref role="3cqZAo" node="4sEIQIBL8Fs" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="4sEIQIBL8Fs" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="4sEIQIBL8Ft" role="1tU5fm" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -89037,8 +89174,11 @@
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="5ZBOFE3_xDZ" role="3clFbw">
-            <ref role="3cqZAo" node="5ZBOFE3_mn8" resolve="hasLayoutDiagramButton" />
+          <node concept="1rXfSq" id="4sEIQIBV$C2" role="3clFbw">
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
+            <node concept="1Z6Ecs" id="4sEIQIBVD4H" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:5ZBOFE3$JmS" resolve="__layout-diagram-button" />
+            </node>
           </node>
         </node>
         <node concept="3clFbJ" id="6OfpnAffY7M" role="3cqZAp">
@@ -89071,9 +89211,6 @@
             </node>
           </node>
           <node concept="1Wc70l" id="6OfpnAfWFCF" role="3clFbw">
-            <node concept="37vLTw" id="6OfpnAfg0uD" role="3uHU7B">
-              <ref role="3cqZAo" node="6OfpnAffHXN" resolve="hasSyncWithModelButton" />
-            </node>
             <node concept="2OqwBi" id="6OfpnAfXVTU" role="3uHU7w">
               <node concept="2OqwBi" id="6OfpnAfXTNa" role="2Oq$k0">
                 <node concept="liA8E" id="6OfpnAfXV1T" role="2OqNvi">
@@ -89092,6 +89229,12 @@
                 <ref role="37wK5l" to="nkm5:6OfpnAf3O9j" resolve="syncWithModelOnlyOnOpening" />
               </node>
             </node>
+            <node concept="1rXfSq" id="4sEIQIBVUF3" role="3uHU7B">
+              <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
+              <node concept="1Z6Ecs" id="4sEIQIBVUF4" role="37wK5m">
+                <ref role="1Z6EpT" to="swi3:6OfpnAf7iDG" resolve="__sync-with-model-button" />
+              </node>
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="1JWQbhb8vUN" role="3cqZAp">
@@ -89574,6 +89717,9 @@
     <node concept="3uibUv" id="1JWQbhb2OwT" role="EKbjA">
       <ref role="3uigEE" node="f4v_NgOwfo" resolve="ISelfPaintingCell" />
     </node>
+    <node concept="3uibUv" id="4sEIQIBIJT1" role="EKbjA">
+      <ref role="3uigEE" node="74e51JlrTaU" resolve="ISupportButtonHiding" />
+    </node>
   </node>
   <node concept="312cEu" id="1yAlWL_ACtx">
     <property role="3GE5qa" value="dcells" />
@@ -89797,153 +89943,24 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="74e51Jieam5" role="jymVt" />
-    <node concept="3clFb_" id="74e51Jiehfq" role="jymVt">
-      <property role="TrG5h" value="updateButtonVisibility" />
-      <node concept="3clFbS" id="74e51Jiehft" role="3clF47">
-        <node concept="3clFbF" id="74e51JieLHb" role="3cqZAp">
-          <node concept="37vLTI" id="74e51JifahA" role="3clFbG">
-            <node concept="3EllGN" id="74e51JieO7g" role="37vLTJ">
-              <node concept="2OqwBi" id="74e51Jif2Nc" role="3ElVtu">
-                <node concept="37vLTw" id="74e51JiePZ0" role="2Oq$k0">
-                  <ref role="3cqZAo" node="74e51JieBEc" resolve="attribute" />
-                </node>
-                <node concept="liA8E" id="74e51Jif4lx" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="74e51JieLHa" role="3ElQJh">
-                <ref role="3cqZAo" node="74e51JidFTC" resolve="buttonVisibility" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="74e51JifumQ" role="37vLTx">
-              <node concept="37vLTw" id="74e51JifsS$" role="2Oq$k0">
-                <ref role="3cqZAo" node="74e51JifnTu" resolve="style" />
-              </node>
-              <node concept="liA8E" id="74e51Jifw8e" role="2OqNvi">
-                <ref role="37wK5l" to="hox0:~Style.get(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="get" />
-                <node concept="37vLTw" id="74e51JifxYF" role="37wK5m">
-                  <ref role="3cqZAo" node="74e51JieBEc" resolve="attribute" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="74e51JieewJ" role="1B3o_S" />
-      <node concept="3cqZAl" id="74e51Jieh4O" role="3clF45" />
-      <node concept="37vLTG" id="74e51JifnTu" role="3clF46">
-        <property role="TrG5h" value="style" />
-        <node concept="3uibUv" id="74e51JifqBp" role="1tU5fm">
-          <ref role="3uigEE" to="hox0:~Style" resolve="Style" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="74e51JieBEc" role="3clF46">
-        <property role="TrG5h" value="attribute" />
-        <node concept="3uibUv" id="74e51JieBEb" role="1tU5fm">
-          <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
-          <node concept="3uibUv" id="74e51JieDys" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="74e51JihN74" role="jymVt" />
-    <node concept="3clFb_" id="74e51JihK0s" role="jymVt">
-      <property role="TrG5h" value="resetButtonVisibility" />
-      <node concept="3clFbS" id="74e51JihK0t" role="3clF47">
-        <node concept="3clFbF" id="74e51JihK0u" role="3cqZAp">
-          <node concept="37vLTI" id="74e51JihK0v" role="3clFbG">
-            <node concept="3EllGN" id="74e51JihK0w" role="37vLTJ">
-              <node concept="2OqwBi" id="74e51JihK0x" role="3ElVtu">
-                <node concept="37vLTw" id="74e51JihK0y" role="2Oq$k0">
-                  <ref role="3cqZAo" node="74e51JihK0H" resolve="attribute" />
-                </node>
-                <node concept="liA8E" id="74e51JihK0z" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="74e51JihK0$" role="3ElQJh">
-                <ref role="3cqZAo" node="74e51JidFTC" resolve="buttonVisibility" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="74e51JiiIxg" role="37vLTx">
-              <ref role="3cqZAo" node="6HawCQIB0FS" resolve="DEFAULT_BOOL_VALUE" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="74e51JihK0D" role="1B3o_S" />
-      <node concept="3cqZAl" id="74e51JihK0E" role="3clF45" />
-      <node concept="37vLTG" id="74e51JihK0H" role="3clF46">
-        <property role="TrG5h" value="attribute" />
-        <node concept="3uibUv" id="74e51JihK0I" role="1tU5fm">
-          <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
-          <node concept="3uibUv" id="74e51JihK0J" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-        </node>
+    <node concept="2tJIrI" id="4sEIQIBLDvE" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBLFDl" role="jymVt">
+      <property role="TrG5h" value="getButtonVisibilityMap" />
+      <node concept="3Tm1VV" id="4sEIQIBLFDm" role="1B3o_S" />
+      <node concept="3rvAFt" id="4sEIQIBLFDn" role="3clF45">
+        <node concept="10Oyi0" id="4sEIQIBLFDo" role="3rvQeY" />
+        <node concept="10P_77" id="4sEIQIBLFDp" role="3rvSg0" />
       </node>
-    </node>
-    <node concept="2tJIrI" id="74e51JieiPp" role="jymVt" />
-    <node concept="3clFb_" id="74e51Jiep0f" role="jymVt">
-      <property role="TrG5h" value="getButtonVisibility" />
-      <node concept="37vLTG" id="74e51JifzwA" role="3clF46">
-        <property role="TrG5h" value="attribute" />
-        <node concept="3uibUv" id="74e51JifzwB" role="1tU5fm">
-          <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
-          <node concept="3uibUv" id="74e51JifzwC" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-          </node>
-        </node>
+      <node concept="2AHcQZ" id="4sEIQIBLFDt" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="3clFbS" id="74e51Jiep0i" role="3clF47">
-        <node concept="3cpWs8" id="74e51JiqJ4O" role="3cqZAp">
-          <node concept="3cpWsn" id="74e51JiqJ4P" role="3cpWs9">
-            <property role="TrG5h" value="key" />
-            <node concept="10Oyi0" id="74e51JiqIxu" role="1tU5fm" />
-            <node concept="2OqwBi" id="74e51JiqJ4Q" role="33vP2m">
-              <node concept="37vLTw" id="74e51JiqJ4R" role="2Oq$k0">
-                <ref role="3cqZAo" node="74e51JifzwA" resolve="attribute" />
-              </node>
-              <node concept="liA8E" id="74e51JiqJ4S" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="74e51JiqQxs" role="3cqZAp">
-          <node concept="3clFbS" id="74e51JiqQxu" role="3clFbx">
-            <node concept="3cpWs6" id="74e51Jir70Q" role="3cqZAp">
-              <node concept="3EllGN" id="74e51JifJkZ" role="3cqZAk">
-                <node concept="37vLTw" id="74e51JiqJ4T" role="3ElVtu">
-                  <ref role="3cqZAo" node="74e51JiqJ4P" resolve="key" />
-                </node>
-                <node concept="37vLTw" id="74e51JifCBQ" role="3ElQJh">
-                  <ref role="3cqZAo" node="74e51JidFTC" resolve="buttonVisibility" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="74e51JiqX$D" role="3clFbw">
-            <node concept="37vLTw" id="74e51JiqVDs" role="2Oq$k0">
-              <ref role="3cqZAo" node="74e51JidFTC" resolve="buttonVisibility" />
-            </node>
-            <node concept="2Nt0df" id="74e51Jir0q1" role="2OqNvi">
-              <node concept="37vLTw" id="74e51Jir2f4" role="38cxEo">
-                <ref role="3cqZAo" node="74e51JiqJ4P" resolve="key" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="74e51Jirez6" role="3cqZAp">
-          <node concept="3clFbT" id="74e51JirgHF" role="3cqZAk">
-            <property role="3clFbU" value="true" />
+      <node concept="3clFbS" id="4sEIQIBLFDu" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBLSrc" role="3cqZAp">
+          <node concept="37vLTw" id="4sEIQIBLSrb" role="3clFbG">
+            <ref role="3cqZAo" node="74e51JidFTC" resolve="buttonVisibility" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="74e51JielP9" role="1B3o_S" />
-      <node concept="10P_77" id="74e51Jienz6" role="3clF45" />
     </node>
     <node concept="2tJIrI" id="74e51JihQ4h" role="jymVt" />
     <node concept="3clFb_" id="74e51JihXrS" role="jymVt">
@@ -89981,6 +89998,12 @@
                   <node concept="1Z6Ecs" id="2ZU2kH0jLgq" role="3g7hyw">
                     <ref role="1Z6EpT" to="swi3:2ZU2kH0jD_C" resolve="__translate-to-origin-button" />
                   </node>
+                  <node concept="1Z6Ecs" id="4sEIQIBKXEC" role="3g7hyw">
+                    <ref role="1Z6EpT" to="swi3:4sEIQIBKTSa" resolve="__show-grid-button" />
+                  </node>
+                  <node concept="1Z6Ecs" id="4sEIQIBMjBr" role="3g7hyw">
+                    <ref role="1Z6EpT" to="swi3:4sEIQIBKU2v" resolve="__use_grid-snapping-button" />
+                  </node>
                   <node concept="1Z6Ecs" id="5CBfeKl9iEk" role="3g7hyw">
                     <ref role="1Z6EpT" to="swi3:5CBfeKl9in$" resolve="__export-png-button" />
                   </node>
@@ -90042,7 +90065,7 @@
                 <node concept="3clFbS" id="74e51JiizxF" role="1bW5cS">
                   <node concept="3clFbF" id="74e51JiiBD9" role="3cqZAp">
                     <node concept="1rXfSq" id="74e51JiiBD8" role="3clFbG">
-                      <ref role="37wK5l" node="74e51Jiehfq" resolve="updateButtonVisibility" />
+                      <ref role="37wK5l" node="74e51JlviKx" resolve="setButtonVisibilityFromStyle" />
                       <node concept="37vLTw" id="74e51JiiSvK" role="37wK5m">
                         <ref role="3cqZAo" node="6HawCQIg08k" resolve="style" />
                       </node>
@@ -90144,7 +90167,7 @@
                 <node concept="3clFbS" id="74e51JiiV9I" role="1bW5cS">
                   <node concept="3clFbF" id="74e51JiiV9J" role="3cqZAp">
                     <node concept="1rXfSq" id="74e51JiiV9K" role="3clFbG">
-                      <ref role="37wK5l" node="74e51JihK0s" resolve="resetButtonVisibility" />
+                      <ref role="37wK5l" node="74e51JlviKR" resolve="resetButtonVisibility" />
                       <node concept="37vLTw" id="74e51JiiV9M" role="37wK5m">
                         <ref role="3cqZAo" node="74e51JiiV9N" resolve="it" />
                       </node>
@@ -90360,7 +90383,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51JijP4G" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51JijP4H" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5ZBOFE3$JmY" resolve="__maximize-diagram-button" />
             </node>
@@ -90391,7 +90414,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51JijRrK" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51JijRrL" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5ZBOFE3$Jn1" resolve="__reset-view-button" />
             </node>
@@ -90422,7 +90445,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51JijTPJ" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51JijTPK" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5ZBOFE3$Jn4" resolve="__zoom-in-button" />
             </node>
@@ -90473,7 +90496,7 @@
               </node>
             </node>
             <node concept="1rXfSq" id="74e51JijWmj" role="3uHU7B">
-              <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+              <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
               <node concept="1Z6Ecs" id="74e51JijWmk" role="37wK5m">
                 <ref role="1Z6EpT" to="swi3:5ZBOFE3$K73" resolve="__zoom-out-button" />
               </node>
@@ -90505,7 +90528,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51JijYXs" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51JijYXt" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5ZBOFE3$K8k" resolve="__fit-size-all-diagram-button" />
             </node>
@@ -90536,7 +90559,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51Jik1un" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51Jik1uo" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:2pXhcZQmJkE" resolve="__show_ports_labels-button" />
             </node>
@@ -90569,7 +90592,7 @@
           </node>
           <node concept="1Wc70l" id="5SSrxUjmzZd" role="3clFbw">
             <node concept="1rXfSq" id="xNPLfiKau" role="3uHU7B">
-              <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+              <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
               <node concept="1Z6Ecs" id="xNPLfiKav" role="37wK5m">
                 <ref role="1Z6EpT" to="swi3:xNPLfi3c0" resolve="__root-show-all-edges-button" />
               </node>
@@ -90642,13 +90665,106 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51Jik4pt" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51Jik4pu" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:2ZU2kH0jD_C" resolve="__translate-to-origin-button" />
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="4sEIQIBLZZF" role="3cqZAp" />
+        <node concept="3clFbJ" id="4sEIQIBM28p" role="3cqZAp">
+          <node concept="3clFbS" id="4sEIQIBM28q" role="3clFbx">
+            <node concept="3clFbF" id="4sEIQIBM28r" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBM28s" role="3clFbG">
+                <node concept="37vLTw" id="4sEIQIBM28t" role="2Oq$k0">
+                  <ref role="3cqZAo" node="45TnPEv7ZbO" resolve="buttons" />
+                </node>
+                <node concept="TSZUe" id="4sEIQIBM28u" role="2OqNvi">
+                  <node concept="2ShNRf" id="4sEIQIBM28v" role="25WWJ7">
+                    <node concept="1pGfFk" id="4sEIQIBM28w" role="2ShVmc">
+                      <ref role="37wK5l" node="3orzwPrV2wp" resolve="TranslateToOriginButton" />
+                      <node concept="37vLTw" id="4sEIQIBM28x" role="37wK5m">
+                        <ref role="3cqZAo" node="2EnXnMG1F9A" resolve="size" />
+                      </node>
+                      <node concept="37vLTw" id="4sEIQIBM28y" role="37wK5m">
+                        <ref role="3cqZAo" node="45TnPEv7YRN" resolve="mxCellState" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="4sEIQIBM28z" role="3clFbw">
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
+            <node concept="1Z6Ecs" id="4sEIQIBM28$" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:2ZU2kH0jD_C" resolve="__translate-to-origin-button" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4sEIQIBLZZG" role="3cqZAp" />
+        <node concept="3clFbJ" id="4sEIQIBMDP9" role="3cqZAp">
+          <node concept="3clFbS" id="4sEIQIBMDPa" role="3clFbx">
+            <node concept="3clFbF" id="4sEIQIBMDPb" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBMDPc" role="3clFbG">
+                <node concept="37vLTw" id="4sEIQIBMDPd" role="2Oq$k0">
+                  <ref role="3cqZAo" node="45TnPEv7ZbO" resolve="buttons" />
+                </node>
+                <node concept="TSZUe" id="4sEIQIBMDPe" role="2OqNvi">
+                  <node concept="2ShNRf" id="4sEIQIBMDPf" role="25WWJ7">
+                    <node concept="1pGfFk" id="4sEIQIBMDPg" role="2ShVmc">
+                      <ref role="37wK5l" node="4sEIQIBu97K" resolve="ToggleGridDiagramButton" />
+                      <node concept="37vLTw" id="4sEIQIBMDPh" role="37wK5m">
+                        <ref role="3cqZAo" node="2EnXnMG1F9A" resolve="size" />
+                      </node>
+                      <node concept="37vLTw" id="4sEIQIBMDPi" role="37wK5m">
+                        <ref role="3cqZAo" node="45TnPEv7YRN" resolve="mxCellState" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="4sEIQIBMDPj" role="3clFbw">
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
+            <node concept="1Z6Ecs" id="4sEIQIBMDPk" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:4sEIQIBKTSa" resolve="__show-grid-button" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="5CBfeKl9C_B" role="3cqZAp" />
+        <node concept="3clFbJ" id="4sEIQIBMGis" role="3cqZAp">
+          <node concept="3clFbS" id="4sEIQIBMGit" role="3clFbx">
+            <node concept="3clFbF" id="4sEIQIBMGiu" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBMGiv" role="3clFbG">
+                <node concept="37vLTw" id="4sEIQIBMGiw" role="2Oq$k0">
+                  <ref role="3cqZAo" node="45TnPEv7ZbO" resolve="buttons" />
+                </node>
+                <node concept="TSZUe" id="4sEIQIBMGix" role="2OqNvi">
+                  <node concept="2ShNRf" id="4sEIQIBMGiy" role="25WWJ7">
+                    <node concept="1pGfFk" id="4sEIQIBMGiz" role="2ShVmc">
+                      <ref role="37wK5l" node="4sEIQIBMnTa" resolve="ToggleGridSnappingDiagramButton" />
+                      <node concept="37vLTw" id="4sEIQIBMGi$" role="37wK5m">
+                        <ref role="3cqZAo" node="2EnXnMG1F9A" resolve="size" />
+                      </node>
+                      <node concept="37vLTw" id="4sEIQIBMGi_" role="37wK5m">
+                        <ref role="3cqZAo" node="45TnPEv7YRN" resolve="mxCellState" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="4sEIQIBMGiA" role="3clFbw">
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
+            <node concept="1Z6Ecs" id="4sEIQIBMGiB" role="37wK5m">
+              <ref role="1Z6EpT" to="swi3:4sEIQIBKU2v" resolve="__use_grid-snapping-button" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4sEIQIBMBgd" role="3cqZAp" />
         <node concept="3clFbJ" id="5CBfeKl9GfE" role="3cqZAp">
           <node concept="3clFbS" id="5CBfeKl9GfG" role="3clFbx">
             <node concept="3clFbF" id="5CBfeKksi5r" role="3cqZAp">
@@ -90682,7 +90798,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51Jik70e" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51Jik70f" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5CBfeKl9in$" resolve="__export-png-button" />
             </node>
@@ -90722,7 +90838,7 @@
             </node>
           </node>
           <node concept="1rXfSq" id="74e51Jik9y$" role="3clFbw">
-            <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+            <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
             <node concept="1Z6Ecs" id="74e51Jik9y_" role="37wK5m">
               <ref role="1Z6EpT" to="swi3:5CBfeKl9ikL" resolve="__export-svg-button" />
             </node>
@@ -90758,7 +90874,7 @@
                 </node>
                 <node concept="1Wc70l" id="1Va40GQP4Od" role="3clFbw">
                   <node concept="1rXfSq" id="1Va40GQy$FI" role="3uHU7B">
-                    <ref role="37wK5l" node="74e51Jiep0f" resolve="getButtonVisibility" />
+                    <ref role="37wK5l" node="74e51JlviL8" resolve="getButtonVisibility" />
                     <node concept="1Z6Ecs" id="1Va40GQy$FJ" role="37wK5m">
                       <ref role="1Z6EpT" to="swi3:1Va40GQyuLK" resolve="__clear-layout-information-button" />
                     </node>
@@ -147121,24 +147237,15 @@
     </node>
     <node concept="2tJIrI" id="74e51JlshRj" role="jymVt" />
     <node concept="3clFb_" id="74e51JlviKx" role="jymVt">
-      <property role="TrG5h" value="updateButtonVisibility" />
+      <property role="TrG5h" value="setButtonVisibilityFromStyle" />
       <node concept="3clFbS" id="74e51JlviKy" role="3clF47">
-        <node concept="3clFbF" id="74e51JlviKz" role="3cqZAp">
-          <node concept="37vLTI" id="74e51JlviK$" role="3clFbG">
-            <node concept="3EllGN" id="74e51JlviK_" role="37vLTJ">
-              <node concept="2OqwBi" id="74e51JlviKA" role="3ElVtu">
-                <node concept="37vLTw" id="74e51JlviKB" role="2Oq$k0">
-                  <ref role="3cqZAo" node="74e51JlviKM" resolve="attribute" />
-                </node>
-                <node concept="liA8E" id="74e51JlviKC" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
-                </node>
-              </node>
-              <node concept="1rXfSq" id="74e51JlvjhV" role="3ElQJh">
-                <ref role="37wK5l" node="74e51JlsiWQ" resolve="getButtonVisibilityMap" />
-              </node>
+        <node concept="3clFbF" id="4sEIQIBW8zl" role="3cqZAp">
+          <node concept="1rXfSq" id="4sEIQIBW8zj" role="3clFbG">
+            <ref role="37wK5l" node="4sEIQIBVZAk" resolve="setButtonVisibility" />
+            <node concept="37vLTw" id="4sEIQIBW9st" role="37wK5m">
+              <ref role="3cqZAo" node="74e51JlviKM" resolve="attribute" />
             </node>
-            <node concept="2OqwBi" id="74e51JlviKE" role="37vLTx">
+            <node concept="2OqwBi" id="74e51JlviKE" role="37wK5m">
               <node concept="37vLTw" id="74e51JlviKF" role="2Oq$k0">
                 <ref role="3cqZAo" node="74e51JlviKK" resolve="style" />
               </node>
@@ -147171,7 +147278,49 @@
       </node>
       <node concept="2JFqV2" id="74e51JlviKP" role="2frcjj" />
     </node>
-    <node concept="2tJIrI" id="74e51JlviKQ" role="jymVt" />
+    <node concept="2tJIrI" id="4sEIQIBW31l" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBVZAk" role="jymVt">
+      <property role="TrG5h" value="setButtonVisibility" />
+      <node concept="3clFbS" id="4sEIQIBVZAn" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBW3J1" role="3cqZAp">
+          <node concept="37vLTI" id="4sEIQIBW7yC" role="3clFbG">
+            <node concept="37vLTw" id="4sEIQIBW7UZ" role="37vLTx">
+              <ref role="3cqZAo" node="4sEIQIBW1Lg" resolve="value" />
+            </node>
+            <node concept="3EllGN" id="4sEIQIBW4j3" role="37vLTJ">
+              <node concept="2OqwBi" id="4sEIQIBW5XB" role="3ElVtu">
+                <node concept="37vLTw" id="4sEIQIBW5yU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBW116" resolve="attribute" />
+                </node>
+                <node concept="liA8E" id="4sEIQIBW6pz" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
+                </node>
+              </node>
+              <node concept="1rXfSq" id="4sEIQIBW3J0" role="3ElQJh">
+                <ref role="37wK5l" node="74e51JlsiWQ" resolve="getButtonVisibilityMap" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4sEIQIBVZAo" role="1B3o_S" />
+      <node concept="3cqZAl" id="4sEIQIBVZzk" role="3clF45" />
+      <node concept="37vLTG" id="4sEIQIBW116" role="3clF46">
+        <property role="TrG5h" value="attribute" />
+        <node concept="3uibUv" id="4sEIQIBW1I0" role="1tU5fm">
+          <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
+          <node concept="3uibUv" id="4sEIQIBW1I1" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4sEIQIBW1Lg" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="10P_77" id="4sEIQIBW2xw" role="1tU5fm" />
+      </node>
+      <node concept="2JFqV2" id="4sEIQIBW3bV" role="2frcjj" />
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBW3bU" role="jymVt" />
     <node concept="3clFb_" id="74e51JlviKR" role="jymVt">
       <property role="TrG5h" value="resetButtonVisibility" />
       <node concept="3clFbS" id="74e51JlviKS" role="3clF47">
@@ -148912,5 +149061,791 @@
       <ref role="3uigEE" node="2KWY$Um6wZH" resolve="ContextButton" />
     </node>
   </node>
+  <node concept="312cEu" id="4sEIQIBu97H">
+    <property role="3GE5qa" value="contextButtons.general" />
+    <property role="TrG5h" value="ToggleGridDiagramButton" />
+    <node concept="3Tm1VV" id="4sEIQIBu97I" role="1B3o_S" />
+    <node concept="3uibUv" id="4sEIQIBu97J" role="1zkMxy">
+      <ref role="3uigEE" node="2KWY$Um6wZH" resolve="ContextButton" />
+    </node>
+    <node concept="3clFbW" id="4sEIQIBu97K" role="jymVt">
+      <node concept="3cqZAl" id="4sEIQIBu97L" role="3clF45" />
+      <node concept="3Tm1VV" id="4sEIQIBu97M" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBu97N" role="3clF47">
+        <node concept="XkiVB" id="4sEIQIBu97O" role="3cqZAp">
+          <ref role="37wK5l" node="2KWY$Um6y6e" resolve="ContextButton" />
+          <node concept="37vLTw" id="4sEIQIBu97P" role="37wK5m">
+            <ref role="3cqZAo" node="4sEIQIBu97R" resolve="size" />
+          </node>
+          <node concept="37vLTw" id="4sEIQIBu97Q" role="37wK5m">
+            <ref role="3cqZAo" node="4sEIQIBu97T" resolve="state" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4sEIQIBu97R" role="3clF46">
+        <property role="TrG5h" value="size" />
+        <node concept="10P55v" id="4sEIQIBu97S" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="4sEIQIBu97T" role="3clF46">
+        <property role="TrG5h" value="state" />
+        <node concept="3uibUv" id="4sEIQIBu97U" role="1tU5fm">
+          <ref role="3uigEE" to="1njx:~mxCellState" resolve="mxCellState" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBu97V" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBu97W" role="jymVt">
+      <property role="TrG5h" value="paintSymbol" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="4sEIQIBu97X" role="3clF46">
+        <property role="TrG5h" value="g" />
+        <node concept="3uibUv" id="4sEIQIBu97Y" role="1tU5fm">
+          <ref role="3uigEE" to="z60i:~Graphics2D" resolve="Graphics2D" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4sEIQIBu97Z" role="3clF45" />
+      <node concept="3Tmbuc" id="4sEIQIBu980" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBu981" role="3clF47">
+        <node concept="3cpWs8" id="4sEIQIBu982" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBu983" role="3cpWs9">
+            <property role="TrG5h" value="bounds" />
+            <node concept="3uibUv" id="4sEIQIBu984" role="1tU5fm">
+              <ref role="3uigEE" to="nkm5:190K99K1s2v" resolve="Bounds" />
+            </node>
+            <node concept="1rXfSq" id="4sEIQIBu985" role="33vP2m">
+              <ref role="37wK5l" node="2KWY$Um8EIm" resolve="getBounds" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4sEIQIBuhtu" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBuhtt" role="3cpWs9">
+            <property role="TrG5h" value="width" />
+            <node concept="10Oyi0" id="4sEIQIBuhtv" role="1tU5fm" />
+            <node concept="2OqwBi" id="4sEIQIBujvj" role="33vP2m">
+              <node concept="37vLTw" id="4sEIQIBuiKN" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sEIQIBu983" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="4sEIQIBujvk" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjF9L" resolve="getWidthInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4sEIQIBuhty" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBuhtx" role="3cpWs9">
+            <property role="TrG5h" value="height" />
+            <node concept="10Oyi0" id="4sEIQIBuhtz" role="1tU5fm" />
+            <node concept="2OqwBi" id="4sEIQIBujfd" role="33vP2m">
+              <node concept="37vLTw" id="4sEIQIBuiLc" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sEIQIBu983" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="4sEIQIBujfe" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjHvz" resolve="getHeightInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2mQV_DuagRY" role="3cqZAp">
+          <node concept="3cpWsn" id="2mQV_DuagS1" role="3cpWs9">
+            <property role="TrG5h" value="x" />
+            <node concept="10Oyi0" id="2mQV_DuagRW" role="1tU5fm" />
+            <node concept="2OqwBi" id="2mQV_Duaisj" role="33vP2m">
+              <node concept="37vLTw" id="2mQV_DuahYH" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sEIQIBu983" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="2mQV_Duak91" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECj$zL" resolve="getXInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2mQV_Dualek" role="3cqZAp">
+          <node concept="3cpWsn" id="2mQV_Dualen" role="3cpWs9">
+            <property role="TrG5h" value="y" />
+            <node concept="10Oyi0" id="2mQV_Dualei" role="1tU5fm" />
+            <node concept="2OqwBi" id="2mQV_DuamF9" role="33vP2m">
+              <node concept="37vLTw" id="2mQV_Duamly" role="2Oq$k0">
+                <ref role="3cqZAo" node="4sEIQIBu983" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="2mQV_DuamUK" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjCQ7" resolve="getYInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYhWCM" role="3cqZAp" />
+        <node concept="3cpWs8" id="gxGATYnwYb" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYnwYe" role="3cpWs9">
+            <property role="TrG5h" value="lineGap" />
+            <node concept="10Oyi0" id="gxGATYnwY9" role="1tU5fm" />
+            <node concept="3cmrfG" id="gxGATYny5Q" role="33vP2m">
+              <property role="3cmrfH" value="4" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYnuJN" role="3cqZAp" />
+        <node concept="3SKdUt" id="4sEIQIBuhup" role="3cqZAp">
+          <node concept="1PaTwC" id="4sEIQIBuhuq" role="1aUNEU">
+            <node concept="3oM_SD" id="4sEIQIBuhur" role="1PaTwD">
+              <property role="3oM_SC" value="draw" />
+            </node>
+            <node concept="3oM_SD" id="4sEIQIBuhus" role="1PaTwD">
+              <property role="3oM_SC" value="vertical" />
+            </node>
+            <node concept="3oM_SD" id="4sEIQIBuhut" role="1PaTwD">
+              <property role="3oM_SC" value="lines" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="4sEIQIBuhtC" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBuhtD" role="1Duv9x">
+            <property role="TrG5h" value="lineX" />
+            <node concept="10Oyi0" id="4sEIQIBuhtF" role="1tU5fm" />
+            <node concept="37vLTw" id="2mQV_Duanhc" role="33vP2m">
+              <ref role="3cqZAo" node="2mQV_DuagS1" resolve="x" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="4sEIQIBuhtH" role="1Dwp0S">
+            <node concept="37vLTw" id="4sEIQIBuhtI" role="3uHU7B">
+              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+            </node>
+            <node concept="3cpWs3" id="gxGATYkGob" role="3uHU7w">
+              <node concept="37vLTw" id="gxGATYkGHs" role="3uHU7B">
+                <ref role="3cqZAo" node="2mQV_DuagS1" resolve="x" />
+              </node>
+              <node concept="37vLTw" id="4sEIQIBuhtJ" role="3uHU7w">
+                <ref role="3cqZAo" node="4sEIQIBuhtt" resolve="width" />
+              </node>
+            </node>
+          </node>
+          <node concept="d57v9" id="4sEIQIBuhtL" role="1Dwrff">
+            <node concept="37vLTw" id="4sEIQIBuhtM" role="37vLTJ">
+              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+            </node>
+            <node concept="37vLTw" id="gxGATYnyLn" role="37vLTx">
+              <ref role="3cqZAo" node="gxGATYnwYe" resolve="lineGap" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="4sEIQIBuhtP" role="2LFqv$">
+            <node concept="3clFbF" id="4sEIQIBuhtQ" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBujpi" role="3clFbG">
+                <node concept="37vLTw" id="4sEIQIBuiL4" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBu97X" resolve="g" />
+                </node>
+                <node concept="liA8E" id="4sEIQIBujpj" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
+                  <node concept="37vLTw" id="4sEIQIBujpk" role="37wK5m">
+                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+                  </node>
+                  <node concept="37vLTw" id="2mQV_DuaqCA" role="37wK5m">
+                    <ref role="3cqZAo" node="2mQV_Dualen" resolve="y" />
+                  </node>
+                  <node concept="37vLTw" id="4sEIQIBujpm" role="37wK5m">
+                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+                  </node>
+                  <node concept="3cpWs3" id="gxGATYkJCg" role="37wK5m">
+                    <node concept="37vLTw" id="gxGATYkJXP" role="3uHU7B">
+                      <ref role="3cqZAo" node="2mQV_Dualen" resolve="y" />
+                    </node>
+                    <node concept="37vLTw" id="4sEIQIBujpn" role="3uHU7w">
+                      <ref role="3cqZAo" node="4sEIQIBuhtx" resolve="height" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2WP$sH$EmgL" role="3cqZAp" />
+        <node concept="3SKdUt" id="4sEIQIBuhuu" role="3cqZAp">
+          <node concept="1PaTwC" id="4sEIQIBuhuv" role="1aUNEU">
+            <node concept="3oM_SD" id="4sEIQIBuhuw" role="1PaTwD">
+              <property role="3oM_SC" value="draw" />
+            </node>
+            <node concept="3oM_SD" id="4sEIQIBuhux" role="1PaTwD">
+              <property role="3oM_SC" value="horizontal" />
+            </node>
+            <node concept="3oM_SD" id="4sEIQIBuhuy" role="1PaTwD">
+              <property role="3oM_SC" value="lines" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="4sEIQIBuhtW" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBuhtX" role="1Duv9x">
+            <property role="TrG5h" value="lineY" />
+            <node concept="10Oyi0" id="4sEIQIBuhtZ" role="1tU5fm" />
+            <node concept="37vLTw" id="2mQV_DuaqYK" role="33vP2m">
+              <ref role="3cqZAo" node="2mQV_Dualen" resolve="y" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="4sEIQIBuhu1" role="1Dwp0S">
+            <node concept="37vLTw" id="4sEIQIBuhu2" role="3uHU7B">
+              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+            </node>
+            <node concept="3cpWs3" id="gxGATYkHA6" role="3uHU7w">
+              <node concept="37vLTw" id="gxGATYkHVv" role="3uHU7B">
+                <ref role="3cqZAo" node="2mQV_Dualen" resolve="y" />
+              </node>
+              <node concept="37vLTw" id="4sEIQIBuhu3" role="3uHU7w">
+                <ref role="3cqZAo" node="4sEIQIBuhtx" resolve="height" />
+              </node>
+            </node>
+          </node>
+          <node concept="d57v9" id="4sEIQIBuhu5" role="1Dwrff">
+            <node concept="37vLTw" id="4sEIQIBuhu6" role="37vLTJ">
+              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+            </node>
+            <node concept="37vLTw" id="gxGATYn$6d" role="37vLTx">
+              <ref role="3cqZAo" node="gxGATYnwYe" resolve="lineGap" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="4sEIQIBuhu9" role="2LFqv$">
+            <node concept="3clFbF" id="4sEIQIBuhua" role="3cqZAp">
+              <node concept="2OqwBi" id="4sEIQIBujs3" role="3clFbG">
+                <node concept="37vLTw" id="4sEIQIBuiKR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBu97X" resolve="g" />
+                </node>
+                <node concept="liA8E" id="4sEIQIBujs4" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
+                  <node concept="37vLTw" id="2mQV_Duasm7" role="37wK5m">
+                    <ref role="3cqZAo" node="2mQV_DuagS1" resolve="x" />
+                  </node>
+                  <node concept="37vLTw" id="4sEIQIBujs6" role="37wK5m">
+                    <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="lineY" />
+                  </node>
+                  <node concept="3cpWs3" id="gxGATYkKBG" role="37wK5m">
+                    <node concept="37vLTw" id="gxGATYkKIW" role="3uHU7B">
+                      <ref role="3cqZAo" node="2mQV_DuagS1" resolve="x" />
+                    </node>
+                    <node concept="37vLTw" id="4sEIQIBujs7" role="3uHU7w">
+                      <ref role="3cqZAo" node="4sEIQIBuhtt" resolve="width" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="4sEIQIBujs8" role="37wK5m">
+                    <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBu9ad" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBu9ae" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBu9af" role="jymVt">
+      <property role="TrG5h" value="getTooltip" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="17QB3L" id="4sEIQIBu9ag" role="3clF45" />
+      <node concept="3Tm1VV" id="4sEIQIBu9ah" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBu9ai" role="3clF47">
+        <node concept="3clFbJ" id="4sEIQIBumYf" role="3cqZAp">
+          <node concept="3clFbS" id="4sEIQIBumYh" role="3clFbx">
+            <node concept="3cpWs6" id="4sEIQIBuxnp" role="3cqZAp">
+              <node concept="Xl_RD" id="4sEIQIBuvpJ" role="3cqZAk">
+                <property role="Xl_RC" value="Hide Grid" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4sEIQIBE3Al" role="3clFbw">
+            <node concept="2OqwBi" id="4sEIQIBuslq" role="2Oq$k0">
+              <node concept="2OqwBi" id="4sEIQIBursO" role="2Oq$k0">
+                <node concept="Xjq3P" id="4sEIQIBuqX4" role="2Oq$k0" />
+                <node concept="liA8E" id="4sEIQIBurOe" role="2OqNvi">
+                  <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+                </node>
+              </node>
+              <node concept="liA8E" id="4sEIQIBE2su" role="2OqNvi">
+                <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4sEIQIBE5SX" role="2OqNvi">
+              <ref role="37wK5l" to="p8va:~mxGraphComponent.isGridVisible()" resolve="isGridVisible" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="4sEIQIBuxHj" role="9aQIa">
+            <node concept="3clFbS" id="4sEIQIBuxHk" role="9aQI4">
+              <node concept="3cpWs6" id="4sEIQIBuz1q" role="3cqZAp">
+                <node concept="Xl_RD" id="4sEIQIBuz8E" role="3cqZAk">
+                  <property role="Xl_RC" value="Show Grid" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBu9al" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBu9am" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBu9an" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="3cqZAl" id="4sEIQIBu9ao" role="3clF45" />
+      <node concept="3Tmbuc" id="4sEIQIBu9ap" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBu9aq" role="3clF47">
+        <node concept="3cpWs8" id="4sEIQIBEpuk" role="3cqZAp">
+          <node concept="3cpWsn" id="4sEIQIBEpul" role="3cpWs9">
+            <property role="TrG5h" value="graphComponent" />
+            <node concept="3uibUv" id="4sEIQIBEpjT" role="1tU5fm">
+              <ref role="3uigEE" node="190K99KyNov" resolve="MyGraphComponent" />
+            </node>
+            <node concept="2OqwBi" id="4sEIQIBEpum" role="33vP2m">
+              <node concept="2OqwBi" id="4sEIQIBEpun" role="2Oq$k0">
+                <node concept="Xjq3P" id="4sEIQIBEpuo" role="2Oq$k0" />
+                <node concept="liA8E" id="4sEIQIBEpup" role="2OqNvi">
+                  <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+                </node>
+              </node>
+              <node concept="liA8E" id="4sEIQIBEpuq" role="2OqNvi">
+                <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4sEIQIBEmhC" role="3cqZAp">
+          <node concept="2OqwBi" id="4sEIQIBEnj_" role="3clFbG">
+            <node concept="37vLTw" id="4sEIQIBEpur" role="2Oq$k0">
+              <ref role="3cqZAo" node="4sEIQIBEpul" resolve="graphComponent" />
+            </node>
+            <node concept="liA8E" id="4sEIQIBEpf$" role="2OqNvi">
+              <ref role="37wK5l" to="p8va:~mxGraphComponent.setGridVisible(boolean)" resolve="setGridVisible" />
+              <node concept="3fqX7Q" id="4sEIQIBEKFi" role="37wK5m">
+                <node concept="2OqwBi" id="4sEIQIBEKFk" role="3fr31v">
+                  <node concept="37vLTw" id="4sEIQIBEKFl" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4sEIQIBEpul" resolve="graphComponent" />
+                  </node>
+                  <node concept="liA8E" id="4sEIQIBEKFm" role="2OqNvi">
+                    <ref role="37wK5l" to="p8va:~mxGraphComponent.isGridVisible()" resolve="isGridVisible" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBu9ay" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="4sEIQIBMnT7">
+    <property role="3GE5qa" value="contextButtons.general" />
+    <property role="TrG5h" value="ToggleGridSnappingDiagramButton" />
+    <node concept="3Tm1VV" id="4sEIQIBMnT8" role="1B3o_S" />
+    <node concept="3uibUv" id="4sEIQIBMnT9" role="1zkMxy">
+      <ref role="3uigEE" node="2KWY$Um6wZH" resolve="ContextButton" />
+    </node>
+    <node concept="3clFbW" id="4sEIQIBMnTa" role="jymVt">
+      <node concept="3cqZAl" id="4sEIQIBMnTb" role="3clF45" />
+      <node concept="3Tm1VV" id="4sEIQIBMnTc" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBMnTd" role="3clF47">
+        <node concept="XkiVB" id="4sEIQIBMnTe" role="3cqZAp">
+          <ref role="37wK5l" node="2KWY$Um6y6e" resolve="ContextButton" />
+          <node concept="37vLTw" id="4sEIQIBMnTf" role="37wK5m">
+            <ref role="3cqZAo" node="4sEIQIBMnTh" resolve="size" />
+          </node>
+          <node concept="37vLTw" id="4sEIQIBMnTg" role="37wK5m">
+            <ref role="3cqZAo" node="4sEIQIBMnTj" resolve="state" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4sEIQIBMnTh" role="3clF46">
+        <property role="TrG5h" value="size" />
+        <node concept="10P55v" id="4sEIQIBMnTi" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="4sEIQIBMnTj" role="3clF46">
+        <property role="TrG5h" value="state" />
+        <node concept="3uibUv" id="4sEIQIBMnTk" role="1tU5fm">
+          <ref role="3uigEE" to="1njx:~mxCellState" resolve="mxCellState" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBMnTl" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBMnTm" role="jymVt">
+      <property role="TrG5h" value="paintSymbol" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="4sEIQIBMnTn" role="3clF46">
+        <property role="TrG5h" value="g" />
+        <node concept="3uibUv" id="4sEIQIBMnTo" role="1tU5fm">
+          <ref role="3uigEE" to="z60i:~Graphics2D" resolve="Graphics2D" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4sEIQIBMnTp" role="3clF45" />
+      <node concept="3Tmbuc" id="4sEIQIBMnTq" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBMnTr" role="3clF47">
+        <node concept="3cpWs8" id="gxGATYqh_Y" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqh_Z" role="3cpWs9">
+            <property role="TrG5h" value="bounds" />
+            <node concept="3uibUv" id="gxGATYqhA0" role="1tU5fm">
+              <ref role="3uigEE" to="nkm5:190K99K1s2v" resolve="Bounds" />
+            </node>
+            <node concept="1rXfSq" id="gxGATYqhA1" role="33vP2m">
+              <ref role="37wK5l" node="2KWY$Um8EIm" resolve="getBounds" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="gxGATYqhA2" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhA3" role="3cpWs9">
+            <property role="TrG5h" value="width" />
+            <node concept="10Oyi0" id="gxGATYqhA4" role="1tU5fm" />
+            <node concept="2OqwBi" id="gxGATYqhA5" role="33vP2m">
+              <node concept="37vLTw" id="gxGATYqhA6" role="2Oq$k0">
+                <ref role="3cqZAo" node="gxGATYqh_Z" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="gxGATYqhA7" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjF9L" resolve="getWidthInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="gxGATYqhA8" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhA9" role="3cpWs9">
+            <property role="TrG5h" value="height" />
+            <node concept="10Oyi0" id="gxGATYqhAa" role="1tU5fm" />
+            <node concept="2OqwBi" id="gxGATYqhAb" role="33vP2m">
+              <node concept="37vLTw" id="gxGATYqhAc" role="2Oq$k0">
+                <ref role="3cqZAo" node="gxGATYqh_Z" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="gxGATYqhAd" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjHvz" resolve="getHeightInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="gxGATYqhAe" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhAf" role="3cpWs9">
+            <property role="TrG5h" value="x" />
+            <node concept="10Oyi0" id="gxGATYqhAg" role="1tU5fm" />
+            <node concept="2OqwBi" id="gxGATYqhAh" role="33vP2m">
+              <node concept="37vLTw" id="gxGATYqhAi" role="2Oq$k0">
+                <ref role="3cqZAo" node="gxGATYqh_Z" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="gxGATYqhAj" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECj$zL" resolve="getXInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="gxGATYqhAk" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhAl" role="3cpWs9">
+            <property role="TrG5h" value="y" />
+            <node concept="10Oyi0" id="gxGATYqhAm" role="1tU5fm" />
+            <node concept="2OqwBi" id="gxGATYqhAn" role="33vP2m">
+              <node concept="37vLTw" id="gxGATYqhAo" role="2Oq$k0">
+                <ref role="3cqZAo" node="gxGATYqh_Z" resolve="bounds" />
+              </node>
+              <node concept="liA8E" id="gxGATYqhAp" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:5emhLECjCQ7" resolve="getYInt" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYqhAq" role="3cqZAp" />
+        <node concept="3cpWs8" id="gxGATYqhAr" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhAs" role="3cpWs9">
+            <property role="TrG5h" value="lineGap" />
+            <node concept="10Oyi0" id="gxGATYqhAt" role="1tU5fm" />
+            <node concept="3cmrfG" id="gxGATYqhAu" role="33vP2m">
+              <property role="3cmrfH" value="4" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYqhAv" role="3cqZAp" />
+        <node concept="3SKdUt" id="gxGATYqhAw" role="3cqZAp">
+          <node concept="1PaTwC" id="gxGATYqhAx" role="1aUNEU">
+            <node concept="3oM_SD" id="gxGATYqhAy" role="1PaTwD">
+              <property role="3oM_SC" value="draw" />
+            </node>
+            <node concept="3oM_SD" id="gxGATYqhAz" role="1PaTwD">
+              <property role="3oM_SC" value="vertical" />
+            </node>
+            <node concept="3oM_SD" id="gxGATYqhA$" role="1PaTwD">
+              <property role="3oM_SC" value="lines" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="gxGATYqhA_" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhAA" role="1Duv9x">
+            <property role="TrG5h" value="lineX" />
+            <node concept="10Oyi0" id="gxGATYqhAB" role="1tU5fm" />
+            <node concept="37vLTw" id="gxGATYqhAC" role="33vP2m">
+              <ref role="3cqZAo" node="gxGATYqhAf" resolve="x" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="gxGATYqhAD" role="1Dwp0S">
+            <node concept="37vLTw" id="gxGATYqhAE" role="3uHU7B">
+              <ref role="3cqZAo" node="gxGATYqhAA" resolve="lineX" />
+            </node>
+            <node concept="3cpWs3" id="gxGATYqhAF" role="3uHU7w">
+              <node concept="37vLTw" id="gxGATYqhAG" role="3uHU7B">
+                <ref role="3cqZAo" node="gxGATYqhAf" resolve="x" />
+              </node>
+              <node concept="37vLTw" id="gxGATYqhAH" role="3uHU7w">
+                <ref role="3cqZAo" node="gxGATYqhA3" resolve="width" />
+              </node>
+            </node>
+          </node>
+          <node concept="d57v9" id="gxGATYqhAI" role="1Dwrff">
+            <node concept="37vLTw" id="gxGATYqhAJ" role="37vLTJ">
+              <ref role="3cqZAo" node="gxGATYqhAA" resolve="lineX" />
+            </node>
+            <node concept="37vLTw" id="gxGATYqhAK" role="37vLTx">
+              <ref role="3cqZAo" node="gxGATYqhAs" resolve="lineGap" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="gxGATYqhAL" role="2LFqv$">
+            <node concept="3clFbF" id="gxGATYqhAM" role="3cqZAp">
+              <node concept="2OqwBi" id="gxGATYqhAN" role="3clFbG">
+                <node concept="37vLTw" id="gxGATYqhAO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBMnTn" resolve="g" />
+                </node>
+                <node concept="liA8E" id="gxGATYqhAP" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
+                  <node concept="37vLTw" id="gxGATYqhAQ" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhAA" resolve="lineX" />
+                  </node>
+                  <node concept="37vLTw" id="gxGATYqhAR" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhAl" resolve="y" />
+                  </node>
+                  <node concept="37vLTw" id="gxGATYqhAS" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhAA" resolve="lineX" />
+                  </node>
+                  <node concept="3cpWs3" id="gxGATYqhAT" role="37wK5m">
+                    <node concept="37vLTw" id="gxGATYqhAU" role="3uHU7B">
+                      <ref role="3cqZAo" node="gxGATYqhAl" resolve="y" />
+                    </node>
+                    <node concept="37vLTw" id="gxGATYqhAV" role="3uHU7w">
+                      <ref role="3cqZAo" node="gxGATYqhA9" resolve="height" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="gxGATYqhAW" role="3cqZAp">
+          <node concept="1PaTwC" id="gxGATYqhAX" role="1aUNEU">
+            <node concept="3oM_SD" id="gxGATYqhAY" role="1PaTwD">
+              <property role="3oM_SC" value="draw" />
+            </node>
+            <node concept="3oM_SD" id="gxGATYqhAZ" role="1PaTwD">
+              <property role="3oM_SC" value="horizontal" />
+            </node>
+            <node concept="3oM_SD" id="gxGATYqhB0" role="1PaTwD">
+              <property role="3oM_SC" value="lines" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Dw8fO" id="gxGATYqhB1" role="3cqZAp">
+          <node concept="3cpWsn" id="gxGATYqhB2" role="1Duv9x">
+            <property role="TrG5h" value="lineY" />
+            <node concept="10Oyi0" id="gxGATYqhB3" role="1tU5fm" />
+            <node concept="37vLTw" id="gxGATYqhB4" role="33vP2m">
+              <ref role="3cqZAo" node="gxGATYqhAl" resolve="y" />
+            </node>
+          </node>
+          <node concept="2dkUwp" id="gxGATYqhB5" role="1Dwp0S">
+            <node concept="37vLTw" id="gxGATYqhB6" role="3uHU7B">
+              <ref role="3cqZAo" node="gxGATYqhB2" resolve="lineY" />
+            </node>
+            <node concept="3cpWs3" id="gxGATYqhB7" role="3uHU7w">
+              <node concept="37vLTw" id="gxGATYqhB8" role="3uHU7B">
+                <ref role="3cqZAo" node="gxGATYqhAl" resolve="y" />
+              </node>
+              <node concept="37vLTw" id="gxGATYqhB9" role="3uHU7w">
+                <ref role="3cqZAo" node="gxGATYqhA9" resolve="height" />
+              </node>
+            </node>
+          </node>
+          <node concept="d57v9" id="gxGATYqhBa" role="1Dwrff">
+            <node concept="37vLTw" id="gxGATYqhBb" role="37vLTJ">
+              <ref role="3cqZAo" node="gxGATYqhB2" resolve="lineY" />
+            </node>
+            <node concept="37vLTw" id="gxGATYqhBc" role="37vLTx">
+              <ref role="3cqZAo" node="gxGATYqhAs" resolve="lineGap" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="gxGATYqhBd" role="2LFqv$">
+            <node concept="3clFbF" id="gxGATYqhBe" role="3cqZAp">
+              <node concept="2OqwBi" id="gxGATYqhBf" role="3clFbG">
+                <node concept="37vLTw" id="gxGATYqhBg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBMnTn" resolve="g" />
+                </node>
+                <node concept="liA8E" id="gxGATYqhBh" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
+                  <node concept="37vLTw" id="gxGATYqhBi" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhAf" resolve="x" />
+                  </node>
+                  <node concept="37vLTw" id="gxGATYqhBj" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhB2" resolve="lineY" />
+                  </node>
+                  <node concept="3cpWs3" id="gxGATYqhBk" role="37wK5m">
+                    <node concept="37vLTw" id="gxGATYqhBl" role="3uHU7B">
+                      <ref role="3cqZAo" node="gxGATYqhAf" resolve="x" />
+                    </node>
+                    <node concept="37vLTw" id="gxGATYqhBm" role="3uHU7w">
+                      <ref role="3cqZAo" node="gxGATYqhA3" resolve="width" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="gxGATYqhBn" role="37wK5m">
+                    <ref role="3cqZAo" node="gxGATYqhB2" resolve="lineY" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYqg7u" role="3cqZAp" />
+        <node concept="3clFbJ" id="gxGATYCbkA" role="3cqZAp">
+          <node concept="3clFbS" id="gxGATYCbkC" role="3clFbx">
+            <node concept="3clFbF" id="gxGATYCccK" role="3cqZAp">
+              <node concept="2OqwBi" id="gxGATYC9Vw" role="3clFbG">
+                <node concept="37vLTw" id="gxGATYC9Vx" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4sEIQIBMnTn" resolve="g" />
+                </node>
+                <node concept="liA8E" id="gxGATYC9Vy" role="2OqNvi">
+                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
+                  <node concept="10M0yZ" id="gxGATYC9Vz" role="37wK5m">
+                    <ref role="3cqZAo" to="lzb2:~JBColor.YELLOW" resolve="YELLOW" />
+                    <ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="gxGATYCbDd" role="3clFbw">
+            <node concept="2OqwBi" id="gxGATYCbDe" role="2Oq$k0">
+              <node concept="Xjq3P" id="gxGATYCbDf" role="2Oq$k0" />
+              <node concept="liA8E" id="gxGATYCbDg" role="2OqNvi">
+                <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+              </node>
+            </node>
+            <node concept="liA8E" id="gxGATYCbDh" role="2OqNvi">
+              <ref role="37wK5l" to="1njx:~mxGraph.isGridEnabled()" resolve="isGridEnabled" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="gxGATYH$Xo" role="3cqZAp" />
+        <node concept="3clFbF" id="gxGATYvPxv" role="3cqZAp">
+          <node concept="2OqwBi" id="gxGATYvQax" role="3clFbG">
+            <node concept="37vLTw" id="gxGATYvPxt" role="2Oq$k0">
+              <ref role="3cqZAo" node="4sEIQIBMnTn" resolve="g" />
+            </node>
+            <node concept="liA8E" id="gxGATYvR9_" role="2OqNvi">
+              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
+              <node concept="37vLTw" id="gxGATYvRPu" role="37wK5m">
+                <ref role="3cqZAo" node="gxGATYqhAf" resolve="x" />
+              </node>
+              <node concept="37vLTw" id="gxGATYvSC9" role="37wK5m">
+                <ref role="3cqZAo" node="gxGATYqhAl" resolve="y" />
+              </node>
+              <node concept="17qRlL" id="gxGATYvVQI" role="37wK5m">
+                <node concept="3cmrfG" id="gxGATYvVXY" role="3uHU7w">
+                  <property role="3cmrfH" value="2" />
+                </node>
+                <node concept="37vLTw" id="gxGATYvThW" role="3uHU7B">
+                  <ref role="3cqZAo" node="gxGATYqhAs" resolve="lineGap" />
+                </node>
+              </node>
+              <node concept="17qRlL" id="gxGATYw1al" role="37wK5m">
+                <node concept="3cmrfG" id="gxGATYw1h_" role="3uHU7w">
+                  <property role="3cmrfH" value="2" />
+                </node>
+                <node concept="37vLTw" id="gxGATYvWSV" role="3uHU7B">
+                  <ref role="3cqZAo" node="gxGATYqhAs" resolve="lineGap" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBMnUu" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBMnUv" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBMnUw" role="jymVt">
+      <property role="TrG5h" value="getTooltip" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="17QB3L" id="4sEIQIBMnUx" role="3clF45" />
+      <node concept="3Tm1VV" id="4sEIQIBMnUy" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBMnUz" role="3clF47">
+        <node concept="3clFbJ" id="4sEIQIBMnU$" role="3cqZAp">
+          <node concept="3clFbS" id="4sEIQIBMnU_" role="3clFbx">
+            <node concept="3cpWs6" id="4sEIQIBMnUA" role="3cqZAp">
+              <node concept="Xl_RD" id="4sEIQIBMnUB" role="3cqZAk">
+                <property role="Xl_RC" value="Deactivate Grid Snapping" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4sEIQIBMnUD" role="3clFbw">
+            <node concept="2OqwBi" id="4sEIQIBMnUE" role="2Oq$k0">
+              <node concept="Xjq3P" id="4sEIQIBMnUF" role="2Oq$k0" />
+              <node concept="liA8E" id="4sEIQIBMnUG" role="2OqNvi">
+                <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4sEIQIBMrDW" role="2OqNvi">
+              <ref role="37wK5l" to="1njx:~mxGraph.isGridEnabled()" resolve="isGridEnabled" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="4sEIQIBMnUJ" role="9aQIa">
+            <node concept="3clFbS" id="4sEIQIBMnUK" role="9aQI4">
+              <node concept="3cpWs6" id="4sEIQIBMnUL" role="3cqZAp">
+                <node concept="Xl_RD" id="4sEIQIBMnUM" role="3cqZAk">
+                  <property role="Xl_RC" value="Activate Grid Snapping" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBMnUN" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4sEIQIBMnUO" role="jymVt" />
+    <node concept="3clFb_" id="4sEIQIBMnUP" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="3cqZAl" id="4sEIQIBMnUQ" role="3clF45" />
+      <node concept="3Tmbuc" id="4sEIQIBMnUR" role="1B3o_S" />
+      <node concept="3clFbS" id="4sEIQIBMnUS" role="3clF47">
+        <node concept="3clFbF" id="4sEIQIBNy6e" role="3cqZAp">
+          <node concept="2OqwBi" id="4sEIQIBNy_Q" role="3clFbG">
+            <node concept="2OqwBi" id="4sEIQIBNy6g" role="2Oq$k0">
+              <node concept="Xjq3P" id="4sEIQIBNy6h" role="2Oq$k0" />
+              <node concept="liA8E" id="4sEIQIBNy6i" role="2OqNvi">
+                <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4sEIQIBNzl1" role="2OqNvi">
+              <ref role="37wK5l" to="1njx:~mxGraph.setGridEnabled(boolean)" resolve="setGridEnabled" />
+              <node concept="3fqX7Q" id="gxGATY_lvS" role="37wK5m">
+                <node concept="2OqwBi" id="gxGATY_lvU" role="3fr31v">
+                  <node concept="2OqwBi" id="gxGATY_lvV" role="2Oq$k0">
+                    <node concept="Xjq3P" id="gxGATY_lvW" role="2Oq$k0" />
+                    <node concept="liA8E" id="gxGATY_lvX" role="2OqNvi">
+                      <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="gxGATY_lvY" role="2OqNvi">
+                    <ref role="37wK5l" to="1njx:~mxGraph.isGridEnabled()" resolve="isGridEnabled" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4sEIQIBMnV9" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
index f0f278a5a..8902ab49f 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -17592,6 +17592,33 @@
       <node concept="3Tm1VV" id="1MpJ6ySdrhg" role="1B3o_S" />
       <node concept="10P_77" id="1MpJ6ySdrcu" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="1HGmlJVAqgT" role="jymVt" />
+    <node concept="3clFb_" id="1HGmlJVAqBb" role="jymVt">
+      <property role="TrG5h" value="useGridSnapping" />
+      <node concept="3clFbS" id="1HGmlJVAqBe" role="3clF47" />
+      <node concept="3Tm1VV" id="1HGmlJVAqBf" role="1B3o_S" />
+      <node concept="10P_77" id="1HGmlJVAqvG" role="3clF45" />
+    </node>
+    <node concept="3clFb_" id="1HGmlJVAr8P" role="jymVt">
+      <property role="TrG5h" value="showGrid" />
+      <node concept="3clFbS" id="1HGmlJVAr8S" role="3clF47" />
+      <node concept="3Tm1VV" id="1HGmlJVAr8T" role="1B3o_S" />
+      <node concept="10P_77" id="1HGmlJVAr2_" role="3clF45" />
+    </node>
+    <node concept="3clFb_" id="6nZQGuFEBnv" role="jymVt">
+      <property role="TrG5h" value="getGridSize" />
+      <node concept="3clFbS" id="6nZQGuFEBny" role="3clF47" />
+      <node concept="3Tm1VV" id="6nZQGuFEBnz" role="1B3o_S" />
+      <node concept="10Oyi0" id="6nZQGuFEBgY" role="3clF45" />
+    </node>
+    <node concept="3clFb_" id="2WP$sH$Jy7Y" role="jymVt">
+      <property role="TrG5h" value="getGridColor" />
+      <node concept="3clFbS" id="2WP$sH$Jy81" role="3clF47" />
+      <node concept="3Tm1VV" id="2WP$sH$Jy82" role="1B3o_S" />
+      <node concept="3uibUv" id="2WP$sH$Jy0G" role="3clF45">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="4teJTSBx0$0">
     <property role="3GE5qa" value="accessor" />
@@ -29402,6 +29429,80 @@
       <node concept="3Tm1VV" id="1MpJ6yS97u3" role="1B3o_S" />
       <node concept="10P_77" id="1MpJ6yS98ok" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="1HGmlJVAs0B" role="jymVt" />
+    <node concept="3clFb_" id="1HGmlJVAsBi" role="jymVt">
+      <property role="TrG5h" value="showGrid" />
+      <node concept="3Tm1VV" id="1HGmlJVAsBk" role="1B3o_S" />
+      <node concept="10P_77" id="1HGmlJVAsBl" role="3clF45" />
+      <node concept="3clFbS" id="1HGmlJVAsBm" role="3clF47">
+        <node concept="3clFbF" id="1HGmlJVAsBp" role="3cqZAp">
+          <node concept="3clFbT" id="1HGmlJVAsBo" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1HGmlJVAsBn" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1HGmlJVAuxT" role="jymVt" />
+    <node concept="3clFb_" id="1HGmlJVAsBq" role="jymVt">
+      <property role="TrG5h" value="useGridSnapping" />
+      <node concept="3Tm1VV" id="1HGmlJVAsBs" role="1B3o_S" />
+      <node concept="10P_77" id="1HGmlJVAsBt" role="3clF45" />
+      <node concept="3clFbS" id="1HGmlJVAsBu" role="3clF47">
+        <node concept="3clFbF" id="1HGmlJVAsBx" role="3cqZAp">
+          <node concept="3clFbT" id="1HGmlJVAsBw" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1HGmlJVAsBv" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6nZQGuFEI4G" role="jymVt" />
+    <node concept="3clFb_" id="6nZQGuFEIKn" role="jymVt">
+      <property role="TrG5h" value="getGridSize" />
+      <node concept="3Tm1VV" id="6nZQGuFEIKp" role="1B3o_S" />
+      <node concept="10Oyi0" id="6nZQGuFEIKq" role="3clF45" />
+      <node concept="3clFbS" id="6nZQGuFEIKr" role="3clF47">
+        <node concept="3clFbF" id="6nZQGuFEIKu" role="3cqZAp">
+          <node concept="3cmrfG" id="6nZQGuFEIKt" role="3clFbG">
+            <property role="3cmrfH" value="10" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6nZQGuFEIKs" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2WP$sH$KKxy" role="jymVt" />
+    <node concept="3clFb_" id="2WP$sH$KLc_" role="jymVt">
+      <property role="TrG5h" value="getGridColor" />
+      <node concept="3Tm1VV" id="2WP$sH$KLcB" role="1B3o_S" />
+      <node concept="3uibUv" id="2WP$sH$KLcC" role="3clF45">
+        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
+      </node>
+      <node concept="3clFbS" id="2WP$sH$KLcD" role="3clF47">
+        <node concept="3clFbF" id="2WP$sH$KNGS" role="3cqZAp">
+          <node concept="2ShNRf" id="2WP$sH$KNGQ" role="3clFbG">
+            <node concept="1pGfFk" id="2WP$sH$L6Kf" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+              <node concept="3cmrfG" id="2WP$sH$L7vD" role="37wK5m">
+                <property role="3cmrfH" value="192" />
+              </node>
+              <node concept="3cmrfG" id="2WP$sH$L8LK" role="37wK5m">
+                <property role="3cmrfH" value="192" />
+              </node>
+              <node concept="3cmrfG" id="2WP$sH$L9q_" role="37wK5m">
+                <property role="3cmrfH" value="192" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2WP$sH$KLcE" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="63AkbuPiu1I">
     <property role="3GE5qa" value="accessor" />
diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
index 6cbbc3f9e..5f09cb735 100644
--- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
+++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -234,6 +234,116 @@
       </node>
       <node concept="15bAme" id="2IcGFIaJNN1" role="15bAlL">
         <property role="15bAli" value="Po4Z58tnOE/added" />
+        <node concept="2DRihI" id="2WP$sH_4cFB" role="15bAlk">
+          <node concept="2hgSXJ" id="2WP$sH_4cKO" role="1PaTwD">
+            <node concept="1PaTwC" id="2WP$sH_4cKP" role="2hiFM$">
+              <node concept="15Ami3" id="2WP$sH_4cKQ" role="1PaTwD">
+                <node concept="37shsh" id="2WP$sH_4cKR" role="15Aodc">
+                  <node concept="1dCxOk" id="2WP$sH_4cKS" role="37shsm">
+                    <property role="1XweGW" value="fa13cc63-c476-4d46-9c96-d53670abe7bc" />
+                    <property role="1XxBO9" value="de.itemis.mps.editor.diagram" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3oM_SD" id="2WP$sH_4cKT" role="1PaTwD">
+                <property role="3oM_SC" value=":" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cLt" role="1PaTwD">
+            <property role="3oM_SC" value="Diagrams" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cQy" role="1PaTwD">
+            <property role="3oM_SC" value="can" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cS_" role="1PaTwD">
+            <property role="3oM_SC" value="now" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cXH" role="1PaTwD">
+            <property role="3oM_SC" value="show" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cU6" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cU7" role="1PaTwD">
+            <property role="3oM_SC" value="grid" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cUC" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cW9" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cWa" role="1PaTwD">
+            <property role="3oM_SC" value="used" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cWF" role="1PaTwD">
+            <property role="3oM_SC" value="for" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cWG" role="1PaTwD">
+            <property role="3oM_SC" value="snapping" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cYI" role="1PaTwD">
+            <property role="3oM_SC" value="elements" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cZf" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4cZK" role="1PaTwD">
+            <property role="3oM_SC" value="it." />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d0h" role="1PaTwD">
+            <property role="3oM_SC" value="It" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d0M" role="1PaTwD">
+            <property role="3oM_SC" value="can" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d0N" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d1k" role="1PaTwD">
+            <property role="3oM_SC" value="configured" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d5X" role="1PaTwD">
+            <property role="3oM_SC" value="(visibility," />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d6Y" role="1PaTwD">
+            <property role="3oM_SC" value="grid" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d7v" role="1PaTwD">
+            <property role="3oM_SC" value="snapping," />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d8w" role="1PaTwD">
+            <property role="3oM_SC" value="grid" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d91" role="1PaTwD">
+            <property role="3oM_SC" value="color/size)" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d1P" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d2m" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d2n" role="1PaTwD">
+            <property role="3oM_SC" value="editor" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d2S" role="1PaTwD">
+            <property role="3oM_SC" value="definition" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d3p" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d3U" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d3V" role="1PaTwD">
+            <property role="3oM_SC" value="diagram" />
+          </node>
+          <node concept="3oM_SD" id="2WP$sH_4d4s" role="1PaTwD">
+            <property role="3oM_SC" value="itself." />
+          </node>
+        </node>
         <node concept="2DRihI" id="2IcGFIaJNN2" role="15bAlk">
           <node concept="3oM_SD" id="2IcGFIaJNP4" role="1PaTwD">
             <property role="3oM_SC" value="A" />

From 593c4143fc6c9aee0450e1e6e29683afbd067de9 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 16 Sep 2024 09:44:28 +0200
Subject: [PATCH 2/3] force save all

---
 .../generator/template/main@generator.mps        |  4 ++--
 .../itemis/mps/editor/diagram/runtime/jgraph.mps | 16 ++++++++--------
 .../itemis/mps/editor/diagram/runtime/model.mps  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index 611405ac2..a6eef4ee4 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -6899,7 +6899,7 @@
                                                     <node concept="3clFbF" id="2WP$sH$LDME" role="3cqZAp">
                                                       <node concept="37vLTI" id="2WP$sH$LDMF" role="3clFbG">
                                                         <node concept="37vLTw" id="2WP$sH$LDMR" role="37vLTJ">
-                                                          <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="size" />
+                                                          <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="color" />
                                                         </node>
                                                         <node concept="1rXfSq" id="2WP$sH$M9xS" role="37vLTx">
                                                           <ref role="37wK5l" node="2WP$sH$LjQX" resolve="getTheGridColor" />
@@ -6947,7 +6947,7 @@
                                                     </node>
                                                     <node concept="3cpWs6" id="2WP$sH$LDN1" role="3cqZAp">
                                                       <node concept="37vLTw" id="2WP$sH$LDN2" role="3cqZAk">
-                                                        <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="size" />
+                                                        <ref role="3cqZAo" node="2WP$sH$LDMB" resolve="color" />
                                                       </node>
                                                     </node>
                                                   </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index d4cd6d7e6..7eb059d63 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -88906,7 +88906,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="4sEIQIBIMwm" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="1yAlWL_OO$6" role="jymVt" />
@@ -149207,7 +149207,7 @@
           </node>
           <node concept="2dkUwp" id="4sEIQIBuhtH" role="1Dwp0S">
             <node concept="37vLTw" id="4sEIQIBuhtI" role="3uHU7B">
-              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="lineX" />
             </node>
             <node concept="3cpWs3" id="gxGATYkGob" role="3uHU7w">
               <node concept="37vLTw" id="gxGATYkGHs" role="3uHU7B">
@@ -149220,7 +149220,7 @@
           </node>
           <node concept="d57v9" id="4sEIQIBuhtL" role="1Dwrff">
             <node concept="37vLTw" id="4sEIQIBuhtM" role="37vLTJ">
-              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+              <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="lineX" />
             </node>
             <node concept="37vLTw" id="gxGATYnyLn" role="37vLTx">
               <ref role="3cqZAo" node="gxGATYnwYe" resolve="lineGap" />
@@ -149235,13 +149235,13 @@
                 <node concept="liA8E" id="4sEIQIBujpj" role="2OqNvi">
                   <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                   <node concept="37vLTw" id="4sEIQIBujpk" role="37wK5m">
-                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="lineX" />
                   </node>
                   <node concept="37vLTw" id="2mQV_DuaqCA" role="37wK5m">
                     <ref role="3cqZAo" node="2mQV_Dualen" resolve="y" />
                   </node>
                   <node concept="37vLTw" id="4sEIQIBujpm" role="37wK5m">
-                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="x" />
+                    <ref role="3cqZAo" node="4sEIQIBuhtD" resolve="lineX" />
                   </node>
                   <node concept="3cpWs3" id="gxGATYkJCg" role="37wK5m">
                     <node concept="37vLTw" id="gxGATYkJXP" role="3uHU7B">
@@ -149280,7 +149280,7 @@
           </node>
           <node concept="2dkUwp" id="4sEIQIBuhu1" role="1Dwp0S">
             <node concept="37vLTw" id="4sEIQIBuhu2" role="3uHU7B">
-              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="lineY" />
             </node>
             <node concept="3cpWs3" id="gxGATYkHA6" role="3uHU7w">
               <node concept="37vLTw" id="gxGATYkHVv" role="3uHU7B">
@@ -149293,7 +149293,7 @@
           </node>
           <node concept="d57v9" id="4sEIQIBuhu5" role="1Dwrff">
             <node concept="37vLTw" id="4sEIQIBuhu6" role="37vLTJ">
-              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+              <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="lineY" />
             </node>
             <node concept="37vLTw" id="gxGATYn$6d" role="37vLTx">
               <ref role="3cqZAo" node="gxGATYnwYe" resolve="lineGap" />
@@ -149322,7 +149322,7 @@
                     </node>
                   </node>
                   <node concept="37vLTw" id="4sEIQIBujs8" role="37wK5m">
-                    <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="y" />
+                    <ref role="3cqZAo" node="4sEIQIBuhtX" resolve="lineY" />
                   </node>
                 </node>
               </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
index 8902ab49f..60d6ecded 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -29440,7 +29440,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1HGmlJVAsBn" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="1HGmlJVAuxT" role="jymVt" />
@@ -29454,7 +29454,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="1HGmlJVAsBv" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="6nZQGuFEI4G" role="jymVt" />
@@ -29470,7 +29470,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="6nZQGuFEIKs" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2WP$sH$KKxy" role="jymVt" />
@@ -29500,7 +29500,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2WP$sH$KLcE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>

From 12bdc3a229a31e4d279f3f20c155fb25ef4bd9e9 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 17 Sep 2024 08:51:47 +0200
Subject: [PATCH 3/3] diagram: implement the option to set the grid style

---
 .../languageModels/editor.mps                 |  6 +-
 .../generator/template/main@generator.mps     | 87 +++++++++++++++++++
 .../languageModels/editor.mps                 | 13 +++
 .../languageModels/structure.mps              | 30 +++++++
 .../mps/editor/diagram/runtime/jgraph.mps     | 13 +++
 .../mps/editor/diagram/runtime/model.mps      | 25 ++++++
 6 files changed, 172 insertions(+), 2 deletions(-)

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
index 8d7c144e7..60eb77349 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
@@ -224,6 +224,7 @@
       </concept>
       <concept id="6554619382999975769" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_OuterNode" flags="ng" index="23r2z0" />
       <concept id="1110129820007229393" name="de.itemis.mps.editor.diagram.structure.CellModel_Diagram" flags="ng" index="27vDVx">
+        <property id="1259410080007702445" name="gridStyle" index="2s7plA" />
         <child id="8433227566816393050" name="layoutAlgorithm" index="35U2g" />
         <child id="1742468285817538342" name="disableNodeEditing" index="2gDVEa" />
         <child id="53713348769907228" name="autoLayoutOnChange" index="2hB_ot" />
@@ -490,6 +491,7 @@
     <property role="3GE5qa" value="diagram" />
     <ref role="1XX52x" to="g93z:4_qW8fWLMYX" resolve="EntityDiagram" />
     <node concept="27vDVx" id="4_qW8fWLOPi" role="2wV5jI">
+      <property role="2s7plA" value="15UkGIdpWfA/GRID_STYLE_LINE" />
       <node concept="ahg9e" id="30bR1EZsvUl" role="aCds2">
         <node concept="238au4" id="30bR1EZsvUn" role="23bJyd">
           <node concept="3EZMnI" id="30bR1EZs_2z" role="2wV5jI">
@@ -896,8 +898,8 @@
       <node concept="1cFabM" id="6nZQGuFTYEq" role="3ehQaW">
         <node concept="3clFbS" id="6nZQGuFTYEr" role="2VODD2">
           <node concept="3clFbF" id="6nZQGuFTZ5W" role="3cqZAp">
-            <node concept="3cmrfG" id="6nZQGuFTZBR" role="3clFbG">
-              <property role="3cmrfH" value="5" />
+            <node concept="3cmrfG" id="15UkGIdCPvn" role="3clFbG">
+              <property role="3cmrfH" value="20" />
             </node>
           </node>
         </node>
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index a6eef4ee4..2762d1286 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -68,7 +68,9 @@
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="1njx" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.view(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
+    <import index="p8va" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.swing(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="t6h5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.reflect(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -101,6 +103,9 @@
       <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
+        <child id="8118189177080264854" name="alternative" index="nSUat" />
+      </concept>
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
         <property id="5279705229678483899" name="value" index="2$xPTl" />
@@ -140,6 +145,7 @@
       <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="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
       <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
         <child id="1182160096073" name="cls" index="YeSDq" />
       </concept>
@@ -265,6 +271,10 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
+        <child id="8276990574895933173" name="catchBody" index="1zc67A" />
+        <child id="8276990574895933172" name="throwable" index="1zc67B" />
+      </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
@@ -275,6 +285,10 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
+      <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
+        <child id="8276990574886367508" name="body" index="1zxBo7" />
+      </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -6879,6 +6893,79 @@
                                                     </node>
                                                   </node>
                                                 </node>
+                                                <node concept="2tJIrI" id="15UkGIdq$PJ" role="jymVt" />
+                                                <node concept="2tJIrI" id="15UkGIdqBEP" role="jymVt" />
+                                                <node concept="3clFb_" id="15UkGIdqECW" role="jymVt">
+                                                  <property role="TrG5h" value="getGridStyle" />
+                                                  <node concept="3Tm1VV" id="15UkGIdqECX" role="1B3o_S" />
+                                                  <node concept="10Oyi0" id="15UkGIdqECY" role="3clF45" />
+                                                  <node concept="2AHcQZ" id="15UkGIdqED2" role="2AJF6D">
+                                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                                  </node>
+                                                  <node concept="3clFbS" id="15UkGIdqED4" role="3clF47">
+                                                    <node concept="3J1_TO" id="15UkGIds5EJ" role="3cqZAp">
+                                                      <node concept="3uVAMA" id="15UkGIds8x4" role="1zxBo5">
+                                                        <node concept="XOnhg" id="15UkGIds8x5" role="1zc67B">
+                                                          <property role="TrG5h" value="ex" />
+                                                          <node concept="nSUau" id="15UkGIds8x6" role="1tU5fm">
+                                                            <node concept="3uibUv" id="15UkGIdsbwE" role="nSUat">
+                                                              <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                        <node concept="3clFbS" id="15UkGIds8x7" role="1zc67A">
+                                                          <node concept="3cpWs6" id="15UkGIdsjrt" role="3cqZAp">
+                                                            <node concept="3cmrfG" id="15UkGIdsmUU" role="3cqZAk">
+                                                              <property role="3cmrfH" value="0" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3clFbS" id="15UkGIds5EK" role="1zxBo7">
+                                                        <node concept="3cpWs6" id="15UkGIdsAaD" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="15UkGIdrRQx" role="3cqZAk">
+                                                            <node concept="2OqwBi" id="15UkGIdr4P4" role="2Oq$k0">
+                                                              <node concept="3VsKOn" id="15UkGIdr33i" role="2Oq$k0">
+                                                                <ref role="3VsUkX" to="p8va:~mxGraphComponent" resolve="mxGraphComponent" />
+                                                              </node>
+                                                              <node concept="liA8E" id="15UkGIdr9Ht" role="2OqNvi">
+                                                                <ref role="37wK5l" to="wyt6:~Class.getDeclaredField(java.lang.String)" resolve="getDeclaredField" />
+                                                                <node concept="Xl_RD" id="15UkGIdrtOu" role="37wK5m">
+                                                                  <property role="Xl_RC" value="GRID_STYLE_DOT" />
+                                                                  <node concept="17Uvod" id="15UkGIdr_hb" role="lGtFl">
+                                                                    <property role="2qtEX9" value="value" />
+                                                                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                                                                    <node concept="3zFVjK" id="15UkGIdr_hc" role="3zH0cK">
+                                                                      <node concept="3clFbS" id="15UkGIdr_hd" role="2VODD2">
+                                                                        <node concept="3clFbF" id="15UkGIdrErK" role="3cqZAp">
+                                                                          <node concept="2OqwBi" id="15UkGIdrLBB" role="3clFbG">
+                                                                            <node concept="2OqwBi" id="15UkGIdrGlI" role="2Oq$k0">
+                                                                              <node concept="30H73N" id="15UkGIdrErJ" role="2Oq$k0" />
+                                                                              <node concept="3TrcHB" id="15UkGIdrJOx" role="2OqNvi">
+                                                                                <ref role="3TsBF5" to="2qld:15UkGIdpWuH" resolve="gridStyle" />
+                                                                              </node>
+                                                                            </node>
+                                                                            <node concept="liA8E" id="15UkGIdrODa" role="2OqNvi">
+                                                                              <ref role="37wK5l" to="c17a:~SEnumerationLiteral.getName()" resolve="getName" />
+                                                                            </node>
+                                                                          </node>
+                                                                        </node>
+                                                                      </node>
+                                                                    </node>
+                                                                  </node>
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                            <node concept="liA8E" id="15UkGIdrV4z" role="2OqNvi">
+                                                              <ref role="37wK5l" to="t6h5:~Field.getInt(java.lang.Object)" resolve="getInt" />
+                                                              <node concept="10Nm6u" id="15UkGIdrZj0" role="37wK5m" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                                 <node concept="2tJIrI" id="2WP$sH$LMTP" role="jymVt" />
                                                 <node concept="3clFb_" id="2WP$sH$LDMx" role="jymVt">
                                                   <property role="TrG5h" value="getGridColor" />
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 75c40173e..6b04ced6d 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
@@ -1222,6 +1222,19 @@
               <property role="VOm3f" value="true" />
             </node>
           </node>
+          <node concept="3EZMnI" id="15UkGIdpXuW" role="3EZMnx">
+            <node concept="2iRfu4" id="15UkGIdpXuX" role="2iSdaV" />
+            <node concept="3F0ifn" id="15UkGIdpXuY" role="3EZMnx">
+              <property role="3F0ifm" value="grid style" />
+            </node>
+            <node concept="3F0A7n" id="15UkGIdpXQT" role="3EZMnx">
+              <ref role="1NtTu8" to="2qld:15UkGIdpWuH" resolve="gridStyle" />
+            </node>
+            <node concept="VPM3Z" id="15UkGIdpXv0" role="3F10Kt" />
+            <node concept="VPXOz" id="15UkGIdpXv1" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
           <node concept="3EZMnI" id="4sEIQIBw07n" role="3EZMnx">
             <node concept="2iRfu4" id="4sEIQIBw07o" role="2iSdaV" />
             <node concept="3F0ifn" id="4sEIQIBw07p" role="3EZMnx">
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
index 2d4f976df..5753fb3d9 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
@@ -124,6 +124,11 @@
       <property role="TrG5h" value="connectBoxesWithoutDummyPort" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
+    <node concept="1TJgyi" id="15UkGIdpWuH" role="1TKVEl">
+      <property role="IQ2nx" value="1259410080007702445" />
+      <property role="TrG5h" value="gridStyle" />
+      <ref role="AX2Wp" node="15UkGIdpWax" resolve="GridStyle" />
+    </node>
     <node concept="1TJgyj" id="6actlYi6UMa" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="diagramID" />
@@ -5095,5 +5100,30 @@
     <property role="EcuMT" value="6237710625716701263" />
     <ref role="1TJDcQ" to="tpee:gyVMwX8" resolve="ConceptFunction" />
   </node>
+  <node concept="25R3W" id="15UkGIdpWax">
+    <property role="3F6X1D" value="1259410080007701153" />
+    <property role="TrG5h" value="GridStyle" />
+    <ref role="1H5jkz" node="15UkGIdpWay" resolve="GRID_STYLE_DOT" />
+    <node concept="25R33" id="15UkGIdpWay" role="25R1y">
+      <property role="3tVfz5" value="1259410080007701154" />
+      <property role="TrG5h" value="GRID_STYLE_DOT" />
+      <property role="1L1pqM" value="dot" />
+    </node>
+    <node concept="25R33" id="15UkGIdpWe4" role="25R1y">
+      <property role="3tVfz5" value="1259410080007701380" />
+      <property role="TrG5h" value="GRID_STYLE_CROSS" />
+      <property role="1L1pqM" value="cross" />
+    </node>
+    <node concept="25R33" id="15UkGIdpWfA" role="25R1y">
+      <property role="3tVfz5" value="1259410080007701478" />
+      <property role="TrG5h" value="GRID_STYLE_LINE" />
+      <property role="1L1pqM" value="line" />
+    </node>
+    <node concept="25R33" id="15UkGIdpWiD" role="25R1y">
+      <property role="3tVfz5" value="1259410080007701673" />
+      <property role="TrG5h" value="GRID_STYLE_DASHED" />
+      <property role="1L1pqM" value="dashed" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 7eb059d63..a8ca78721 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -28157,6 +28157,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="15UkGIdtg9o" role="3cqZAp">
+          <node concept="1rXfSq" id="15UkGIdtg9m" role="3clFbG">
+            <ref role="37wK5l" to="p8va:~mxGraphComponent.setGridStyle(int)" resolve="setGridStyle" />
+            <node concept="2OqwBi" id="15UkGIdtF$j" role="37wK5m">
+              <node concept="37vLTw" id="15UkGIdtCVm" role="2Oq$k0">
+                <ref role="3cqZAo" node="2WP$sH$MRkU" resolve="diagramAccessor" />
+              </node>
+              <node concept="liA8E" id="15UkGIdtHb9" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:15UkGIdqaGq" resolve="getGridStyle" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6LXVPPFqx2H" role="3cqZAp">
           <node concept="2ShNRf" id="6LXVPPFqx2D" role="3clFbG">
             <node concept="1pGfFk" id="6LXVPPFqy5N" role="2ShVmc">
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
index 60d6ecded..f6a94dea2 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -54,6 +54,7 @@
     <import index="1njx" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.view(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="xggr" ref="r:12584d60-2d80-4ca9-9c6e-b79d499da0cf(de.itemis.mps.editor.celllayout.layout)" />
     <import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
+    <import index="p8va" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.swing(de.itemis.mps.editor.diagram.runtime/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
     <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" implicit="true" />
     <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
@@ -17611,6 +17612,12 @@
       <node concept="3Tm1VV" id="6nZQGuFEBnz" role="1B3o_S" />
       <node concept="10Oyi0" id="6nZQGuFEBgY" role="3clF45" />
     </node>
+    <node concept="3clFb_" id="15UkGIdqaGq" role="jymVt">
+      <property role="TrG5h" value="getGridStyle" />
+      <node concept="3clFbS" id="15UkGIdqaGt" role="3clF47" />
+      <node concept="3Tm1VV" id="15UkGIdqaGu" role="1B3o_S" />
+      <node concept="10Oyi0" id="15UkGIdqa$R" role="3clF45" />
+    </node>
     <node concept="3clFb_" id="2WP$sH$Jy7Y" role="jymVt">
       <property role="TrG5h" value="getGridColor" />
       <node concept="3clFbS" id="2WP$sH$Jy81" role="3clF47" />
@@ -29473,6 +29480,24 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="15UkGIdqg2J" role="jymVt" />
+    <node concept="2tJIrI" id="15UkGIdqg2K" role="jymVt" />
+    <node concept="3clFb_" id="15UkGIdqgPI" role="jymVt">
+      <property role="TrG5h" value="getGridStyle" />
+      <node concept="3Tm1VV" id="15UkGIdqgPK" role="1B3o_S" />
+      <node concept="10Oyi0" id="15UkGIdqgPL" role="3clF45" />
+      <node concept="3clFbS" id="15UkGIdqgPM" role="3clF47">
+        <node concept="3clFbF" id="15UkGIdqjCr" role="3cqZAp">
+          <node concept="10M0yZ" id="15UkGIdqkjA" role="3clFbG">
+            <ref role="3cqZAo" to="p8va:~mxGraphComponent.GRID_STYLE_DOT" resolve="GRID_STYLE_DOT" />
+            <ref role="1PxDUh" to="p8va:~mxGraphComponent" resolve="mxGraphComponent" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="15UkGIdqgPN" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="2WP$sH$KKxy" role="jymVt" />
     <node concept="3clFb_" id="2WP$sH$KLc_" role="jymVt">
       <property role="TrG5h" value="getGridColor" />