diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb
index 6a29a4c3..4239c406 100644
--- a/GUIs.ZooFlow/My Project/Resources.Designer.vb	
+++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb	
@@ -860,6 +860,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property gear_32xLG() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("gear_32xLG", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx
index 678cd839..ae0d358c 100644
--- a/GUIs.ZooFlow/My Project/Resources.resx	
+++ b/GUIs.ZooFlow/My Project/Resources.resx	
@@ -136,14 +136,17 @@
   <data name="doublenext2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_addcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_deletecircled6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -154,6 +157,9 @@
   <data name="definednameuseinformula" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -169,11 +175,14 @@
   <data name="about2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="save4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="actions_addcircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_check4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -184,9 +193,6 @@
   <data name="actions_window" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="ZOO_FLOW_ sysicon_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -202,9 +208,6 @@
   <data name="CW_GEFUNDEN_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="actions_check2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="definednameuseinformula1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -244,15 +247,12 @@
   <data name="save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="doublenext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="del1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -262,18 +262,21 @@
   <data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="actions_check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="editnames" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="actions_addcircled5" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="save7" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -298,20 +301,17 @@
   <data name="ZooFlow_CW_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="ZooFlow-25" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="insertsheet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="3_PERSON_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="actions_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_addcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -331,35 +331,35 @@
   <data name="about3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="doublenext" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="del4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_addcircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bo_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="save4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="pagesetup1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -376,29 +376,29 @@
   <data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="1_LOGO_ZOO_FLOW1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="actions_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_deletecircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_check2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_addcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -406,11 +406,14 @@
   <data name="crossdatasourcefiltering" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_check5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="Flow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -418,14 +421,14 @@
   <data name="bo_appearance1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_appearance1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="3_PERSON_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="2_LUPE_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -442,13 +445,13 @@
   <data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="GLOBIX_short" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="actions_check5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="gear_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/gear_32xLG.png b/GUIs.ZooFlow/Resources/gear_32xLG.png
new file mode 100644
index 00000000..eb7b43cd
Binary files /dev/null and b/GUIs.ZooFlow/Resources/gear_32xLG.png differ
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 3cbc7293..016bb41b 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -892,6 +892,9 @@
   <ItemGroup>
     <None Include="Resources\actions_check6.svg" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\gear_32xLG.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GUIs.ZooFlow/frmConfigDatabase.Designer.vb b/GUIs.ZooFlow/frmConfigDatabase.Designer.vb
index 309c7dcb..136b8e39 100644
--- a/GUIs.ZooFlow/frmConfigDatabase.Designer.vb
+++ b/GUIs.ZooFlow/frmConfigDatabase.Designer.vb
@@ -77,34 +77,34 @@ Partial Class frmConfigDatabase
         '
         'txtServerName
         '
-        Me.txtServerName.Location = New System.Drawing.Point(148, 15)
+        Me.txtServerName.Location = New System.Drawing.Point(160, 15)
         Me.txtServerName.Name = "txtServerName"
-        Me.txtServerName.Size = New System.Drawing.Size(439, 20)
+        Me.txtServerName.Size = New System.Drawing.Size(427, 20)
         Me.txtServerName.StyleController = Me.LayoutControl1
         Me.txtServerName.TabIndex = 4
         '
         'txtUserName
         '
-        Me.txtUserName.Location = New System.Drawing.Point(148, 45)
+        Me.txtUserName.Location = New System.Drawing.Point(160, 45)
         Me.txtUserName.Name = "txtUserName"
-        Me.txtUserName.Size = New System.Drawing.Size(148, 20)
+        Me.txtUserName.Size = New System.Drawing.Size(136, 20)
         Me.txtUserName.StyleController = Me.LayoutControl1
         Me.txtUserName.TabIndex = 5
         '
         'txtPassword
         '
-        Me.txtPassword.Location = New System.Drawing.Point(439, 45)
+        Me.txtPassword.Location = New System.Drawing.Point(451, 45)
         Me.txtPassword.Name = "txtPassword"
-        Me.txtPassword.Size = New System.Drawing.Size(148, 20)
+        Me.txtPassword.Size = New System.Drawing.Size(136, 20)
         Me.txtPassword.StyleController = Me.LayoutControl1
         Me.txtPassword.TabIndex = 6
         '
         'cmbDatabase
         '
-        Me.cmbDatabase.Location = New System.Drawing.Point(148, 75)
+        Me.cmbDatabase.Location = New System.Drawing.Point(160, 75)
         Me.cmbDatabase.Name = "cmbDatabase"
         Me.cmbDatabase.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.cmbDatabase.Size = New System.Drawing.Size(439, 20)
+        Me.cmbDatabase.Size = New System.Drawing.Size(427, 20)
         Me.cmbDatabase.StyleController = Me.LayoutControl1
         Me.cmbDatabase.TabIndex = 7
         '
@@ -112,7 +112,7 @@ Partial Class frmConfigDatabase
         '
         Me.btnTestConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check4
         Me.btnTestConnection.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.btnTestConnection.Location = New System.Drawing.Point(303, 166)
+        Me.btnTestConnection.Location = New System.Drawing.Point(303, 164)
         Me.btnTestConnection.Name = "btnTestConnection"
         Me.btnTestConnection.Size = New System.Drawing.Size(287, 22)
         Me.btnTestConnection.StyleController = Me.LayoutControl1
@@ -121,10 +121,10 @@ Partial Class frmConfigDatabase
         '
         'txtConnectionString
         '
-        Me.txtConnectionString.Location = New System.Drawing.Point(148, 139)
+        Me.txtConnectionString.Location = New System.Drawing.Point(160, 137)
         Me.txtConnectionString.Name = "txtConnectionString"
         Me.txtConnectionString.Properties.ReadOnly = True
-        Me.txtConnectionString.Size = New System.Drawing.Size(439, 20)
+        Me.txtConnectionString.Size = New System.Drawing.Size(427, 20)
         Me.txtConnectionString.StyleController = Me.LayoutControl1
         Me.txtConnectionString.TabIndex = 9
         '
@@ -133,7 +133,7 @@ Partial Class frmConfigDatabase
         Me.chkWinAuth.Location = New System.Drawing.Point(17, 107)
         Me.chkWinAuth.Name = "chkWinAuth"
         Me.chkWinAuth.Properties.Caption = "Windows Authentifizierung"
-        Me.chkWinAuth.Size = New System.Drawing.Size(568, 20)
+        Me.chkWinAuth.Size = New System.Drawing.Size(568, 18)
         Me.chkWinAuth.StyleController = Me.LayoutControl1
         Me.chkWinAuth.TabIndex = 10
         '
@@ -154,7 +154,7 @@ Partial Class frmConfigDatabase
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem1.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem1.Text = "Server Name:"
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem2
         '
@@ -164,7 +164,7 @@ Partial Class frmConfigDatabase
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(291, 30)
         Me.LayoutControlItem2.Text = "Benutzername:"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem4
         '
@@ -174,7 +174,7 @@ Partial Class frmConfigDatabase
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem4.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem4.Text = "Datenbank:"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem3
         '
@@ -184,14 +184,14 @@ Partial Class frmConfigDatabase
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem3.Size = New System.Drawing.Size(291, 30)
         Me.LayoutControlItem3.Text = "Passwort:"
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem7
         '
         Me.LayoutControlItem7.Control = Me.chkWinAuth
         Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 90)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
