diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index 28c9a9453c27cceded1f23add454689b79b8d54f..7fa0bc63cd21d38f632e3023c12f85e0558e2c9f 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_APPLICATION</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <company>
-    <name>company</name>
-    <backgroundColor v="0xff83cbd8" />
-  </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_APPLICATION</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <company>
+    <name>company</name>
+    <backgroundColor v="0xff83cbd8" />
+  </company>
+</application>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 3ff69433612fed1fbafbcdb362f9481bceebd5ca..e037ea5c5bb19f29ed3f0705f25bcf5bf94d643c 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -1,56 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_APPLICATION_NEON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200">
-    <node name="CONTACTS" kind="123" title="Contactmanagement">
-      <icon>VAADIN:CONNECT</icon>
-      <node name="Group1" kind="123" title="">
-        <node name="Person" kind="10077" />
-        <node name="Organisation" kind="10077" />
-        <node name="Activity" kind="10077" />
-        <node name="Task" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="SALES" kind="123" title="Sales">
-      <icon>VAADIN:BRIEFCASE</icon>
-      <node name="Group2" kind="123" title="">
-        <node name="Vertriebsdashboard" kind="10090" />
-        <node name="Salesproject" kind="10077" />
-        <node name="Offer" kind="10077" />
-        <node name="Order" kind="10077" />
-        <node name="Contract" kind="10077" />
-        <node name="Product" kind="10077" />
-        <node name="Turnover" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="Marketing" kind="123" title="Marketing">
-      <icon>VAADIN:GROUP</icon>
-      <node name="Group4" kind="123" title="">
-        <node name="Campaign" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-    <node name="ADMINISTRATION" kind="123" title="Administration">
-      <icon>VAADIN:CONTROLLER</icon>
-      <node name="Group3" kind="123" title="">
-        <node name="Notification" kind="10077" />
-        <node name="Attribute" kind="10077" />
-        <node name="DocumentTemplate" kind="10077" />
-        <node name="Employee" kind="10077" />
-        <node name="KeywordEntry" kind="10077" />
-        <node name="KeywordAttribute" kind="10077" />
-        <node name="ObjectRelationType" kind="10077" />
-        <node name="ClassificationAdmin" kind="10077" />
-        <node name="Salutation" kind="10077" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-  </entityNode>
-  <company>
-    <name>company</name>
-    <title></title>
-  </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_APPLICATION_NEON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+    <childNodes>
+      <entityNode>
+        <name>CONTACTS</name>
+        <kind v="123" />
+        <title>Contactmanagement</title>
+        <icon>VAADIN:CONNECT</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group1</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Person</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Organisation</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Activity</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Task</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>SALES</name>
+        <kind v="123" />
+        <title>Sales</title>
+        <icon>VAADIN:BRIEFCASE</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group2</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Vertriebsdashboard</name>
+                <kind v="10090" />
+              </entityNode>
+              <entityNode>
+                <name>Salesproject</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Offer</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Order</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Contract</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Product</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Turnover</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>Marketing</name>
+        <kind v="123" />
+        <title>Marketing</title>
+        <icon>VAADIN:GROUP</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group4</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Campaign</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+      <entityNode>
+        <name>ADMINISTRATION</name>
+        <kind v="123" />
+        <title>Administration</title>
+        <icon>VAADIN:CONTROLLER</icon>
+        <childNodes>
+          <entityNode>
+            <name>Group3</name>
+            <kind v="123" />
+            <title></title>
+            <childNodes>
+              <entityNode>
+                <name>Notification</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Attribute</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>DocumentTemplate</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Employee</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>KeywordEntry</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>KeywordAttribute</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>ObjectRelationType</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>ClassificationAdmin</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>Salutation</name>
+                <kind v="10077" />
+              </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
+            </childNodes>
+          </entityNode>
+        </childNodes>
+      </entityNode>
+    </childNodes>
+  </entityNode>
+  <company>
+    <name>company</name>
+    <title></title>
+  </company>
+</application>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index 42fef1c4124cc59559c680d1fe53f8b8b91ace0a..8330bf556d46213b0e263bf3b76ad40ba146b7f0 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_CALENDAR_RIBBON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <calendarRibbon>
-    <name>calendarRibbon</name>
-    <ribbonTasks>
-      <ribbonTask>
-        <name>TASK_CALENDAR</name>
-      </ribbonTask>
-    </ribbonTasks>
-  </calendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_CALENDAR_RIBBON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <calendarRibbon>
+    <name>calendarRibbon</name>
+    <ribbonTasks>
+      <ribbonTask>
+        <name>TASK_CALENDAR</name>
+      </ribbonTask>
+    </ribbonTasks>
+  </calendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
index e453d3efffad2a0658db7a002fcfdec4eba0d9f4..ad4a9d9fe39f6033cffd97d3fc8818b72956eeb9 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON_NEON/_____SYSTEM_CALENDAR_RIBBON_NEON.aod
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <neonCalendarRibbon>
-    <name>neonCalendarRibbon</name>
-    <entity>
-      <name>entity</name>
-    </entity>
-  </neonCalendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_CALENDAR_RIBBON_NEON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <neonCalendarRibbon>
+    <name>neonCalendarRibbon</name>
+    <entity>
+      <name>entity</name>
+    </entity>
+  </neonCalendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
index 114ee28146d6509474675e0905da9d217b0fc329..0da3c760e4fab15c3b667450bcc8bb0034e2f547 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <indexSearchRibbon>
-    <name>indexSearchRibbon</name>
-    <ribbonTasks>
-      <ribbonTask>
-        <name>TASK_INDEXSEARCH</name>
-      </ribbonTask>
-    </ribbonTasks>
-  </indexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <indexSearchRibbon>
+    <name>indexSearchRibbon</name>
+    <ribbonTasks>
+      <ribbonTask>
+        <name>TASK_INDEXSEARCH</name>
+      </ribbonTask>
+    </ribbonTasks>
+  </indexSearchRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
index 31b4562eb6745c36ddba6aaeb17c3e438841c717..3ad5be3eb1c0ff7b9e1a4b48f920704edf01932c 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON_NEON/_____SYSTEM_INDEXSEARCH_RIBBON_NEON.aod
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
-  <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
-  <neonIndexSearchRibbon>
-    <name>neonIndexSearchRibbon</name>
-  </neonIndexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.1">
+  <name>_____SYSTEM_INDEXSEARCH_RIBBON_NEON</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode>
+    <name>entityNode</name>
+    <kind v="200" />
+  </entityNode>
+  <neonIndexSearchRibbon>
+    <name>neonIndexSearchRibbon</name>
+  </neonIndexSearchRibbon>
+</application>