diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb
index a3fcb20b..cf70364e 100644
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb
@@ -141,10 +141,10 @@ Partial Class frmAdmin_IDBEntity
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 465)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 463)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(837, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(837, 24)
         '
         'RibbonPage2
         '
@@ -165,7 +165,7 @@ Partial Class frmAdmin_IDBEntity
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 132)
         Me.LayoutControl1.Name = "LayoutControl1"
         Me.LayoutControl1.Root = Me.Root
-        Me.LayoutControl1.Size = New System.Drawing.Size(837, 333)
+        Me.LayoutControl1.Size = New System.Drawing.Size(837, 331)
         Me.LayoutControl1.TabIndex = 2
         Me.LayoutControl1.Text = "LayoutControl1"
         '
@@ -207,7 +207,7 @@ Partial Class frmAdmin_IDBEntity
         Me.CheckEdit1.MenuManager = Me.RibbonControl1
         Me.CheckEdit1.Name = "CheckEdit1"
         Me.CheckEdit1.Properties.Caption = "Erbt Attribute der übergeordneten Entität"
-        Me.CheckEdit1.Size = New System.Drawing.Size(797, 18)
+        Me.CheckEdit1.Size = New System.Drawing.Size(797, 20)
         Me.CheckEdit1.StyleController = Me.LayoutControl1
         Me.CheckEdit1.TabIndex = 7
         '
@@ -224,7 +224,7 @@ Partial Class frmAdmin_IDBEntity
         'txtAddedWho
         '
         Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "ADDED_WHO", True))
-        Me.txtAddedWho.Location = New System.Drawing.Point(114, 178)
+        Me.txtAddedWho.Location = New System.Drawing.Point(114, 180)
         Me.txtAddedWho.MenuManager = Me.RibbonControl1
         Me.txtAddedWho.Name = "txtAddedWho"
         Me.txtAddedWho.Size = New System.Drawing.Size(294, 20)
@@ -234,7 +234,7 @@ Partial Class frmAdmin_IDBEntity
         'TextEdit6
         '
         Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "ADDED_WHEN", True))
-        Me.TextEdit6.Location = New System.Drawing.Point(522, 178)
+        Me.TextEdit6.Location = New System.Drawing.Point(522, 180)
         Me.TextEdit6.MenuManager = Me.RibbonControl1
         Me.TextEdit6.Name = "TextEdit6"
         Me.TextEdit6.Size = New System.Drawing.Size(295, 20)
@@ -244,7 +244,7 @@ Partial Class frmAdmin_IDBEntity
         'txtChangedWho
         '
         Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "CHANGED_WHO", True))
-        Me.txtChangedWho.Location = New System.Drawing.Point(114, 218)
+        Me.txtChangedWho.Location = New System.Drawing.Point(114, 220)
         Me.txtChangedWho.MenuManager = Me.RibbonControl1
         Me.txtChangedWho.Name = "txtChangedWho"
         Me.txtChangedWho.Size = New System.Drawing.Size(294, 20)
@@ -254,7 +254,7 @@ Partial Class frmAdmin_IDBEntity
         'TextEdit8
         '
         Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "CHANGED_WHEN", True))
-        Me.TextEdit8.Location = New System.Drawing.Point(522, 218)
+        Me.TextEdit8.Location = New System.Drawing.Point(522, 220)
         Me.TextEdit8.MenuManager = Me.RibbonControl1
         Me.TextEdit8.Name = "TextEdit8"
         Me.TextEdit8.Size = New System.Drawing.Size(295, 20)
@@ -267,7 +267,7 @@ Partial Class frmAdmin_IDBEntity
         Me.Root.GroupBordersVisible = False
         Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9})
         Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(837, 333)
+        Me.Root.Size = New System.Drawing.Size(837, 331)
         Me.Root.TextVisible = False
         '
         'LayoutControlItem1
@@ -296,7 +296,7 @@ Partial Class frmAdmin_IDBEntity
         Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem4.Name = "LayoutControlItem4"
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(817, 38)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(817, 40)
         Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem4.TextVisible = False
         '