-        Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 34)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 32)
         Me.LayoutControlItem7.Spacing = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem7.TextVisible = False
@@ -199,28 +199,28 @@ Partial Class frmConfigDatabase
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.txtConnectionString
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 124)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 122)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem6.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem6.Text = "Aktueller Connectionstring:"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.btnTestConnection
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 154)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 152)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
-        Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 47)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 49)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem5.TextVisible = False
         '
         'EmptySpaceItem2
         '
         Me.EmptySpaceItem2.AllowHotTrack = False
-        Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 154)
+        Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 152)
         Me.EmptySpaceItem2.Name = "EmptySpaceItem2"
-        Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 47)
+        Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 49)
         Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0)
         '
         'frmConfigDatabase
diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb
index cd3834a7..2e14073e 100644
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -35,8 +35,9 @@ Partial Class frmFlowForm
         Me.DatenbankverbindungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.PictureBoxAbo = New System.Windows.Forms.PictureBox()
@@ -49,7 +50,6 @@ Partial Class frmFlowForm
         Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
         Me.ContextMenuSystray.SuspendLayout()
         CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -112,22 +112,28 @@ Partial Class frmFlowForm
         '
         'VerwaltungToolStripMenuItem
         '
+        Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG
         Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
         Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
         '
-        'ZooFlowBeendenToolStripMenuItem
-        '
-        Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
-        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
-        '
         'TestToolStripMenuItem
         '
         Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
         Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.TestToolStripMenuItem.Text = "Test"
         '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
+        '
+        'ZooFlowBeendenToolStripMenuItem
+        '
+        Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
+        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
+        '
         'PictureBoxAbo
         '
         Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
@@ -197,6 +203,7 @@ Partial Class frmFlowForm
         Me.PictureBoxPM1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_PM_DevExpress
         Me.PictureBoxPM1.TabIndex = 14
         Me.PictureBoxPM1.Text = "SvgImageBox1"
+        Me.ToolTip1.SetToolTip(Me.PictureBoxPM1, "ProcessManager - Workflow")
         '
         'PictureBox1
         '
@@ -222,11 +229,6 @@ Partial Class frmFlowForm
         Me.PictureBoxSearch1.TabIndex = 13
         Me.PictureBoxSearch1.Text = "SvgImageBox1"
         '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
-        '
         'frmFlowForm
         '
         Me.AllowDrop = True
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 5f044837..708b6fb5 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -204,16 +204,16 @@ Public Class frmFlowForm
         Next
 
         AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
-
-        Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
-        Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
+        Dim oSQL As String
+        '        Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
+        'Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
         PictureBoxSearch1.Visible = False
 
-        If Not IsNothing(oDatatable) OrElse oDatatable.Rows.Count > 0 Then
-            IDBSearchActive = True
-            DTIDB_SEARCHES = oDatatable
-            PictureBoxSearch1.Visible = True
-        End If
+        'If Not IsNothing(oDatatable) OrElse oDatatable.Rows.Count > 0 Then
+        '    IDBSearchActive = True
+        '    DTIDB_SEARCHES = oDatatable
+        '    PictureBoxSearch1.Visible = True
+        'End If
 
         If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
             Try
@@ -1011,5 +1011,9 @@ Public Class frmFlowForm
         frmtest.Show()
 
     End Sub
+
+    Private Sub PictureBoxGlobix1_Click(sender As Object, e As EventArgs) Handles PictureBoxGlobix1.Click
+
+    End Sub
 End Class
 
diff --git a/Modules.Messaging/Email.vb b/Modules.Messaging/Email.vb
index 4de01a35..85e3b606 100644
--- a/Modules.Messaging/Email.vb
+++ b/Modules.Messaging/Email.vb
@@ -18,107 +18,107 @@ Public Class Email
         _logConfig = LogConfig
     End Sub
 
-    ''' <summary>
-    ''' Tests connection to a given IMAP Server by connecting and doing a simple message query.
-    ''' </summary>
-    ''' <param name="Server">IP-Address or Domainname of Server</param>
-    ''' <param name="Port">IMAP-Port</param>
-    ''' <param name="Username">IMAP-Username</param>
-    ''' <param name="Password">IMAP-Password</param>
-    ''' <param name="Folder">The folder to fetch messages from. Defaults to `Inbox`</param>
-    ''' <returns>True if connection and query were successful. False otherwise.</returns>
-    Public Function TestIMAPLogin(Server As String, Port As Integer, Username As String, Password As String, Optional Folder As String = "Inbox") As Boolean
-        _logger.Debug("Testing Login to Server {0}:{1} with user {2}", Server, Port, Username)
+    '''' <summary>
+    '''' Tests connection to a given IMAP Server by connecting and doing a simple message query.
+    '''' </summary>
+    '''' <param name="Server">IP-Address or Domainname of Server</param>
+    '''' <param name="Port">IMAP-Port</param>
+    '''' <param name="Username">IMAP-Username</param>
+    '''' <param name="Password">IMAP-Password</param>
+    '''' <param name="Folder">The folder to fetch messages from. Defaults to `Inbox`</param>
+    '''' <returns>True if connection and query were successful. False otherwise.</returns>
+    'Public Function TestIMAPLogin(Server As String, Port As Integer, Username As String, Password As String, Optional Folder As String = "Inbox") As Boolean
+    '    _logger.Debug("Testing Login to Server {0}:{1} with user {2}", Server, Port, Username)
 
-        Try
-            _logger.Debug("Connecting...")
-            Using oClient As New S22.Imap.ImapClient(Server, Port, Username, Password, S22.Imap.AuthMethod.Login, True)
-                If Not oClient.Authed Then
-                    _logger.Warn("Connected to server but authentication failed.")
-                    Return False
-                End If
-                _logger.Debug("Connection successful")
+    '    Try
+    '        _logger.Debug("Connecting...")
+    '        Using oClient As New S22.Imap.ImapClient(Server, Port, Username, Password, S22.Imap.AuthMethod.Login, True)
+    '            If Not oClient.Authed Then
+    '                _logger.Warn("Connected to server but authentication failed.")
+    '                Return False
+    '            End If
+    '            _logger.Debug("Connection successful")
 
-                _logger.Debug("Fetching MessageIds..")
-                Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Folder)
+    '            _logger.Debug("Fetching MessageIds..")
+    '            Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Folder)
 
-                _logger.Debug("Found {0} messages", oMessageIds.Count)
-                _logger.Debug("Fetching messages...")
+    '            _logger.Debug("Found {0} messages", oMessageIds.Count)
+    '            _logger.Debug("Fetching messages...")
 
-                Dim oMessages As IEnumerable(Of MailMessage) = oClient.GetMessages(oMessageIds, False, Folder)
-                _logger.Debug("Messages fetched")
+    '            Dim oMessages As IEnumerable(Of MailMessage) = oClient.GetMessages(oMessageIds, False, Folder)
+    '            _logger.Debug("Messages fetched")
 
