diff --git a/entity/Settings_entity/Settings_entity.aod b/entity/Settings_entity/Settings_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1ca486ce5f9e7c1a0c8750f74bbd0b98763af005
--- /dev/null
+++ b/entity/Settings_entity/Settings_entity.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+  <name>Settings_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Settings</title>
+  <titlePlural>Settings</titlePlural>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>TEST</name>
+      <title>Testfield</title>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index fe1fbb9b3559b92efc504c689ca26083c140dc65..ddc835b18266014086215330c6b2b0d5381dbdd9 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6803,6 +6803,9 @@
     <entry>
       <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
     </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index fa13543e3899d1b06f831c121663eaaeffc0be75..7f108cf8971d59b90cf70f739d50a36401568f92 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,6 +6,10 @@
   <country></country>
   <variant></variant>
   <keyValueMap>
+    <entry>
+      <key>Settings</key>
+      <value>Einstellungen</value>
+    </entry>
     <entry>
       <key>{SEARCH_INDEX_TITLE}</key>
       <value>Suche</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 484ad7c3e5a690cf7a0239ffa4507df6ed42682b..960fee93497a827d21b80d7e203fd2104bd9d4f6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6869,6 +6869,9 @@
     <entry>
       <key>Valid from (as </key>
     </entry>
+    <entry>
+      <key>Settings</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/Settings/Settings.aod b/neonContext/Settings/Settings.aod
new file mode 100644
index 0000000000000000000000000000000000000000..496444744e353c8670e52feb9c065d57e6c2f6f1
--- /dev/null
+++ b/neonContext/Settings/Settings.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>Settings</name>
+  <title>Settings</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <editView>SettingsEdit_view</editView>
+  <entity>Settings_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>40cbd631-043c-44d9-b79b-e7675b69bf7f</name>
+      <view>SettingsEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonView/SettingsEdit_view/SettingsEdit_view.aod b/neonView/SettingsEdit_view/SettingsEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5c5b013f66cec1a4cece40aa2bde9024b6f51027
--- /dev/null
+++ b/neonView/SettingsEdit_view/SettingsEdit_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>SettingsEdit_view</name>
+  <title>Settings</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Edit</name>
+      <editMode v="true" />
+      <hideEmptyFields v="false" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="true" />
+      <fields>
+        <entityFieldLink>
+          <name>603b25a8-c69c-468d-8323-40191f0c1d80</name>
+          <entityField>TEST</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>