@@ -313,7 +313,7 @@ Partial Class frmAdmin_IDBEntity
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.txtAddedWho
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 158)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 160)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem6.Size = New System.Drawing.Size(408, 40)
@@ -323,17 +323,17 @@ Partial Class frmAdmin_IDBEntity
         'LayoutControlItem8
         '
         Me.LayoutControlItem8.Control = Me.txtChangedWho
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 198)
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 200)
         Me.LayoutControlItem8.Name = "LayoutControlItem8"
         Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem8.Size = New System.Drawing.Size(408, 115)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(408, 111)
         Me.LayoutControlItem8.Text = "Geändert Wer"
         Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
         '
         'LayoutControlItem7
         '
         Me.LayoutControlItem7.Control = Me.TextEdit6
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(408, 158)
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(408, 160)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
         Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem7.Size = New System.Drawing.Size(409, 40)
@@ -343,10 +343,10 @@ Partial Class frmAdmin_IDBEntity
         'LayoutControlItem9
         '
         Me.LayoutControlItem9.Control = Me.TextEdit8
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(408, 198)
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(408, 200)
         Me.LayoutControlItem9.Name = "LayoutControlItem9"
         Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem9.Size = New System.Drawing.Size(409, 115)
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(409, 111)
         Me.LayoutControlItem9.Text = "Geändert Wann"
         Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13)
         '
@@ -360,7 +360,11 @@ Partial Class frmAdmin_IDBEntity
         Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Me.TBIDB_BUSINESS_ENTITYTableAdapter
+        Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing
         Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.resx b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.resx
index d0121402..f2bace32 100644
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.resx
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.resx
@@ -150,6 +150,9 @@
   <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="TBIDB_BUSINESS_ENTITYTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>443, 17</value>
   </metadata>
diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb
index 84dc3a4b..310384f4 100644
--- a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb
@@ -40,11 +40,27 @@ Partial Class frmAdmin_User
         Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit()
         Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit()
         Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit()
+        Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit()
+        Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit()
+        Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit()
+        Me.TextEdit8 = New DevExpress.XtraEditors.TextEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.TextEdit61 = New DevExpress.XtraEditors.TextEdit()
+        Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit()
+        Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit()
+        Me.TextEdit81 = New DevExpress.XtraEditors.TextEdit()
+        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DSDD_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -54,11 +70,27 @@ Partial Class frmAdmin_User
         CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit61.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit81.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
@@ -73,7 +105,7 @@ Partial Class frmAdmin_User
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
-        Me.RibbonControl1.Size = New System.Drawing.Size(800, 63)
+        Me.RibbonControl1.Size = New System.Drawing.Size(816, 63)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
         '
@@ -114,10 +146,10 @@ Partial Class frmAdmin_User
         '
         'RibbonStatusBar1
         '
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 517)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(816, 24)
         '
         'RibbonPage2
         '
@@ -151,71 +183,122 @@ Partial Class frmAdmin_User
         Me.LayoutControl1.Controls.Add(Me.TextEdit2)
         Me.LayoutControl1.Controls.Add(Me.TextEdit3)
         Me.LayoutControl1.Controls.Add(Me.TextEdit4)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit5)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit6)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit7)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit8)
+        Me.LayoutControl1.Controls.Add(Me.txtAddedWho)
+        Me.LayoutControl1.Controls.Add(Me.txtChangedWho)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit61)
+        Me.LayoutControl1.Controls.Add(Me.TextEdit81)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 63)
         Me.LayoutControl1.Name = "LayoutControl1"
+        Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(688, 133, 1038, 537)
         Me.LayoutControl1.Root = Me.Root
-        Me.LayoutControl1.Size = New System.Drawing.Size(800, 363)
+        Me.LayoutControl1.Size = New System.Drawing.Size(816, 454)
         Me.LayoutControl1.TabIndex = 2
         Me.LayoutControl1.Text = "LayoutControl1"
         '
         'TextEdit1
         '
         Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "GUID", True))
-        Me.TextEdit1.Location = New System.Drawing.Point(133, 20)
+        Me.TextEdit1.Location = New System.Drawing.Point(114, 20)
         Me.TextEdit1.MenuManager = Me.RibbonControl1
         Me.TextEdit1.Name = "TextEdit1"