-                oClient.Dispose()
+    '            oClient.Dispose()
 
-                Return True
-            End Using
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
+    '            Return True
+    '        End Using
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
+    '        Return False
+    '    End Try
+    'End Function
 
-    ''' <summary>
-    ''' Connects to an IMAP Server with the given credentials and
-    ''' fetches emails from the given folder.
-    ''' Results can be filtered with `SearchCondition`
-    ''' </summary>
-    ''' <param name="Server">IP-Address or Domainname of Server</param>
-    ''' <param name="Port">IMAP-Port</param>
-    ''' <param name="Username">IMAP-Username</param>
-    ''' <param name="Password">IMAP-Password</param>
-    ''' <param name="Folder">The folder to fetch messages from</param>
-    ''' <param name="SearchCondition">Filter the search command. Defaults to `All`</param>
-    ''' <returns>A list of Independentsoft.Email.Mime.Message objects</returns>
-    Public Function FetchIMAPMessages(Server As String, Port As Integer, Username As String, Password As String, Folder As String) As List(Of Message) ', Optional SearchCondition As S22.Imap.SearchCondition = S22.Imap.SearchCondition.All
-        Dim oMessages As New List(Of Message)
+    '''' <summary>
+    '''' Connects to an IMAP Server with the given credentials and
+    '''' fetches emails from the given folder.
+    '''' Results can be filtered with `SearchCondition`
+    '''' </summary>
+    '''' <param name="Server">IP-Address or Domainname of Server</param>
+    '''' <param name="Port">IMAP-Port</param>
+    '''' <param name="Username">IMAP-Username</param>
+    '''' <param name="Password">IMAP-Password</param>
+    '''' <param name="Folder">The folder to fetch messages from</param>
+    '''' <param name="SearchCondition">Filter the search command. Defaults to `All`</param>
+    '''' <returns>A list of Independentsoft.Email.Mime.Message objects</returns>
+    'Public Function FetchIMAPMessages(Server As String, Port As Integer, Username As String, Password As String, Folder As String) As List(Of Message) ', Optional SearchCondition As S22.Imap.SearchCondition = S22.Imap.SearchCondition.All
+    '    Dim oMessages As New List(Of Message)
 
-        _logger.Debug("Connecting to Server {0}:{1} with user {2}", Server, Port, Username)
+    '    _logger.Debug("Connecting to Server {0}:{1} with user {2}", Server, Port, Username)
 
-        Try
-            _logger.Debug("Connecting...")
-            Using oClient As New S22.Imap.ImapClient(Server, Port, Username, Password, S22.Imap.AuthMethod.Login, True)
-                If Not oClient.Authed Then
-                    _logger.Warn("Connected to server but authentication failed.")
-                    Return Nothing
-                End If
-                _logger.Debug("Connection successful")
+    '    Try
+    '        _logger.Debug("Connecting...")
+    '        Using oClient As New S22.Imap.ImapClient(Server, Port, Username, Password, S22.Imap.AuthMethod.Login, True)
+    '            If Not oClient.Authed Then
+    '                _logger.Warn("Connected to server but authentication failed.")
+    '                Return Nothing
+    '            End If
+    '            _logger.Debug("Connection successful")
 
-                _logger.Debug("Fetching MessageIds..")
-                Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Folder)
+    '            _logger.Debug("Fetching MessageIds..")
+    '            Dim oMessageIds As IEnumerable(Of UInteger) = oClient.Search(S22.Imap.SearchCondition.Unseen, Folder)
 
-                _logger.Debug("Found {0} messages", oMessageIds.Count)
-                _logger.Debug("Fetching messages...")
+    '            _logger.Debug("Found {0} messages", oMessageIds.Count)
+    '            _logger.Debug("Fetching messages...")
 
-                ' Since this needs to return a list of IndependentSoft Message objects,
-                ' we 'convert' the .NET MailMessage objects that are fetched from the server
-                ' by writing them temporarily to disk as an eml file and then reading them back into a Message object.
-                ' This approach uses an unintended use of internal .NET APIs and may break in the future.
-                For Each oMessageId As UInteger In oMessageIds
-                    Dim oMessage = oClient.GetMessage(oMessageId, False, Folder)
-                    Dim oTempPath = Path.GetTempFileName()
-                    Dim oResult = WriteMessageToFile(oMessage, oTempPath)
+    '            ' Since this needs to return a list of IndependentSoft Message objects,
+    '            ' we 'convert' the .NET MailMessage objects that are fetched from the server
+    '            ' by writing them temporarily to disk as an eml file and then reading them back into a Message object.
+    '            ' This approach uses an unintended use of internal .NET APIs and may break in the future.
+    '            For Each oMessageId As UInteger In oMessageIds
+    '                Dim oMessage = oClient.GetMessage(oMessageId, False, Folder)
+    '                Dim oTempPath = Path.GetTempFileName()
+    '                Dim oResult = WriteMessageToFile(oMessage, oTempPath)
 
-                    Dim oMsg As New Message(oTempPath)
-                    oMessages.Add(oMsg)
+    '                Dim oMsg As New Message(oTempPath)
+    '                oMessages.Add(oMsg)
 
-                    Try
-                        File.Delete(oTempPath)
-                    Catch ex As Exception
-                        _logger.Error(ex)
-                        _logger.Warn("Temp file could not be deleted")
-                    End Try
-                Next
+    '                Try
+    '                    File.Delete(oTempPath)
+    '                Catch ex As Exception
+    '                    _logger.Error(ex)
+    '                    _logger.Warn("Temp file could not be deleted")
+    '                End Try
+    '            Next
 
-                _logger.Debug("{0} Messages fetched", oMessages.Count)
-            End Using
+    '            _logger.Debug("{0} Messages fetched", oMessages.Count)
+    '        End Using
 
-            Return oMessages
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return Nothing
-        End Try
-    End Function
+    '        Return oMessages
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
+    '        Return Nothing
+    '    End Try
+    'End Function
 
     ''' <summary>
     ''' Uses a private API from MailWriter to write a MailMessage to disk.
@@ -144,120 +144,120 @@ Public Class Email
         End Try
     End Function
 
-    Public Function IMAP_COLLECT(INBOXNAME As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
-        Try
-            Dim oMAIL_LIST As New ArrayList()
-            _logger.Info(String.Format("Working on IMAP_COLLECT..."))
-            Dim oClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
-            oClient.Connect()
-            oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
-            oClient.SelectFolder("Inbox")
-            Dim oEnvelopes As Envelope() = oClient.ListMessages()
-            For i As Integer = 0 To oEnvelopes.Length - 1
-                If Not IsNothing(oEnvelopes(i).Subject) Then
-                    'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then
-                    _logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}")
-                    Dim message As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID)
-                    If Not IsNothing(message) Then
-                        oMAIL_LIST.Add(message)
-                    End If
-                    'End If
-                End If
-            Next
+    'Public Function IMAP_COLLECT(INBOXNAME As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
+    '    Try
+    '        Dim oMAIL_LIST As New ArrayList()
+    '        _logger.Info(String.Format("Working on IMAP_COLLECT..."))
+    '        Dim oClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
+    '        oClient.Connect()
+    '        oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '        oClient.SelectFolder("Inbox")
+    '        Dim oEnvelopes As Envelope() = oClient.ListMessages()
+    '        For i As Integer = 0 To oEnvelopes.Length - 1
+    '            If Not IsNothing(oEnvelopes(i).Subject) Then
+    '                'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then
+    '                _logger.Info($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}")
+    '                Dim message As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID)
+    '                If Not IsNothing(message) Then
+    '                    oMAIL_LIST.Add(message)
+    '                End If
+    '                'End If
+    '            End If
+    '        Next
 