-        Me.TextEdit1.Size = New System.Drawing.Size(647, 20)
+        Me.TextEdit1.Size = New System.Drawing.Size(682, 20)
         Me.TextEdit1.StyleController = Me.LayoutControl1
         Me.TextEdit1.TabIndex = 4
         '
         'TextEdit2
         '
         Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "USERNAME", True))
-        Me.TextEdit2.Location = New System.Drawing.Point(133, 60)
+        Me.TextEdit2.Location = New System.Drawing.Point(114, 60)
         Me.TextEdit2.MenuManager = Me.RibbonControl1
         Me.TextEdit2.Name = "TextEdit2"
-        Me.TextEdit2.Size = New System.Drawing.Size(647, 20)
+        Me.TextEdit2.Size = New System.Drawing.Size(682, 20)
         Me.TextEdit2.StyleController = Me.LayoutControl1
         Me.TextEdit2.TabIndex = 5
         '
         'TextEdit3
         '
         Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "PRENAME", True))
-        Me.TextEdit3.Location = New System.Drawing.Point(133, 100)
+        Me.TextEdit3.Location = New System.Drawing.Point(114, 100)
         Me.TextEdit3.MenuManager = Me.RibbonControl1
         Me.TextEdit3.Name = "TextEdit3"
-        Me.TextEdit3.Size = New System.Drawing.Size(647, 20)
+        Me.TextEdit3.Size = New System.Drawing.Size(682, 20)
         Me.TextEdit3.StyleController = Me.LayoutControl1
         Me.TextEdit3.TabIndex = 6
         '
         'TextEdit4
         '
         Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "NAME", True))
-        Me.TextEdit4.Location = New System.Drawing.Point(133, 140)
+        Me.TextEdit4.Location = New System.Drawing.Point(114, 140)
         Me.TextEdit4.MenuManager = Me.RibbonControl1
         Me.TextEdit4.Name = "TextEdit4"
-        Me.TextEdit4.Size = New System.Drawing.Size(647, 20)
+        Me.TextEdit4.Size = New System.Drawing.Size(682, 20)
         Me.TextEdit4.StyleController = Me.LayoutControl1
         Me.TextEdit4.TabIndex = 7
         '
+        'TextEdit5
+        '
+        Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "SHORTNAME", True))
+        Me.TextEdit5.Location = New System.Drawing.Point(114, 180)
+        Me.TextEdit5.MenuManager = Me.RibbonControl1
+        Me.TextEdit5.Name = "TextEdit5"
+        Me.TextEdit5.Size = New System.Drawing.Size(682, 20)
+        Me.TextEdit5.StyleController = Me.LayoutControl1
+        Me.TextEdit5.TabIndex = 8
+        '
+        'TextEdit6
+        '
+        Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "EMAIL", True))
+        Me.TextEdit6.Location = New System.Drawing.Point(114, 220)
+        Me.TextEdit6.MenuManager = Me.RibbonControl1
+        Me.TextEdit6.Name = "TextEdit6"
+        Me.TextEdit6.Size = New System.Drawing.Size(682, 20)
+        Me.TextEdit6.StyleController = Me.LayoutControl1
+        Me.TextEdit6.TabIndex = 9
+        '
+        'TextEdit7
+        '
+        Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "LANGUAGE", True))
+        Me.TextEdit7.Location = New System.Drawing.Point(114, 260)
+        Me.TextEdit7.MenuManager = Me.RibbonControl1
+        Me.TextEdit7.Name = "TextEdit7"
+        Me.TextEdit7.Size = New System.Drawing.Size(682, 20)
+        Me.TextEdit7.StyleController = Me.LayoutControl1
+        Me.TextEdit7.TabIndex = 10
+        '
+        'TextEdit8
+        '
+        Me.TextEdit8.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_USERBindingSource, "DATE_FORMAT", True))
+        Me.TextEdit8.Location = New System.Drawing.Point(114, 300)
+        Me.TextEdit8.MenuManager = Me.RibbonControl1
+        Me.TextEdit8.Name = "TextEdit8"
+        Me.TextEdit8.Size = New System.Drawing.Size(682, 20)
+        Me.TextEdit8.StyleController = Me.LayoutControl1
+        Me.TextEdit8.TabIndex = 11
+        '
         'Root
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem12})
         Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(800, 363)