-            oClient.Disconnect()
-            _logger.Debug("IMAP_COLLECT finished!")
-            Return oMAIL_LIST
+    '        oClient.Disconnect()
+    '        _logger.Debug("IMAP_COLLECT finished!")
+    '        Return oMAIL_LIST
 
-        Catch ex As Exception
-            _logger.Error(ex, "Unexpected Error in IMAP COLLECT:")
-            Return Nothing
-        End Try
-    End Function
-    Public Function TEST_IMAP_COLLECT(INBOXNAME As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
-        Try
+    '    Catch ex As Exception
+    '        _logger.Error(ex, "Unexpected Error in IMAP COLLECT:")
+    '        Return Nothing
+    '    End Try
+    'End Function
+    'Public Function TEST_IMAP_COLLECT(INBOXNAME As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
+    '    Try
 
-            _logger.Info(String.Format("Working on TEST_IMAP_COLLECT....."))
-            Dim oClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
-            oClient.Connect()
-            oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
-            oClient.SelectFolder(INBOXNAME)
-            Dim oEnvelopes As Envelope() = oClient.ListMessages()
+    '        _logger.Info(String.Format("Working on TEST_IMAP_COLLECT....."))
+    '        Dim oClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
+    '        oClient.Connect()
+    '        oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '        oClient.SelectFolder(INBOXNAME)
+    '        Dim oEnvelopes As Envelope() = oClient.ListMessages()
 
-            For i As Integer = 0 To oEnvelopes.Length - 1
-                If Not IsNothing(oEnvelopes(i).Subject) Then
-                    'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then
-                    MsgBox($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}")
-                    Dim message As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID)
-                End If
-            Next
-            oClient.Disconnect()
-            _logger.Info("TEST_IMAP_COLLECT finished!")
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex, "Unexpected Error in TEST_IMAP_COLLECT:")
-            Return False
-        End Try
-    End Function
-    Public Function POP3_COLLECT(MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
-        Try
-            Dim oMAIL_LIST As New ArrayList()
-            _logger.Debug(String.Format("Working on POP3_COLLECT....."))
-            Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
+    '        For i As Integer = 0 To oEnvelopes.Length - 1
+    '            If Not IsNothing(oEnvelopes(i).Subject) Then
+    '                'If envelopes(i).Subject.ToString.ToUpper.Contains("[PROCESSMANAGER]") Or envelopes(i).Subject.ToString.ToUpper.Contains("[ADDI]") Then
+    '                MsgBox($"Working on email: UniqueID: {oEnvelopes(i).UniqueID} - Subject:{oEnvelopes(i).Subject} - Date {oEnvelopes(i).Date.ToString}")
+    '                Dim message As Mime.Message = oClient.GetMessage(oEnvelopes(i).UniqueID)
+    '            End If
+    '        Next
+    '        oClient.Disconnect()
+    '        _logger.Info("TEST_IMAP_COLLECT finished!")
+    '        Return True
+    '    Catch ex As Exception
+    '        _logger.Error(ex, "Unexpected Error in TEST_IMAP_COLLECT:")
+    '        Return False
+    '    End Try
+    'End Function
+    'Public Function POP3_COLLECT(MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
+    '    Try
+    '        Dim oMAIL_LIST As New ArrayList()
+    '        _logger.Debug(String.Format("Working on POP3_COLLECT....."))
+    '        Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
 
-            oClient.ValidateRemoteCertificate = False
-            oClient.Connect()
-            _logger.Debug(String.Format("..connected!"))
-            oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '        oClient.ValidateRemoteCertificate = False
+    '        oClient.Connect()
+    '        _logger.Debug(String.Format("..connected!"))
+    '        oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
 
-            Dim oMessageInfo As MessageInfo() = oClient.List()
+    '        Dim oMessageInfo As MessageInfo() = oClient.List()
 
-            For i As Integer = 0 To oMessageInfo.Length - 1
-                Dim message As Message = oClient.GetMessage(oMessageInfo(i).Index)
-                oMAIL_LIST.Add(message)
-                Try
-                    _logger.Debug(String.Format("Message [{0}] added", message.Subject))
-                Catch ex As Exception
+    '        For i As Integer = 0 To oMessageInfo.Length - 1
+    '            Dim message As Message = oClient.GetMessage(oMessageInfo(i).Index)
+    '            oMAIL_LIST.Add(message)
+    '            Try
+    '                _logger.Debug(String.Format("Message [{0}] added", message.Subject))
+    '            Catch ex As Exception
 
-                End Try
-            Next
+    '            End Try
+    '        Next
 
-            oClient.Disconnect()
-            _logger.Debug(String.Format(" POP3_COLLECT finished!"))
-            Return oMAIL_LIST
-        Catch ex As Exception
-            _logger.Error(ex)
+    '        oClient.Disconnect()
+    '        _logger.Debug(String.Format(" POP3_COLLECT finished!"))
+    '        Return oMAIL_LIST
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
 
-            Return Nothing
-        End Try
-    End Function
-    Public Function TEST_POP3_COLLECT(MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String) As Boolean
-        Try
-            _logger.Debug(String.Format("Working on TEST_POP3_COLLECT..."))
-            Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
+    '        Return Nothing
+    '    End Try
+    'End Function
+    'Public Function TEST_POP3_COLLECT(MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String) As Boolean
+    '    Try
+    '        _logger.Debug(String.Format("Working on TEST_POP3_COLLECT..."))
+    '        Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
 
-            oClient.ValidateRemoteCertificate = False
-            oClient.Connect()
-            _logger.Debug(String.Format("..connected!"))
-            oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '        oClient.ValidateRemoteCertificate = False
+    '        oClient.Connect()
+    '        _logger.Debug(String.Format("..connected!"))
+    '        oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
 
-            Dim messageInfo As MessageInfo() = oClient.List()
+    '        Dim messageInfo As MessageInfo() = oClient.List()
 
-            For i As Integer = 0 To messageInfo.Length - 1
-                Dim message As Message = oClient.GetMessage(messageInfo(i).Index)
-                MsgBox(String.Format("Message [{0}] added", message.Subject))
+    '        For i As Integer = 0 To messageInfo.Length - 1
+    '            Dim message As Message = oClient.GetMessage(messageInfo(i).Index)
+    '            MsgBox(String.Format("Message [{0}] added", message.Subject))
 
-            Next
+    '        Next
 
-            oClient.Disconnect()
-            MsgBox(String.Format("TEST_POP3_COLLECT finished!"))
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
+    '        oClient.Disconnect()
+    '        MsgBox(String.Format("TEST_POP3_COLLECT finished!"))
+    '        Return True
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
 
-            Return False
-        End Try
-    End Function
+    '        Return False
+    '    End Try
+    'End Function
     Public Function NewEmail(mailto As String, mailSubject As String, mailBody As String,
                                                       mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
                                                       AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attachmentString As String = "", Optional Test As Boolean = False)
@@ -363,197 +363,197 @@ Public Class Email
         End Try
 
     End Function
-    Public Function New_EmailISoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
-                                                     from_mailaddress As String, from_name As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
-                                                     AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attment As String = "")
-        Try
-            Err_Message = ""
-            _msg_Send = False
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
-            _logger.Debug($"in Email_Send_Independentsoft..")
-            Dim empfaenger As String()
-            If mailto.Contains(";") Then
-                empfaenger = mailto.Split(";")
-            Else
-                ReDim Preserve empfaenger(0)
-                empfaenger(0) = mailto
-            End If
-            Dim _error As Boolean = False
-            'Für jeden Empfänger eine Neue Mail erzeugen
-            For Each _mailempfaenger As String In empfaenger
-                _logger.Debug($"Working on email for {_mailempfaenger}..")
-                Try
-                    Dim oMessage As New Message()
-                    oMessage.From = New Mailbox(from_mailaddress, from_name)
+    'Public Function New_EmailISoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
+    '                                                 from_mailaddress As String, from_name As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
+    '                                                 AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attment As String = "")
+    '    Try
+    '        Err_Message = ""
+    '        _msg_Send = False
+    '        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
+    '        _logger.Debug($"in Email_Send_Independentsoft..")
+    '        Dim empfaenger As String()
+    '        If mailto.Contains(";") Then
+    '            empfaenger = mailto.Split(";")
+    '        Else
+    '            ReDim Preserve empfaenger(0)
+    '            empfaenger(0) = mailto
+    '        End If
+    '        Dim _error As Boolean = False
+    '        'Für jeden Empfänger eine Neue Mail erzeugen
+    '        For Each _mailempfaenger As String In empfaenger
+    '            _logger.Debug($"Working on email for {_mailempfaenger}..")
+    '            Try
+    '                Dim oMessage As New Message()
+    '                oMessage.From = New Mailbox(from_mailaddress, from_name)
 
-                    oMessage.[To].Add(New Mailbox(_mailempfaenger))
-                    oMessage.Subject = mailSubject
-                    _logger.Debug($"Message created..")
-                    Dim textBodyPart As New BodyPart()
-                    textBodyPart.ContentType = New ContentType("text", "html", "utf-8")
-                    textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable
-                    textBodyPart.Body = mailBody
-                    oMessage.BodyParts.Add(textBodyPart)
-                    If attment <> String.Empty Then
-                        If System.IO.File.Exists(attment) Then
-                            Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment)
-                            If attment.ToLower.EndsWith("pdf") Then
-                                attachment1.ContentType = New ContentType("application", "pdf")
-                            ElseIf attment.ToLower.EndsWith("jpg") Then
-                                attachment1.ContentType = New ContentType("application", "jpg")
-                            ElseIf attment.ToLower.EndsWith("docx") Then
-                                attachment1.ContentType = New ContentType("application", "MS-word")
-                            End If
-                            oMessage.BodyParts.Add(attachment1)
-                        Else
-                            _logger.Warn($"Attachment {attment.ToString} is not existing!")
-                        End If
-                    End If
-                    Dim client As Independentsoft.Email.Smtp.SmtpClient
-                    Try
-                        client = New Independentsoft.Email.Smtp.SmtpClient(mailsmtp, mailport)
-                    Catch ex As Exception
-                        _logger.Warn("clsEmail.Create Client: " & ex.Message)
-                        _error = True
-                        Continue For
-                    End Try
-                    Try
-                        client.Connect()
-                    Catch ex As Exception
-                        _logger.Warn("clsEmail.Client.Connect1: " & ex.Message)
-                        _logger.Debug("Error in ClientConnect - but still trying to send")
-                        _error = True
-                        ' Continue For
-                    End Try
-                    _logger.Debug("Connected to Client!")
-                    If AUTH_TYPE = "SSL" Then
-                        client.EnableSsl = True
-                        'client.ValidateRemoteCertificate = True
-                        _logger.Debug("Authentification via SSL.")
-                    ElseIf AUTH_TYPE = "TLS" Then
-                        ' client.ValidateRemoteCertificate = False
-                        client.StartTls()
-                        client.EnableSsl = False
-                        _logger.Debug("Authentification via TLS. SSL disabled")
-                    Else
-                        client.EnableSsl = False
-                        _logger.Debug("Authentification NONE. SSL disabled")
-                    End If
-                    Try
+    '                oMessage.[To].Add(New Mailbox(_mailempfaenger))
+    '                oMessage.Subject = mailSubject
+    '                _logger.Debug($"Message created..")
+    '                Dim textBodyPart As New BodyPart()
+    '                textBodyPart.ContentType = New ContentType("text", "html", "utf-8")
+    '                textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable
+    '                textBodyPart.Body = mailBody
+    '                oMessage.BodyParts.Add(textBodyPart)
+    '                If attment <> String.Empty Then
+    '                    If System.IO.File.Exists(attment) Then
+    '                        Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment)
+    '                        If attment.ToLower.EndsWith("pdf") Then
+    '                            attachment1.ContentType = New ContentType("application", "pdf")
+    '                        ElseIf attment.ToLower.EndsWith("jpg") Then
+    '                            attachment1.ContentType = New ContentType("application", "jpg")
+    '                        ElseIf attment.ToLower.EndsWith("docx") Then
+    '                            attachment1.ContentType = New ContentType("application", "MS-word")
+    '                        End If
+    '                        oMessage.BodyParts.Add(attachment1)
+    '                    Else
+    '                        _logger.Warn($"Attachment {attment.ToString} is not existing!")
+    '                    End If
+    '                End If
+    '                Dim client As Independentsoft.Email.Smtp.SmtpClient
+    '                Try
+    '                    client = New Independentsoft.Email.Smtp.SmtpClient(mailsmtp, mailport)
+    '                Catch ex As Exception
+    '                    _logger.Warn("clsEmail.Create Client: " & ex.Message)
+    '                    _error = True
+    '                    Continue For
+    '                End Try
+    '                Try
+    '                    client.Connect()
+    '                Catch ex As Exception
+    '                    _logger.Warn("clsEmail.Client.Connect1: " & ex.Message)
+    '                    _logger.Debug("Error in ClientConnect - but still trying to send")
+    '                    _error = True
+    '                    ' Continue For
+    '                End Try
+    '                _logger.Debug("Connected to Client!")
+    '                If AUTH_TYPE = "SSL" Then
+    '                    client.EnableSsl = True
+    '                    'client.ValidateRemoteCertificate = True
+    '                    _logger.Debug("Authentification via SSL.")
+    '                ElseIf AUTH_TYPE = "TLS" Then
+    '                    ' client.ValidateRemoteCertificate = False
+    '                    client.StartTls()
+    '                    client.EnableSsl = False
+    '                    _logger.Debug("Authentification via TLS. SSL disabled")
+    '                Else
+    '                    client.EnableSsl = False
+    '                    _logger.Debug("Authentification NONE. SSL disabled")
+    '                End If
+    '                Try
 