+        Me.Root.Size = New System.Drawing.Size(816, 454)
         Me.Root.TextVisible = False
         '
         'LayoutControlItem1
         '
         Me.LayoutControlItem1.Control = Me.TextEdit1
+        Me.LayoutControlItem1.Enabled = False
         Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem1.Name = "LayoutControlItem1"
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 40)
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(101, 13)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem1.Text = "ID"
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13)
         '
         'LayoutControlItem2
         '
@@ -223,8 +306,9 @@ Partial Class frmAdmin_User
         Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40)
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(101, 13)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem2.Text = "Benutzername"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13)
         '
         'LayoutControlItem3
         '
@@ -232,8 +316,9 @@ Partial Class frmAdmin_User
         Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(780, 40)
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(101, 13)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem3.Text = "Vorname"
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13)
         '
         'LayoutControlItem4
         '
@@ -241,14 +326,135 @@ Partial Class frmAdmin_User
         Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem4.Name = "LayoutControlItem4"
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(780, 223)
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(101, 13)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem4.Text = "Nachname"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem5
+        '
+        Me.LayoutControlItem5.Control = Me.TextEdit5
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160)
+        Me.LayoutControlItem5.Name = "LayoutControlItem5"
+        Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem5.Text = "Kurzname"
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem6
+        '
+        Me.LayoutControlItem6.Control = Me.TextEdit6
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 200)
+        Me.LayoutControlItem6.Name = "LayoutControlItem6"
+        Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem6.Text = "Email Adresse"
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem7
+        '
+        Me.LayoutControlItem7.Control = Me.TextEdit7
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 240)
+        Me.LayoutControlItem7.Name = "LayoutControlItem7"
+        Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem7.Text = "Sprache"
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem8
+        '
+        Me.LayoutControlItem8.Control = Me.TextEdit8
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 280)
+        Me.LayoutControlItem8.Name = "LayoutControlItem8"
+        Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(796, 40)
+        Me.LayoutControlItem8.Text = "Datumsformat"
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'TextEdit61
+        '
+        Me.TextEdit61.Location = New System.Drawing.Point(511, 340)
+        Me.TextEdit61.Name = "TextEdit61"
+        Me.TextEdit61.Size = New System.Drawing.Size(285, 20)
+        Me.TextEdit61.StyleController = Me.LayoutControl1
+        Me.TextEdit61.TabIndex = 10
+        '
+        'txtAddedWho
+        '
+        Me.txtAddedWho.Location = New System.Drawing.Point(114, 340)
+        Me.txtAddedWho.Name = "txtAddedWho"
+        Me.txtAddedWho.Size = New System.Drawing.Size(283, 20)
+        Me.txtAddedWho.StyleController = Me.LayoutControl1
+        Me.txtAddedWho.TabIndex = 9
+        '
+        'txtChangedWho
+        '
+        Me.txtChangedWho.Location = New System.Drawing.Point(114, 380)
+        Me.txtChangedWho.Name = "txtChangedWho"
+        Me.txtChangedWho.Size = New System.Drawing.Size(283, 20)
+        Me.txtChangedWho.StyleController = Me.LayoutControl1
+        Me.txtChangedWho.TabIndex = 11
+        '
+        'TextEdit81
+        '
+        Me.TextEdit81.Location = New System.Drawing.Point(511, 380)
+        Me.TextEdit81.Name = "TextEdit81"
+        Me.TextEdit81.Size = New System.Drawing.Size(285, 20)
+        Me.TextEdit81.StyleController = Me.LayoutControl1
+        Me.TextEdit81.TabIndex = 12
+        '
+        'LayoutControlItem9
+        '
+        Me.LayoutControlItem9.Control = Me.txtAddedWho
+        Me.LayoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft
+        Me.LayoutControlItem9.CustomizationFormText = "Erstellt Wer"
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 320)
+        Me.LayoutControlItem9.Name = "LayoutControlItem9"
+        Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(397, 40)
+        Me.LayoutControlItem9.Text = "Erstellt Wer"
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem10
+        '
+        Me.LayoutControlItem10.Control = Me.txtChangedWho
+        Me.LayoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft
+        Me.LayoutControlItem10.CustomizationFormText = "Geändert Wer"
+        Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 360)
+        Me.LayoutControlItem10.Name = "LayoutControlItem10"
+        Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem10.Size = New System.Drawing.Size(397, 74)
+        Me.LayoutControlItem10.Text = "Geändert Wer"
+        Me.LayoutControlItem10.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem11
+        '
+        Me.LayoutControlItem11.Control = Me.TextEdit61
+        Me.LayoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft
+        Me.LayoutControlItem11.CustomizationFormText = "Erstellt Wann"
+        Me.LayoutControlItem11.Location = New System.Drawing.Point(397, 320)
+        Me.LayoutControlItem11.Name = "LayoutControlItem11"
+        Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(399, 40)
+        Me.LayoutControlItem11.Text = "Erstellt Wann"
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(82, 13)
+        '
+        'LayoutControlItem12
+        '
+        Me.LayoutControlItem12.Control = Me.TextEdit81
+        Me.LayoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft
+        Me.LayoutControlItem12.CustomizationFormText = "Geändert Wann"
+        Me.LayoutControlItem12.Location = New System.Drawing.Point(397, 360)
+        Me.LayoutControlItem12.Name = "LayoutControlItem12"
+        Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+        Me.LayoutControlItem12.Size = New System.Drawing.Size(399, 74)
+        Me.LayoutControlItem12.Text = "Geändert Wann"
+        Me.LayoutControlItem12.TextSize = New System.Drawing.Size(82, 13)
         '
         'frmAdmin_User
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.ClientSize = New System.Drawing.Size(816, 541)
         Me.Controls.Add(Me.LayoutControl1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
@@ -265,11 +471,27 @@ Partial Class frmAdmin_User
         CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit61.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit81.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -297,4 +519,20 @@ Partial Class frmAdmin_User
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents TextEdit7 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents TextEdit8 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents txtAddedWho As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents TextEdit61 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents TextEdit81 As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem
 End Class
diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb
index e376fca3..9b043932 100644
--- a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb
@@ -44,4 +44,31 @@ Public Class frmAdmin_User
             Return False
         End Try
     End Function
+    Public Function SaveData() As Boolean
+        Try
+            TBDD_USERBindingSource.EndEdit()
+
+            If DSDD_Stammdaten.TBDD_USER.GetChanges() IsNot Nothing Then
+                HasChanges = True
+
+                If IsInsert Then
+                    txtAddedWho.EditValue = My.Application.User.UserName
+                Else
+                    txtChangedWho.EditValue = My.Application.User.UserName
+                End If
+
+                TBDD_USERBindingSource.EndEdit()
+                TBDD_USERTableAdapter.Update(DSDD_Stammdaten.TBDD_USER)
+            End If
+
+            Return True
+        Catch ex As Exception
+            ErrorHandler.ShowErrorMessage(ex, "DeleteData")
+            Return False
+        End Try
+    End Function
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+
+    End Sub
 End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Config/ClassConfig.vb b/GUIs.ZooFlow/Config/ClassConfig.vb
index 3093ff17..46360a93 100644
--- a/GUIs.ZooFlow/Config/ClassConfig.vb
+++ b/GUIs.ZooFlow/Config/ClassConfig.vb
@@ -53,7 +53,7 @@ Public Class ClassConfig
     Public Property UserLanguage As String = "de-DE"
 
     ' === Product Configuration ===
-    Public Property ProductPaths As ClassProductPaths
+    Public Property ProductPaths As New ClassProductPaths
 
     Public Class ClassProductPaths
         Public ProcessManagerPath As String
diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx
index ee5f50a7..8e6f8d80 100644
--- a/GUIs.ZooFlow/My Project/licenses.licx	
+++ b/GUIs.ZooFlow/My Project/licenses.licx	
@@ -1,20 +1,21 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb
index 0efc3b77..2cc8431a 100644
--- a/GUIs.ZooFlow/frmConfigBasic.Designer.vb
+++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb
@@ -45,6 +45,9 @@ Partial Class frmConfigBasic
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.ProcessManagerPathTextbox = New DevExpress.XtraEditors.TextEdit()
+        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.LayoutControl1.SuspendLayout()
@@ -57,6 +60,9 @@ Partial Class frmConfigBasic
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ProcessManagerPathTextbox.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
@@ -150,6 +156,7 @@ Partial Class frmConfigBasic
         Me.LayoutControl1.Controls.Add(Me.ToggleSwitchDebug)
         Me.LayoutControl1.Controls.Add(Me.Quicksearch1CB_Pos)
         Me.LayoutControl1.Controls.Add(Me.Quicksearch1TitleTextBox)
+        Me.LayoutControl1.Controls.Add(Me.ProcessManagerPathTextbox)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 158)
         Me.LayoutControl1.Name = "LayoutControl1"