-                        client.Connect()
-                    Catch ex As Exception
-                        _logger.Warn("clsEmail.Client.Connect: " & ex.Message)
-                        Err_Message = "clsEmail.Client.Connect: " & ex.Message
-                        _error = True
-                        ' Continue For
-                    End Try
-                    Try
-                        If mailsmtp.Contains("office365.com") Then
-                            client.Login(mailUser, mailPW, AuthenticationType.None)
-                        Else
-                            client.Login(mailUser, mailPW)
-                        End If
+    '                    client.Connect()
+    '                Catch ex As Exception
+    '                    _logger.Warn("clsEmail.Client.Connect: " & ex.Message)
+    '                    Err_Message = "clsEmail.Client.Connect: " & ex.Message
+    '                    _error = True
+    '                    ' Continue For
+    '                End Try
+    '                Try
+    '                    If mailsmtp.Contains("office365.com") Then
+    '                        client.Login(mailUser, mailPW, AuthenticationType.None)
+    '                    Else
+    '                        client.Login(mailUser, mailPW)
+    '                    End If
 
-                        _logger.Debug("Logged in!")
-                    Catch ex As Exception
-                        Try
-                            If mailsmtp.Contains("office365.com") Then
-                                client.Login(mailUser, mailPW, AuthenticationType.Login)
-                            Else
-                                client.Login(mailUser, mailPW, AuthenticationType.Anonymous)
-                            End If
+    '                    _logger.Debug("Logged in!")
+    '                Catch ex As Exception
+    '                    Try
+    '                        If mailsmtp.Contains("office365.com") Then
+    '                            client.Login(mailUser, mailPW, AuthenticationType.Login)
+    '                        Else
+    '                            client.Login(mailUser, mailPW, AuthenticationType.Anonymous)
+    '                        End If
 
-                        Catch ex1 As Exception
-                            Try
-                                client.Login(mailUser, mailPW, AuthenticationType.Login)
-                            Catch ex2 As Exception
-                                _logger.Warn("clsEmail.Client.Login: " & ex.Message)
-                                _error = True
-                                client.Disconnect()
-                                Continue For
-                            End Try
-                        End Try
-                    End Try
-                    Try
-                        client.Send(oMessage)
-                        _logger.Info("Message to " & _mailempfaenger & " has been send.")
-                        _msg_Send = True
-                        _error = False
-                    Catch ex As Exception
-                        _logger.Warn("clsEmail.Client.Send: " & ex.Message)
-                        Err_Message = ex.Message
-                        _error = True
-                        client.Disconnect()
-                        Continue For
-                    End Try
-                    client.Disconnect()
+    '                    Catch ex1 As Exception
+    '                        Try
+    '                            client.Login(mailUser, mailPW, AuthenticationType.Login)
+    '                        Catch ex2 As Exception
+    '                            _logger.Warn("clsEmail.Client.Login: " & ex.Message)
+    '                            _error = True
+    '                            client.Disconnect()
+    '                            Continue For
+    '                        End Try
+    '                    End Try
+    '                End Try
+    '                Try
+    '                    client.Send(oMessage)
+    '                    _logger.Info("Message to " & _mailempfaenger & " has been send.")
+    '                    _msg_Send = True
+    '                    _error = False
+    '                Catch ex As Exception
+    '                    _logger.Warn("clsEmail.Client.Send: " & ex.Message)
+    '                    Err_Message = ex.Message
+    '                    _error = True
+    '                    client.Disconnect()
+    '                    Continue For
+    '                End Try
+    '                client.Disconnect()
 
-                Catch ex As Exception
-                    Err_Message = ex.Message
-                    If _msg_Send = True Then
-                        _logger.Info($"Error Closing Connection [{ex.Message}]")
-                    Else
-                        _logger.Error(ex)
-                    End If
-                    _error = True
-                End Try
-            Next
+    '            Catch ex As Exception
+    '                Err_Message = ex.Message
+    '                If _msg_Send = True Then
+    '                    _logger.Info($"Error Closing Connection [{ex.Message}]")
+    '                Else
+    '                    _logger.Error(ex)
+    '                End If
+    '                _error = True
+    '            End Try
+    '        Next
 