@@ -194,7 +201,7 @@ Partial Class frmConfigBasic
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlGroup1, Me.LayoutControlItem4})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlGroup1, Me.LayoutControlItem4, Me.LayoutControlGroup2})
         Me.Root.Name = "Root"
         Me.Root.Size = New System.Drawing.Size(800, 268)
         Me.Root.TextVisible = False
@@ -213,7 +220,7 @@ Partial Class frmConfigBasic
         Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3})
         Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 23)
         Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(780, 225)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(780, 105)
         Me.LayoutControlGroup1.Text = "Konfiguration Schnellsuche 1"
         '
         'LayoutControlItem1
@@ -232,7 +239,7 @@ Partial Class frmConfigBasic
         Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 30)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(756, 150)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(756, 30)
         Me.LayoutControlItem3.Text = "Docking der Schnellsuche 1"
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13)
         '
@@ -247,6 +254,32 @@ Partial Class frmConfigBasic
         Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem4.TextVisible = False
         '
+        'ProcessManagerPathTextbox
+        '
+        Me.ProcessManagerPathTextbox.Location = New System.Drawing.Point(178, 173)
+        Me.ProcessManagerPathTextbox.MenuManager = Me.RibbonControl1
+        Me.ProcessManagerPathTextbox.Name = "ProcessManagerPathTextbox"
+        Me.ProcessManagerPathTextbox.Size = New System.Drawing.Size(598, 20)
+        Me.ProcessManagerPathTextbox.StyleController = Me.LayoutControl1
+        Me.ProcessManagerPathTextbox.TabIndex = 9
+        '
+        'LayoutControlItem2
+        '
+        Me.LayoutControlItem2.Control = Me.ProcessManagerPathTextbox
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem2.Name = "LayoutControlItem2"
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(756, 75)
+        Me.LayoutControlItem2.Text = "Pfad zum Process Manager"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13)
+        '
+        'LayoutControlGroup2
+        '
+        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2})
+        Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 128)
+        Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(780, 120)
+        Me.LayoutControlGroup2.Text = "Weitere Einstellungen"
+        '
         'frmConfigBasic
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -272,6 +305,9 @@ Partial Class frmConfigBasic
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ProcessManagerPathTextbox.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -288,15 +324,18 @@ Partial Class frmConfigBasic
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents Quicksearch1CB_Pos As DevExpress.XtraEditors.ComboBoxEdit
     Friend WithEvents Quicksearch1TitleTextBox As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents SkinPaletteRibbonGalleryBarItem1 As DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents SkinRibbonGalleryBarItem1 As DevExpress.XtraBars.SkinRibbonGalleryBarItem
     Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
-    Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
     Friend WithEvents ToggleSwitchDebug As DevExpress.XtraEditors.ToggleSwitch
     Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents ProcessManagerPathTextbox As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
 End Class
diff --git a/GUIs.ZooFlow/frmConfigBasic.vb b/GUIs.ZooFlow/frmConfigBasic.vb
index 8de1a8fc..f619a3a6 100644
--- a/GUIs.ZooFlow/frmConfigBasic.vb
+++ b/GUIs.ZooFlow/frmConfigBasic.vb
@@ -9,7 +9,10 @@ Public Class frmConfigBasic
 
     Private Sub frmConfigBasic_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LoadScreens()
+
+        Logger = My.LogConfig.GetLogger()
         ToggleSwitchDebug.IsOn = My.LogConfig.Debug
+
         For Each orow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows
             Select Case orow.Item("CAT_TITLE")
                 Case ClassConstants.USER_CATALOG_QUICKSEARCH1_TITLE
@@ -28,11 +31,13 @@ Public Class frmConfigBasic
                         SkinPaletteRibbonGalleryBarItem1.Gallery.SetItemCheck(oItem, True)
                     End If
 
-
-
-
             End Select
         Next
+
+        If My.SystemConfig.ProductPaths.ProcessManagerPath IsNot Nothing Then
+            ProcessManagerPathTextbox.EditValue = My.SystemConfig.ProductPaths.ProcessManagerPath
+        End If
+
         oFormLoaded = True
     End Sub
 