-            If _error = True Then
-                Return False
-            Else
-                Return True
-            End If
-        Catch ex As Exception
-            _logger.Error(ex)
-            Err_Message = ex.Message
-            Return False
-        End Try
-    End Function
-    Public Function DELETE_EMAIL(POLLTYPE As String, msgid As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
-        Try
-            If POLLTYPE = "POP" Then
-                Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
+    '        If _error = True Then
+    '            Return False
+    '        Else
+    '            Return True
+    '        End If
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
+    '        Err_Message = ex.Message
+    '        Return False
+    '    End Try
+    'End Function
+    'Public Function DELETE_EMAIL(POLLTYPE As String, msgid As String, MYMAIL_SERVER As String, MYMAIL_PORT As Integer, MYMAIL_USER As String, MYMAIL_USER_PW As String)
+    '    Try
+    '        If POLLTYPE = "POP" Then
+    '            Dim oClient As New Pop3Client(MYMAIL_SERVER, MYMAIL_PORT)
 
-                oClient.ValidateRemoteCertificate = False
-                oClient.Connect()
-                oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '            oClient.ValidateRemoteCertificate = False
+    '            oClient.Connect()
+    '            oClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
 
-                Dim oMessageInfo As MessageInfo() = oClient.List()
+    '            Dim oMessageInfo As MessageInfo() = oClient.List()
 
-                For i As Integer = 0 To oMessageInfo.Length - 1
-                    Dim message As Message = oClient.GetMessage(oMessageInfo(i).Index)
-                    If message.MessageID = msgid Then
-                        oClient.Delete(oMessageInfo(i).Index)
-                        _logger.Info(String.Format("Message [{0}] was deleted!", message.Subject))
-                        Exit For
-                    End If
-                Next
-                oClient.Disconnect()
-                Return True
-            ElseIf POLLTYPE = "IMAP" Then
-                Dim oIMAPClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
+    '            For i As Integer = 0 To oMessageInfo.Length - 1
+    '                Dim message As Message = oClient.GetMessage(oMessageInfo(i).Index)
+    '                If message.MessageID = msgid Then
+    '                    oClient.Delete(oMessageInfo(i).Index)
+    '                    _logger.Info(String.Format("Message [{0}] was deleted!", message.Subject))
+    '                    Exit For
+    '                End If
+    '            Next
+    '            oClient.Disconnect()
+    '            Return True
+    '        ElseIf POLLTYPE = "IMAP" Then
+    '            Dim oIMAPClient As New ImapClient(MYMAIL_SERVER, MYMAIL_PORT)
 
-                oIMAPClient.ValidateRemoteCertificate = False
-                oIMAPClient.Connect()
-                oIMAPClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
+    '            oIMAPClient.ValidateRemoteCertificate = False
+    '            oIMAPClient.Connect()
+    '            oIMAPClient.Login(MYMAIL_USER, MYMAIL_USER_PW)
 
-                oIMAPClient.SelectFolder("Inbox")
-                Dim envelopes As Envelope() = oIMAPClient.ListMessages()
-                For i As Integer = 0 To envelopes.Length - 1
-                    If envelopes(i).MessageID = msgid Then
-                        oIMAPClient.Delete(envelopes(i).UniqueID) 'mark as deleted
-                    End If
-                Next
-                oIMAPClient.Expunge() 'delete messages marked as deleted
-                oIMAPClient.Disconnect()
-                Return True
-            End If
-        Catch ex As Exception
-            _logger.Error(ex)
-            'clsLogger.Add("Unexpected Error in DELETE_EMAIL: " & ex.Message)
-            Return False
-        End Try
-    End Function
+    '            oIMAPClient.SelectFolder("Inbox")
+    '            Dim envelopes As Envelope() = oIMAPClient.ListMessages()
+    '            For i As Integer = 0 To envelopes.Length - 1
+    '                If envelopes(i).MessageID = msgid Then
+    '                    oIMAPClient.Delete(envelopes(i).UniqueID) 'mark as deleted
+    '                End If
+    '            Next
+    '            oIMAPClient.Expunge() 'delete messages marked as deleted
+    '            oIMAPClient.Disconnect()
+    '            Return True
+    '        End If
+    '    Catch ex As Exception
+    '        _logger.Error(ex)
+    '        'clsLogger.Add("Unexpected Error in DELETE_EMAIL: " & ex.Message)
+    '        Return False
+    '    End Try
+    'End Function
 End Class
diff --git a/Modules.Messaging/Limilab.vb b/Modules.Messaging/Limilab.vb
index 02e88148..257c839c 100644
--- a/Modules.Messaging/Limilab.vb
+++ b/Modules.Messaging/Limilab.vb
@@ -19,13 +19,12 @@ Public Class Limilab
     Private User As String
     Private Password As String
     Private AuthType As String
-    Private LimilabImapObject As Imap
+    Public CurrentImapObject As Imap
     Public ErrorMessage As String
     Private CURR_ListUIDs As List(Of Long)
     Public Sub New(LogConfig As LogConfig)
         LogConfig = LogConfig
         Logger = LogConfig.GetLogger()
-        Logger.Info("Limilab initialized")
     End Sub
     ''' <summary>
     ''' Initializes the module.
@@ -50,7 +49,10 @@ Public Class Limilab
             If Initialized = False Then
                 Return True
             Else
-                LimilabImapObject.Close()
+                If Not IsNothing(CurrentImapObject) Then
+                    CurrentImapObject.Close()
+                End If
+
                 Return True
             End If
 
@@ -81,7 +83,7 @@ Public Class Limilab
             Logger.Debug("Connecting...")
             Dim oReturn As Boolean = ImapConnect()
             If oReturn = True Then
-                LimilabImapObject.Close()
+                CurrentImapObject.Close()
             End If
             Return oReturn
         Catch ex As Exception
@@ -110,6 +112,26 @@ Public Class Limilab
             Return Nothing
         End Try
     End Function
+    Public Function IMAPGetMessageIDs_AllMails() As List(Of Long)
+        Dim oListuids As New List(Of Long)
+        Logger.Debug("Starting IMAPGetMessageIDs ...")
+        If Initialized = False Then
+            Return Nothing
+        End If
+        Try
+            Dim oConnect As Boolean = ImapConnect()
+
+            If oConnect = True Then
+                oListuids = ImapGetMessageIDs_All()
+                CURR_ListUIDs = oListuids
+            End If
+            Return oListuids
+        Catch ex As Exception
+            Logger.Error(ex)
+            ErrorMessage = ex.Message
+            Return Nothing
+        End Try
+    End Function
     Private Function ImapConnect() As Boolean
         Try
             If Initialized = False Then
@@ -153,7 +175,7 @@ Public Class Limilab
             Logger.Debug("Login with User and password...")
             oReturnImap.UseBestLogin(User, Password)
             Logger.Debug(">> Logged on!")
-            LimilabImapObject = oReturnImap
+            CurrentImapObject = oReturnImap
             Return True
         Catch ex As Exception
             Logger.Error(ex)
@@ -186,9 +208,24 @@ Public Class Limilab
     Private Function ImapGetMessageIDs_Unseen() As List(Of Long)
         Dim oListuids As New List(Of Long)
         Try
-            LimilabImapObject.SelectInbox()
+            CurrentImapObject.SelectInbox()
 
-            oListuids = LimilabImapObject.Search(Flag.Unseen)
+            oListuids = CurrentImapObject.Search(Flag.Unseen)
+
+            Return oListuids
+        Catch ex As Exception
+            Logger.Error(ex)
+            ErrorMessage = ex.Message
+            Return Nothing
+        End Try
+
+    End Function
+    Private Function ImapGetMessageIDs_All() As List(Of Long)
+        Dim oListuids As New List(Of Long)
+        Try
+            CurrentImapObject.SelectInbox()
+
+            oListuids = CurrentImapObject.Search(Flag.All)
 
             Return oListuids
         Catch ex As Exception
@@ -302,7 +339,7 @@ Public Class Limilab
     End Function
     Public Function GetMailInfo(UID As Long) As Boolean
         Try
-            Dim eml = LimilabImapObject.GetMessageByUID(UID)
+            Dim eml = CurrentImapObject.GetMessageByUID(UID)
             Dim email As IMail = New MailBuilder().CreateFromEml(eml)
             ' Subject
             Console.WriteLine(email.Subject)
@@ -336,7 +373,7 @@ Public Class Limilab
         Try
             Dim WORKMAIL_LIST As New ArrayList()
             For Each oUID In CURR_ListUIDs
-                Dim oEml = LimilabImapObject.GetMessageByUID(oUID)
+                Dim oEml = CurrentImapObject.GetMessageByUID(oUID)
                 Dim oEmail As IMail = New MailBuilder().CreateFromEml(oEml)
                 WORKMAIL_LIST.Add(oEmail)
             Next
@@ -348,10 +385,15 @@ Public Class Limilab
         End Try
 
     End Function
-    Public Function IMAP_DeleteByUID(UID As String) As Boolean
+    Public Function IMAP_DeleteByUID(UID As Long) As Boolean
         Try
-            LimilabImapObject.DeleteMessageByUID(UID)
-            Return True
+            If Not IsNothing(CurrentImapObject) Then
+                CurrentImapObject.DeleteMessageByUID(UID)
+                Return True
+            Else
+                Return False
+            End If
+
         Catch ex As Exception
             Logger.Error(ex)
             ErrorMessage = ex.Message
diff --git a/Modules.Messaging/Messaging.vbproj b/Modules.Messaging/Messaging.vbproj
index ce04c28a..d16b4926 100644
--- a/Modules.Messaging/Messaging.vbproj
+++ b/Modules.Messaging/Messaging.vbproj
@@ -43,9 +43,6 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Independentsoft.Email">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll</HintPath>
-    </Reference>
     <Reference Include="Mail">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -54,9 +51,6 @@
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
diff --git a/Modules.Messaging/My Project/AssemblyInfo.vb b/Modules.Messaging/My Project/AssemblyInfo.vb
index 19d0ac4b..598fcc03 100644
--- a/Modules.Messaging/My Project/AssemblyInfo.vb	
+++ b/Modules.Messaging/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.5.0.0")>
-<Assembly: AssemblyFileVersion("1.5.0.0")>
+<Assembly: AssemblyVersion("1.7.1.0")>
+<Assembly: AssemblyFileVersion("1.7.1.0")>
diff --git a/SQLConfig/frmSQLConfig.Designer.vb b/SQLConfig/frmSQLConfig.Designer.vb
index a54c19ed..03402a96 100644
--- a/SQLConfig/frmSQLConfig.Designer.vb
+++ b/SQLConfig/frmSQLConfig.Designer.vb
@@ -77,41 +77,41 @@ Partial Class frmSQLConfig
         '
         'txtServerName
         '
-        Me.txtServerName.Location = New System.Drawing.Point(148, 15)
+        Me.txtServerName.Location = New System.Drawing.Point(160, 15)
         Me.txtServerName.Name = "txtServerName"
-        Me.txtServerName.Size = New System.Drawing.Size(439, 20)
+        Me.txtServerName.Size = New System.Drawing.Size(427, 20)
         Me.txtServerName.StyleController = Me.LayoutControl1
         Me.txtServerName.TabIndex = 4
         '
         'txtUserName
         '
-        Me.txtUserName.Location = New System.Drawing.Point(148, 45)
+        Me.txtUserName.Location = New System.Drawing.Point(160, 45)
         Me.txtUserName.Name = "txtUserName"
-        Me.txtUserName.Size = New System.Drawing.Size(148, 20)
+        Me.txtUserName.Size = New System.Drawing.Size(136, 20)
         Me.txtUserName.StyleController = Me.LayoutControl1
         Me.txtUserName.TabIndex = 5
         '
         'txtPassword
         '
-        Me.txtPassword.Location = New System.Drawing.Point(439, 45)
+        Me.txtPassword.Location = New System.Drawing.Point(451, 45)
         Me.txtPassword.Name = "txtPassword"
-        Me.txtPassword.Size = New System.Drawing.Size(148, 20)
+        Me.txtPassword.Size = New System.Drawing.Size(136, 20)
         Me.txtPassword.StyleController = Me.LayoutControl1
         Me.txtPassword.TabIndex = 6
         '
         'cmbDatabase
         '
-        Me.cmbDatabase.Location = New System.Drawing.Point(148, 75)
+        Me.cmbDatabase.Location = New System.Drawing.Point(160, 75)
         Me.cmbDatabase.Name = "cmbDatabase"
         Me.cmbDatabase.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.cmbDatabase.Size = New System.Drawing.Size(439, 20)
+        Me.cmbDatabase.Size = New System.Drawing.Size(427, 20)
         Me.cmbDatabase.StyleController = Me.LayoutControl1
         Me.cmbDatabase.TabIndex = 7
         '
         'btnTestConnection
         '
         Me.btnTestConnection.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
-        Me.btnTestConnection.Location = New System.Drawing.Point(303, 166)
+        Me.btnTestConnection.Location = New System.Drawing.Point(303, 164)
         Me.btnTestConnection.Name = "btnTestConnection"
         Me.btnTestConnection.Size = New System.Drawing.Size(287, 22)
         Me.btnTestConnection.StyleController = Me.LayoutControl1
@@ -120,10 +120,10 @@ Partial Class frmSQLConfig
         '
         'txtConnectionString
         '
-        Me.txtConnectionString.Location = New System.Drawing.Point(148, 139)
+        Me.txtConnectionString.Location = New System.Drawing.Point(160, 137)
         Me.txtConnectionString.Name = "txtConnectionString"
         Me.txtConnectionString.Properties.ReadOnly = True
-        Me.txtConnectionString.Size = New System.Drawing.Size(439, 20)
+        Me.txtConnectionString.Size = New System.Drawing.Size(427, 20)
         Me.txtConnectionString.StyleController = Me.LayoutControl1
         Me.txtConnectionString.TabIndex = 9
         '
@@ -132,7 +132,7 @@ Partial Class frmSQLConfig
         Me.chkWinAuth.Location = New System.Drawing.Point(17, 107)
         Me.chkWinAuth.Name = "chkWinAuth"
         Me.chkWinAuth.Properties.Caption = "Windows Authentifizierung"
-        Me.chkWinAuth.Size = New System.Drawing.Size(568, 20)
+        Me.chkWinAuth.Size = New System.Drawing.Size(568, 18)
         Me.chkWinAuth.StyleController = Me.LayoutControl1
         Me.chkWinAuth.TabIndex = 10
         '
@@ -153,7 +153,7 @@ Partial Class frmSQLConfig
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem1.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem1.Text = "Server Name:"
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem2
         '
@@ -163,7 +163,7 @@ Partial Class frmSQLConfig
         Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem2.Size = New System.Drawing.Size(291, 30)
         Me.LayoutControlItem2.Text = "Benutzername:"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem4
         '
@@ -173,7 +173,7 @@ Partial Class frmSQLConfig
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem4.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem4.Text = "Datenbank:"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem3
         '
@@ -183,14 +183,14 @@ Partial Class frmSQLConfig
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem3.Size = New System.Drawing.Size(291, 30)
         Me.LayoutControlItem3.Text = "Passwort:"
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem7
         '
         Me.LayoutControlItem7.Control = Me.chkWinAuth
         Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 90)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
-        Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 34)
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(582, 32)
         Me.LayoutControlItem7.Spacing = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem7.TextVisible = False
@@ -198,37 +198,37 @@ Partial Class frmSQLConfig
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.txtConnectionString
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 124)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 122)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5)
         Me.LayoutControlItem6.Size = New System.Drawing.Size(582, 30)
         Me.LayoutControlItem6.Text = "Aktueller Connectionstring:"
-        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(130, 13)
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(142, 13)
         '
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.btnTestConnection
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 154)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(291, 152)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
-        Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 47)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(291, 49)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem5.TextVisible = False
         '
         'EmptySpaceItem2
         '
         Me.EmptySpaceItem2.AllowHotTrack = False
-        Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 154)
+        Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 152)
         Me.EmptySpaceItem2.Name = "EmptySpaceItem2"
-        Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 47)
+        Me.EmptySpaceItem2.Size = New System.Drawing.Size(291, 49)
         Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0)
         '
-        'frmConfigDatabase
+        'frmSQLConfig
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(602, 221)
         Me.Controls.Add(Me.LayoutControl1)
-        Me.Name = "frmConfigDatabase"
+        Me.Name = "frmSQLConfig"
         Me.Text = "Datenbank Verbindung"
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.LayoutControl1.ResumeLayout(False)