@@ -53,7 +58,7 @@ Public Class frmConfigBasic
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Process.Start(System.Windows.Forms.Application.LocalUserAppDataPath)
+        Process.Start(Application.LocalUserAppDataPath)
     End Sub
 
 
@@ -153,4 +158,27 @@ Public Class frmConfigBasic
         My.UIConfigManager.Save()
         bsiInfo.Caption = "DEBUG saved!"
     End Sub
+
+    Private Sub ProcessManagerPathTextbox_Leave(sender As Object, e As EventArgs) Handles ProcessManagerPathTextbox.Leave
+        Dim oProcessManagerPath As String = Utils.NotNull(ProcessManagerPathTextbox.EditValue, String.Empty)
+
+        If oProcessManagerPath.Length = 0 Then
+            My.SystemConfig.ProductPaths.ProcessManagerPath = Nothing
+            My.SystemConfigManager.Save()
+
+            bsiInfo.Caption = "Process Manager path cleared!"
+        Else
+            If Not IO.File.Exists(oProcessManagerPath) Then
+                Logger.Warn($"ProcessManager application path [{oProcessManagerPath}] does not exist!")
+
+            End If
+
+            My.SystemConfig.ProductPaths.ProcessManagerPath = oProcessManagerPath
+            My.SystemConfigManager.Save()
+
+            bsiInfo.Caption = "Process Manager path saved!"
+        End If
+
+
+    End Sub
 End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb
index 930b7805..1b7fea53 100644
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -138,7 +138,7 @@ Partial Class frmFlowForm
         '
         Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
         Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo
-        Me.PictureBoxAbo.Location = New System.Drawing.Point(147, 3)
+        Me.PictureBoxAbo.Location = New System.Drawing.Point(121, 6)
         Me.PictureBoxAbo.Name = "PictureBoxAbo"
         Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36)
         Me.PictureBoxAbo.TabIndex = 11
@@ -153,7 +153,7 @@ Partial Class frmFlowForm
         Me.PictureBoxPM.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
         Me.PictureBoxPM.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
         Me.PictureBoxPM.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
-        Me.PictureBoxPM.Location = New System.Drawing.Point(60, 114)
+        Me.PictureBoxPM.Location = New System.Drawing.Point(51, 133)
         Me.PictureBoxPM.Name = "PictureBoxPM"
         Me.PictureBoxPM.Size = New System.Drawing.Size(90, 90)
         Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
@@ -181,7 +181,7 @@ Partial Class frmFlowForm
         Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
         Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
         Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
-        Me.PictureBoxSearch1.Location = New System.Drawing.Point(60, 3)
+        Me.PictureBoxSearch1.Location = New System.Drawing.Point(51, 22)
         Me.PictureBoxSearch1.Name = "PictureBoxSearch1"
         Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90)
         Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch
@@ -248,7 +248,7 @@ Partial Class frmFlowForm
         Me.PictureBoxGlobix.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
         Me.PictureBoxGlobix.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
         Me.PictureBoxGlobix.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
-        Me.PictureBoxGlobix.Location = New System.Drawing.Point(60, 222)
+        Me.PictureBoxGlobix.Location = New System.Drawing.Point(51, 241)
         Me.PictureBoxGlobix.Name = "PictureBoxGlobix"
         Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 90)
         Me.PictureBoxGlobix.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
@@ -269,9 +269,9 @@ Partial Class frmFlowForm
         '
         'Panel2
         '
+        Me.Panel2.Controls.Add(Me.PictureBoxAbo)
         Me.Panel2.Controls.Add(Me.PictureBoxSearch1)
         Me.Panel2.Controls.Add(Me.PictureBoxGlobix)
-        Me.Panel2.Controls.Add(Me.PictureBoxAbo)
         Me.Panel2.Controls.Add(Me.PictureBoxPM)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel2.Location = New System.Drawing.Point(0, 73)
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 8e53bc0f..3c697605 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -153,6 +153,7 @@ Public Class frmFlowForm
 
     ' Constants
     Private Const OPACITY_INITIAL = 0
+    Private Const OPACITY_FINAL = 1
     Private Const OPACITY_HIDDEN = 0.65
     Private Const OPACITY_SHOWN = 0.85
 
@@ -184,7 +185,7 @@ Public Class frmFlowForm
     Private ESCHitCount As Integer = 0
     Private IndexForm As frmGlobix_Index
     Private AdminForm As frmAdmin_Start
-
+    Private InitialOverlayHandle As IOverlaySplashScreenHandle
 
     Private RunningTask As Task
     Private RunningTaskTokenSource As New CancellationTokenSource
@@ -196,6 +197,9 @@ Public Class frmFlowForm
     Private WithEvents Watcher As Watcher = Watcher.Singleton
 
     Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load
+        ' === Set Form ===
+        OverlayWindowOptions.Default.DisableInput = False
+
         ' === Show Splash Screen ===
         SplashScreenManager.ShowForm(Me, GetType(frmSplash), False, False)
 
@@ -207,6 +211,8 @@ Public Class frmFlowForm
 
         ' === Register Sidebar ===
         RegisterBar(ABEdge.ABE_RIGHT)
+
+        Enabled = False
     End Sub
 
     Private Sub frmFlowForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -215,14 +221,10 @@ Public Class frmFlowForm
 
     Private Async Function Init_Completed(sender As Object, e As EventArgs) As Threading.Tasks.Task
         Try
-            Cursor = Cursors.WaitCursor
             ' === Initialization Complete ===
             ApplicationLoading = False
             SplashScreenManager.CloseForm(False)
 
-            ' === Set Form ===
-            OverlayWindowOptions.Default.DisableInput = False
-
             ' === Initialize Environment ===
             Logger = My.LogConfig.GetLogger()
             Environment = My.Application.GetEnvironment()
@@ -329,8 +331,11 @@ Public Class frmFlowForm
             End If
 
 
-            'Dim oPMPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager)
-
+            Dim oProcessManagerPath = Modules.GetProductPath(Base.ECM.Product.ProcessManager)
+            If oProcessManagerPath IsNot Nothing Then
+                My.SystemConfig.ProductPaths.ProcessManagerPath = oProcessManagerPath
+                My.SystemConfigManager.Save()
+            End If
 
             ' TODO: This needs an update of the function FNZF_GET_MODULE_INFO
             If My.Application.ModulesActive.Contains(MODULE_PROCESS_MANAGER) Then
@@ -349,8 +354,7 @@ Public Class frmFlowForm
             Logger.Error(ex)
 
         Finally
-            Cursor = Cursors.Default
-
+            Enabled = True
         End Try
     End Function
     Async Function ConfigureQuicksearch1(Reload As Boolean) As Threading.Tasks.Task
@@ -1270,7 +1274,6 @@ Public Class frmFlowForm
     Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click
         Try
             Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager)
-
             If oProcessManagerPath IsNot Nothing AndAlso IO.File.Exists(oProcessManagerPath) Then
                 Process.Start(oProcessManagerPath)
             End If
diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb
index e45181a5..a2849bfd 100644
--- a/GUIs.ZooFlow/modCurrent.vb
+++ b/GUIs.ZooFlow/modCurrent.vb
@@ -3,10 +3,6 @@ Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Config
 
 Module modCurrent
-    Public Property APPLICATION_THEME = ""
-    Public Property APPLICATION_PALETTE = ""
-
-
     Public Property CURR_MISSING_PATTERN_NAME = "Email To"
     Public Property CURR_MISSING_SEARCH_STRING = String.Empty
     Public Property CURR_MISSING_MANUAL_VALUE = String.Empty