diff --git a/Global_Indexer/ClassConfig.vb b/Global_Indexer/ClassConfig.vb
index c96c5e8..a2d7afc 100644
--- a/Global_Indexer/ClassConfig.vb
+++ b/Global_Indexer/ClassConfig.vb
@@ -17,6 +17,6 @@ Public Class ClassConfig
     Public Property TopMost As Boolean = True
 
     ' Misc Settings
-    Public Property LogErrorsOnly As Boolean = True
+    Public Property LogDEBUG As Boolean = True
     Public Property WindreamSearchMaximized As Boolean = False
 End Class
diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb
index 36d7f60..530eb67 100644
--- a/Global_Indexer/ClassInit.vb
+++ b/Global_Indexer/ClassInit.vb
@@ -18,11 +18,11 @@ Public Class ClassInit
 
     Public Sub InitConfig()
         CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, Application.UserAppDataPath, Application.CommonAppDataPath)
-        LOGCONFIG.Debug = Not CONFIG.Config.LogErrorsOnly
+        LOGCONFIG.Debug = Not CONFIG.Config.LogDEBUG
         LOGGER.Info("Debug log set to: [{0}]", LOGCONFIG.Debug)
 
         MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
-        LogErrorsOnly = CONFIG.Config.LogErrorsOnly
+        LogErrorsOnly = CONFIG.Config.LogDEBUG
 
         'myPreviewActive = CONFIG.Config.FilePreview
         FW_started = CONFIG.Config.FolderWatchStarted
diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj
index 190472c..ada9466 100644
--- a/Global_Indexer/Global_Indexer.vbproj
+++ b/Global_Indexer/Global_Indexer.vbproj
@@ -63,7 +63,7 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Resources\DD_Icons_ICO_GLOBIX_128.ico</ApplicationIcon>
+    <ApplicationIcon>file.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
@@ -775,10 +775,12 @@
     <Content Include="DD_Icons_ICO_GLOBIX_128.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="file.ico" />
     <Content Include="globe_handdrawn.ico" />
     <Content Include="MailLicense.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\file.png" />
     <None Include="Resources\shipmentawaiting.svg" />
     <None Include="Resources\initialstate1.svg" />
     <None Include="Resources\properties1.svg" />
diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb
index a4f9cde..2ca2f9a 100644
--- a/Global_Indexer/My Project/AssemblyInfo.vb	
+++ b/Global_Indexer/My Project/AssemblyInfo.vb	
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.0.2")>
+<Assembly: AssemblyVersion("2.6.0.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 
\ No newline at end of file
diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb
index 177efc1..dffe020 100644
--- a/Global_Indexer/My Project/Resources.Designer.vb	
+++ b/Global_Indexer/My Project/Resources.Designer.vb	
@@ -420,6 +420,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property file() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("file", 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/Global_Indexer/My Project/Resources.resx b/Global_Indexer/My Project/Resources.resx
index 8f7de54..fb2c3db 100644
--- a/Global_Indexer/My Project/Resources.resx	
+++ b/Global_Indexer/My Project/Resources.resx	
@@ -157,6 +157,9 @@
   <data name="action_add_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="highlight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="database_save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_save2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -196,6 +199,9 @@
   <data name="globe_handdrawn" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\globe_handdrawn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="database_save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -235,9 +241,6 @@
   <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="WindowsForm_817_12x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -265,14 +268,11 @@
   <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="KeyDown_8461_12x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="shipmentawaiting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="folder_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -280,12 +280,15 @@
   <data name="Shortcut_8169_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="shipmentawaiting" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\shipmentawaiting.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="arrow_Up_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_Up_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="KeyDown_8461_12x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\KeyDown_8461_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -310,8 +313,8 @@
   <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="highlight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\highlight.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="WindowsForm_817_12x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WindowsForm_817_12x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="save_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -322,7 +325,7 @@
   <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\file.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/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx
index 86fadc5..3ff7d7d 100644
--- a/Global_Indexer/My Project/licenses.licx	
+++ b/Global_Indexer/My Project/licenses.licx	
@@ -1,7 +1,8 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/Global_Indexer/Resources/file.png b/Global_Indexer/Resources/file.png
new file mode 100644
index 0000000..a018d09
Binary files /dev/null and b/Global_Indexer/Resources/file.png differ
diff --git a/Global_Indexer/file.ico b/Global_Indexer/file.ico
new file mode 100644
index 0000000..7296965
Binary files /dev/null and b/Global_Indexer/file.ico differ
diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb
index 258e1bf..f712fd0 100644
--- a/Global_Indexer/frmConfig_Basic.designer.vb
+++ b/Global_Indexer/frmConfig_Basic.designer.vb
@@ -23,7 +23,7 @@ Partial Class frmConfig_Basic
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
@@ -266,8 +266,8 @@ Partial Class frmConfig_Basic
         '
         'DataGridView1
         '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         resources.ApplyResources(Me.DataGridView1, "DataGridView1")
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Name = "DataGridView1"
diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx
index 2544fbb..b735236 100644
--- a/Global_Indexer/frmConfig_Basic.resx
+++ b/Global_Indexer/frmConfig_Basic.resx
@@ -117,6 +117,23 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="chkbxUserAut.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="chkbxUserAut.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 58</value>
+  </data>
+  <data name="chkbxUserAut.Size" type="System.Drawing.Size, System.Drawing">
+    <value>170, 17</value>
+  </data>
+  <data name="chkbxUserAut.TabIndex" type="System.Int32, mscorlib">
+    <value>47</value>
+  </data>
+  <data name="chkbxUserAut.Text" xml:space="preserve">
+    <value>Windows-Authentifizierung</value>
+  </data>
   <data name="&gt;&gt;chkbxUserAut.Name" xml:space="preserve">
     <value>chkbxUserAut</value>
   </data>
@@ -129,6 +146,21 @@
   <data name="&gt;&gt;chkbxUserAut.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 115</value>
+  </data>
+  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 13</value>
+  </data>
+  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
+    <value>46</value>
+  </data>
+  <data name="Label5.Text" xml:space="preserve">
+    <value>Aktueller ConnectionString:</value>
+  </data>
   <data name="&gt;&gt;Label5.Name" xml:space="preserve">
     <value>Label5</value>
   </data>
@@ -141,6 +173,15 @@
   <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="cmbDatenbank.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 78</value>
+  </data>
+  <data name="cmbDatenbank.Size" type="System.Drawing.Size, System.Drawing">
+    <value>244, 21</value>
+  </data>
+  <data name="cmbDatenbank.TabIndex" type="System.Int32, mscorlib">
+    <value>39</value>
+  </data>
   <data name="&gt;&gt;cmbDatenbank.Name" xml:space="preserve">
     <value>cmbDatenbank</value>
   </data>
@@ -153,6 +194,21 @@
   <data name="&gt;&gt;cmbDatenbank.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 62</value>
+  </data>
+  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>67, 13</value>
+  </data>
+  <data name="Label4.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
+  </data>
+  <data name="Label4.Text" xml:space="preserve">
+    <value>Datenbank:</value>
+  </data>
   <data name="&gt;&gt;Label4.Name" xml:space="preserve">
     <value>Label4</value>
   </data>
@@ -165,6 +221,21 @@
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 14</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>74, 13</value>
+  </data>
+  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>Server-Name:</value>
+  </data>
   <data name="&gt;&gt;Label1.Name" xml:space="preserve">
     <value>Label1</value>
   </data>
@@ -177,6 +248,21 @@
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
+  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 14</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 13</value>
+  </data>
+  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>Benutzername:</value>
+  </data>
   <data name="&gt;&gt;Label2.Name" xml:space="preserve">
     <value>Label2</value>
   </data>
@@ -189,6 +275,21 @@
   <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
+  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>379, 14</value>
+  </data>
+  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 13</value>
+  </data>
+  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="Label3.Text" xml:space="preserve">
+    <value>Passwort:</value>
+  </data>
   <data name="&gt;&gt;Label3.Name" xml:space="preserve">
     <value>Label3</value>
   </data>
@@ -201,6 +302,19 @@
   <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="txtActualConnection.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtActualConnection.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 131</value>
+  </data>
+  <data name="txtActualConnection.Size" type="System.Drawing.Size, System.Drawing">
+    <value>370, 22</value>
+  </data>
+  <data name="txtActualConnection.TabIndex" type="System.Int32, mscorlib">
+    <value>45</value>
+  </data>
   <data name="&gt;&gt;txtActualConnection.Name" xml:space="preserve">
     <value>txtActualConnection</value>
   </data>
@@ -213,6 +327,15 @@
   <data name="&gt;&gt;txtActualConnection.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <data name="txtServer.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 30</value>
+  </data>
+  <data name="txtServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>246, 22</value>
+  </data>
+  <data name="txtServer.TabIndex" type="System.Int32, mscorlib">
+    <value>36</value>
+  </data>
   <data name="&gt;&gt;txtServer.Name" xml:space="preserve">
     <value>txtServer</value>
   </data>
@@ -225,6 +348,15 @@
   <data name="&gt;&gt;txtServer.ZOrder" xml:space="preserve">
     <value>8</value>
   </data>
+  <data name="txtUser.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 30</value>
+  </data>
+  <data name="txtUser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 22</value>
+  </data>
+  <data name="txtUser.TabIndex" type="System.Int32, mscorlib">
+    <value>37</value>
+  </data>
   <data name="&gt;&gt;txtUser.Name" xml:space="preserve">
     <value>txtUser</value>
   </data>
@@ -237,6 +369,15 @@
   <data name="&gt;&gt;txtUser.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
+  <data name="txtPasswort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>382, 30</value>
+  </data>
+  <data name="txtPasswort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 22</value>
+  </data>
+  <data name="txtPasswort.TabIndex" type="System.Int32, mscorlib">
+    <value>38</value>
+  </data>
   <data name="&gt;&gt;txtPasswort.Name" xml:space="preserve">
     <value>txtPasswort</value>
   </data>
@@ -249,6 +390,24 @@
   <data name="&gt;&gt;txtPasswort.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
+  <data name="BtnConnect.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="BtnConnect.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 75</value>
+  </data>
+  <data name="BtnConnect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 25</value>
+  </data>
+  <data name="BtnConnect.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="BtnConnect.Text" xml:space="preserve">
+    <value>Verbindung zur Datenbank herstellen</value>
+  </data>
+  <data name="BtnConnect.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
   <data name="&gt;&gt;BtnConnect.Name" xml:space="preserve">
     <value>BtnConnect</value>
   </data>
@@ -261,18 +420,15 @@
   <data name="&gt;&gt;BtnConnect.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TabPage1.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 3, 3, 3</value>
   </data>
   <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
     <value>582, 280</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
@@ -458,13 +614,13 @@
     <value>11, 51</value>
   </data>
   <data name="chkLogErrorsOnly.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 17</value>
+    <value>84, 17</value>
   </data>
   <data name="chkLogErrorsOnly.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
   <data name="chkLogErrorsOnly.Text" xml:space="preserve">
-    <value>LogErrorsOnly (Ja/Nein)</value>
+    <value>Log DEBUG</value>
   </data>
   <data name="&gt;&gt;chkLogErrorsOnly.Name" xml:space="preserve">
     <value>chkLogErrorsOnly</value>
@@ -568,513 +724,6 @@
   <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;Label8.Name" xml:space="preserve">
-    <value>Label8</value>
-  </data>
-  <data name="&gt;&gt;Label8.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label8.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;DataGridView1.Name" xml:space="preserve">
-    <value>DataGridView1</value>
-  </data>
-  <data name="&gt;&gt;DataGridView1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;DataGridView1.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;DataGridView1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;Button2.Name" xml:space="preserve">
-    <value>Button2</value>
-  </data>
-  <data name="&gt;&gt;Button2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Button2.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;Button2.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;txtScanFolderWatch.Name" xml:space="preserve">
-    <value>txtScanFolderWatch</value>
-  </data>
-  <data name="&gt;&gt;txtScanFolderWatch.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtScanFolderWatch.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;txtScanFolderWatch.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;Label7.Name" xml:space="preserve">
-    <value>Label7</value>
-  </data>
-  <data name="&gt;&gt;Label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label7.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;btnsetFW_Folder.Name" xml:space="preserve">
-    <value>btnsetFW_Folder</value>
-  </data>
-  <data name="&gt;&gt;btnsetFW_Folder.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnsetFW_Folder.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnsetFW_Folder.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;btnFW_OwnFiles.Name" xml:space="preserve">
-    <value>btnFW_OwnFiles</value>
-  </data>
-  <data name="&gt;&gt;btnFW_OwnFiles.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnFW_OwnFiles.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnFW_OwnFiles.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;btnFW_Desktop.Name" xml:space="preserve">
-    <value>btnFW_Desktop</value>
-  </data>
-  <data name="&gt;&gt;btnFW_Desktop.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnFW_Desktop.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnFW_Desktop.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;txtFolderWatch.Name" xml:space="preserve">
-    <value>txtFolderWatch</value>
-  </data>
-  <data name="&gt;&gt;txtFolderWatch.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtFolderWatch.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;txtFolderWatch.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="&gt;&gt;Label6.Name" xml:space="preserve">
-    <value>Label6</value>
-  </data>
-  <data name="&gt;&gt;Label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label6.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="&gt;&gt;btnSaveExclusionFiles.Name" xml:space="preserve">
-    <value>btnSaveExclusionFiles</value>
-  </data>
-  <data name="&gt;&gt;btnSaveExclusionFiles.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnSaveExclusionFiles.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnSaveExclusionFiles.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop2.Name" xml:space="preserve">
-    <value>btnstartstop2</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop2.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop2.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop1.Name" xml:space="preserve">
-    <value>btnstartstop1</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop1.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;btnstartstop1.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
-  <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
-  </data>
-  <data name="TabPage3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
-  </data>
-  <data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>582, 280</value>
-  </data>
-  <data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="TabPage3.Text" xml:space="preserve">
-    <value>Überwachte Ordner - Folderwatch</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Name" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage3.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>590, 306</value>
-  </data>
-  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="chkbxUserAut.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="chkbxUserAut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 58</value>
-  </data>
-  <data name="chkbxUserAut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 17</value>
-  </data>
-  <data name="chkbxUserAut.TabIndex" type="System.Int32, mscorlib">
-    <value>47</value>
-  </data>
-  <data name="chkbxUserAut.Text" xml:space="preserve">
-    <value>Windows-Authentifizierung</value>
-  </data>
-  <data name="&gt;&gt;chkbxUserAut.Name" xml:space="preserve">
-    <value>chkbxUserAut</value>
-  </data>
-  <data name="&gt;&gt;chkbxUserAut.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;chkbxUserAut.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;chkbxUserAut.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 115</value>
-  </data>
-  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 13</value>
-  </data>
-  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
-    <value>46</value>
-  </data>
-  <data name="Label5.Text" xml:space="preserve">
-    <value>Aktueller ConnectionString:</value>
-  </data>
-  <data name="&gt;&gt;Label5.Name" xml:space="preserve">
-    <value>Label5</value>
-  </data>
-  <data name="&gt;&gt;Label5.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label5.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="cmbDatenbank.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 78</value>
-  </data>
-  <data name="cmbDatenbank.Size" type="System.Drawing.Size, System.Drawing">
-    <value>244, 21</value>
-  </data>
-  <data name="cmbDatenbank.TabIndex" type="System.Int32, mscorlib">
-    <value>39</value>
-  </data>
-  <data name="&gt;&gt;cmbDatenbank.Name" xml:space="preserve">
-    <value>cmbDatenbank</value>
-  </data>
-  <data name="&gt;&gt;cmbDatenbank.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbDatenbank.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;cmbDatenbank.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 62</value>
-  </data>
-  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 13</value>
-  </data>
-  <data name="Label4.TabIndex" type="System.Int32, mscorlib">
-    <value>44</value>
-  </data>
-  <data name="Label4.Text" xml:space="preserve">
-    <value>Datenbank:</value>
-  </data>
-  <data name="&gt;&gt;Label4.Name" xml:space="preserve">
-    <value>Label4</value>
-  </data>
-  <data name="&gt;&gt;Label4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label4.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 14</value>
-  </data>
-  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 13</value>
-  </data>
-  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
-    <value>41</value>
-  </data>
-  <data name="Label1.Text" xml:space="preserve">
-    <value>Server-Name:</value>
-  </data>
-  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
-    <value>Label1</value>
-  </data>
-  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 14</value>
-  </data>
-  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 13</value>
-  </data>
-  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
-    <value>42</value>
-  </data>
-  <data name="Label2.Text" xml:space="preserve">
-    <value>Benutzername:</value>
-  </data>
-  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
-    <value>Label2</value>
-  </data>
-  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>379, 14</value>
-  </data>
-  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 13</value>
-  </data>
-  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
-    <value>43</value>
-  </data>
-  <data name="Label3.Text" xml:space="preserve">
-    <value>Passwort:</value>
-  </data>
-  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
-    <value>Label3</value>
-  </data>
-  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="txtActualConnection.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="txtActualConnection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 131</value>
-  </data>
-  <data name="txtActualConnection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>370, 22</value>
-  </data>
-  <data name="txtActualConnection.TabIndex" type="System.Int32, mscorlib">
-    <value>45</value>
-  </data>
-  <data name="&gt;&gt;txtActualConnection.Name" xml:space="preserve">
-    <value>txtActualConnection</value>
-  </data>
-  <data name="&gt;&gt;txtActualConnection.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtActualConnection.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;txtActualConnection.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="txtServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 30</value>
-  </data>
-  <data name="txtServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>246, 22</value>
-  </data>
-  <data name="txtServer.TabIndex" type="System.Int32, mscorlib">
-    <value>36</value>
-  </data>
-  <data name="&gt;&gt;txtServer.Name" xml:space="preserve">
-    <value>txtServer</value>
-  </data>
-  <data name="&gt;&gt;txtServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtServer.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;txtServer.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="txtUser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 30</value>
-  </data>
-  <data name="txtUser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 22</value>
-  </data>
-  <data name="txtUser.TabIndex" type="System.Int32, mscorlib">
-    <value>37</value>
-  </data>
-  <data name="&gt;&gt;txtUser.Name" xml:space="preserve">
-    <value>txtUser</value>
-  </data>
-  <data name="&gt;&gt;txtUser.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtUser.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;txtUser.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="txtPasswort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 30</value>
-  </data>
-  <data name="txtPasswort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 22</value>
-  </data>
-  <data name="txtPasswort.TabIndex" type="System.Int32, mscorlib">
-    <value>38</value>
-  </data>
-  <data name="&gt;&gt;txtPasswort.Name" xml:space="preserve">
-    <value>txtPasswort</value>
-  </data>
-  <data name="&gt;&gt;txtPasswort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPasswort.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;txtPasswort.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="BtnConnect.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="BtnConnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>255, 75</value>
-  </data>
-  <data name="BtnConnect.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 25</value>
-  </data>
-  <data name="BtnConnect.TabIndex" type="System.Int32, mscorlib">
-    <value>40</value>
-  </data>
-  <data name="BtnConnect.Text" xml:space="preserve">
-    <value>Verbindung zur Datenbank herstellen</value>
-  </data>
-  <data name="BtnConnect.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleRight</value>
-  </data>
-  <data name="&gt;&gt;BtnConnect.Name" xml:space="preserve">
-    <value>BtnConnect</value>
-  </data>
-  <data name="&gt;&gt;BtnConnect.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;BtnConnect.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;BtnConnect.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
   <data name="Label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1415,6 +1064,57 @@ ausgenommen werden sollen:</value>
   <data name="&gt;&gt;btnstartstop1.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
+  <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TabPage3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>582, 280</value>
+  </data>
+  <data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="TabPage3.Text" xml:space="preserve">
+    <value>Überwachte Ordner - Folderwatch</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Name" xml:space="preserve">
+    <value>TabPage3</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.Parent" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabPage3.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>590, 306</value>
+  </data>
+  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb
index 4a9d569..7ed1900 100644
--- a/Global_Indexer/frmConfig_Basic.vb
+++ b/Global_Indexer/frmConfig_Basic.vb
@@ -356,12 +356,12 @@ Public Class frmConfig_Basic
 
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged
         If formloaded = True Then
-            CONFIG.Config.LogErrorsOnly = chkLogErrorsOnly.Checked
+            CONFIG.Config.LogDEBUG = chkLogErrorsOnly.Checked
             CONFIG.Save()
             'SaveConfigValue("LogErrorsOnly", chkLogErrorsOnly.Checked)
             LOGGER.Info(" >> LogErrorsOnly changed to '" & chkLogErrorsOnly.Checked)
             LogErrorsOnly = chkLogErrorsOnly.Checked
-            LOGCONFIG.Debug = Not chkLogErrorsOnly.Checked
+            LOGCONFIG.Debug = chkLogErrorsOnly.Checked
         End If
     End Sub
     <STAThread()>
@@ -372,7 +372,7 @@ Public Class frmConfig_Basic
     End Sub
     Sub Load_Basics()
         Try
-            chkLogErrorsOnly.Checked = CONFIG.Config.LogErrorsOnly
+            chkLogErrorsOnly.Checked = CONFIG.Config.LogDEBUG
 
             If Not MyConnectionString = String.Empty Then
                 Dim csb As New SqlClient.SqlConnectionStringBuilder With {
diff --git a/Global_Indexer/frmSQL_DESIGNER.Designer.vb b/Global_Indexer/frmSQL_DESIGNER.Designer.vb
index 50102d8..562f475 100644
--- a/Global_Indexer/frmSQL_DESIGNER.Designer.vb
+++ b/Global_Indexer/frmSQL_DESIGNER.Designer.vb
@@ -24,7 +24,6 @@ Partial Class frmSQL_DESIGNER
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER))
         Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.btnShowConnections = New System.Windows.Forms.Button()
@@ -34,7 +33,6 @@ Partial Class frmSQL_DESIGNER
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
-        Me.dgvResult = New System.Windows.Forms.DataGridView()
         Me.dgvPlaceholders = New System.Windows.Forms.DataGridView()
         Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -53,9 +51,12 @@ Partial Class frmSQL_DESIGNER
         Me.cmbUser = New System.Windows.Forms.ComboBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.btnAddUser = New System.Windows.Forms.Button()
+        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'btnShowConnections
@@ -96,21 +97,20 @@ Partial Class frmSQL_DESIGNER
         '
         Me.SQL_COMMANDTextBox.AcceptsReturn = True
         Me.SQL_COMMANDTextBox.AcceptsTab = True
-        Me.SQL_COMMANDTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
+        Me.SQL_COMMANDTextBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125)
+        Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(12, 115)
         Me.SQL_COMMANDTextBox.Multiline = True
         Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox"
         Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-        Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(905, 186)
+        Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(936, 186)
         Me.SQL_COMMANDTextBox.TabIndex = 86
         '
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(9, 109)
+        Me.Label4.Location = New System.Drawing.Point(9, 99)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(81, 13)
         Me.Label4.TabIndex = 85
@@ -118,11 +118,10 @@ Partial Class frmSQL_DESIGNER
         '
         'Label1
         '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label1.Location = New System.Drawing.Point(13, 331)
+        Me.Label1.Location = New System.Drawing.Point(13, 328)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(65, 15)
         Me.Label1.TabIndex = 91
@@ -130,42 +129,25 @@ Partial Class frmSQL_DESIGNER
         '
         'Label5
         '
-        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Label5.AutoSize = True
         Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label5.Location = New System.Drawing.Point(365, 331)
+        Me.Label5.Location = New System.Drawing.Point(367, 328)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(55, 15)
         Me.Label5.TabIndex = 90
         Me.Label5.Text = "Ergebnis:"
         '
-        'dgvResult
-        '
-        Me.dgvResult.AllowUserToAddRows = False
-        Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
-        Me.dgvResult.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvResult.Location = New System.Drawing.Point(368, 349)
-        Me.dgvResult.Name = "dgvResult"
-        Me.dgvResult.ReadOnly = True
-        Me.dgvResult.Size = New System.Drawing.Size(552, 134)
-        Me.dgvResult.TabIndex = 89
-        '
         'dgvPlaceholders
         '
         Me.dgvPlaceholders.AllowUserToAddRows = False
         Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvPlaceholders.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
         Me.dgvPlaceholders.Enabled = False
-        Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 349)
+        Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 348)
         Me.dgvPlaceholders.Name = "dgvPlaceholders"
         Me.dgvPlaceholders.Size = New System.Drawing.Size(338, 133)
         Me.dgvPlaceholders.TabIndex = 88
@@ -183,12 +165,12 @@ Partial Class frmSQL_DESIGNER
         '
         'btnTestSQL
         '
-        Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle))
         Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image)
         Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btnTestSQL.Location = New System.Drawing.Point(752, 314)
+        Me.btnTestSQL.Location = New System.Drawing.Point(780, 314)
         Me.btnTestSQL.Name = "btnTestSQL"
         Me.btnTestSQL.Size = New System.Drawing.Size(168, 29)
         Me.btnTestSQL.TabIndex = 87
@@ -201,7 +183,7 @@ Partial Class frmSQL_DESIGNER
         Me.lbIndexe.AutoSize = True
         Me.lbIndexe.Enabled = False
         Me.lbIndexe.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lbIndexe.Location = New System.Drawing.Point(678, 13)
+        Me.lbIndexe.Location = New System.Drawing.Point(726, 13)
         Me.lbIndexe.Name = "lbIndexe"
         Me.lbIndexe.Size = New System.Drawing.Size(203, 16)
         Me.lbIndexe.TabIndex = 93
@@ -211,7 +193,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.cmbIndexe.Enabled = False
         Me.cmbIndexe.FormattingEnabled = True
-        Me.cmbIndexe.Location = New System.Drawing.Point(681, 32)
+        Me.cmbIndexe.Location = New System.Drawing.Point(719, 31)
         Me.cmbIndexe.Name = "cmbIndexe"
         Me.cmbIndexe.Size = New System.Drawing.Size(194, 21)
         Me.cmbIndexe.TabIndex = 92
@@ -220,7 +202,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.btnAddIndex.Enabled = False
         Me.btnAddIndex.Image = CType(resources.GetObject("btnAddIndex.Image"), System.Drawing.Image)
-        Me.btnAddIndex.Location = New System.Drawing.Point(881, 32)
+        Me.btnAddIndex.Location = New System.Drawing.Point(916, 32)
         Me.btnAddIndex.Name = "btnAddIndex"
         Me.btnAddIndex.Size = New System.Drawing.Size(32, 23)
         Me.btnAddIndex.TabIndex = 94
@@ -232,7 +214,7 @@ Partial Class frmSQL_DESIGNER
         Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image)
         Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSaveSQLCommand.Location = New System.Drawing.Point(825, 489)
+        Me.btnSaveSQLCommand.Location = New System.Drawing.Point(853, 655)
         Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand"
         Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30)
         Me.btnSaveSQLCommand.TabIndex = 95
@@ -245,7 +227,7 @@ Partial Class frmSQL_DESIGNER
         Me.lblSaveFinalIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblSaveFinalIndex.AutoSize = True
         Me.lblSaveFinalIndex.BackColor = System.Drawing.Color.Yellow
-        Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 489)
+        Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 655)
         Me.lblSaveFinalIndex.Name = "lblSaveFinalIndex"
         Me.lblSaveFinalIndex.Size = New System.Drawing.Size(38, 13)
         Me.lblSaveFinalIndex.TabIndex = 96
@@ -255,7 +237,7 @@ Partial Class frmSQL_DESIGNER
         'btnAddControl
         '
         Me.btnAddControl.Image = CType(resources.GetObject("btnAddControl.Image"), System.Drawing.Image)
-        Me.btnAddControl.Location = New System.Drawing.Point(643, 32)
+        Me.btnAddControl.Location = New System.Drawing.Point(681, 30)
         Me.btnAddControl.Name = "btnAddControl"
         Me.btnAddControl.Size = New System.Drawing.Size(32, 23)
         Me.btnAddControl.TabIndex = 99
@@ -265,7 +247,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.lblControls.AutoSize = True
         Me.lblControls.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblControls.Location = New System.Drawing.Point(442, 13)
+        Me.lblControls.Location = New System.Drawing.Point(480, 11)
         Me.lblControls.Name = "lblControls"
         Me.lblControls.Size = New System.Drawing.Size(215, 16)
         Me.lblControls.TabIndex = 98
@@ -274,7 +256,7 @@ Partial Class frmSQL_DESIGNER
         'cmbControls
         '
         Me.cmbControls.FormattingEnabled = True
-        Me.cmbControls.Location = New System.Drawing.Point(445, 31)
+        Me.cmbControls.Location = New System.Drawing.Point(483, 29)
         Me.cmbControls.Name = "cmbControls"
         Me.cmbControls.Size = New System.Drawing.Size(194, 21)
         Me.cmbControls.TabIndex = 97
@@ -283,7 +265,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.cmbStatic.FormattingEnabled = True
         Me.cmbStatic.Items.AddRange(New Object() {"USERNAME", "MACHINE", "DOMAIN", "DATE"})
-        Me.cmbStatic.Location = New System.Drawing.Point(445, 86)
+        Me.cmbStatic.Location = New System.Drawing.Point(483, 84)
         Me.cmbStatic.Name = "cmbStatic"
         Me.cmbStatic.Size = New System.Drawing.Size(194, 21)
         Me.cmbStatic.TabIndex = 97
@@ -291,7 +273,7 @@ Partial Class frmSQL_DESIGNER
         'btnAddStatic
         '
         Me.btnAddStatic.Image = CType(resources.GetObject("btnAddStatic.Image"), System.Drawing.Image)
-        Me.btnAddStatic.Location = New System.Drawing.Point(643, 86)
+        Me.btnAddStatic.Location = New System.Drawing.Point(681, 84)
         Me.btnAddStatic.Name = "btnAddStatic"
         Me.btnAddStatic.Size = New System.Drawing.Size(32, 23)
         Me.btnAddStatic.TabIndex = 99
@@ -301,7 +283,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(442, 67)
+        Me.Label2.Location = New System.Drawing.Point(480, 65)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(112, 16)
         Me.Label2.TabIndex = 98
@@ -311,7 +293,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.cmbUser.FormattingEnabled = True
         Me.cmbUser.Items.AddRange(New Object() {"PRENAME", "SURNAME", "SHORTNAME", "LANGUAGE", "EMAIL", "USER_ID", "PROFILE_ID"})
-        Me.cmbUser.Location = New System.Drawing.Point(681, 86)
+        Me.cmbUser.Location = New System.Drawing.Point(719, 86)
         Me.cmbUser.Name = "cmbUser"
         Me.cmbUser.Size = New System.Drawing.Size(194, 21)
         Me.cmbUser.TabIndex = 97
@@ -320,7 +302,7 @@ Partial Class frmSQL_DESIGNER
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(678, 67)
+        Me.Label3.Location = New System.Drawing.Point(716, 67)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(118, 16)
         Me.Label3.TabIndex = 98
@@ -329,17 +311,37 @@ Partial Class frmSQL_DESIGNER
         'btnAddUser
         '
         Me.btnAddUser.Image = CType(resources.GetObject("btnAddUser.Image"), System.Drawing.Image)
-        Me.btnAddUser.Location = New System.Drawing.Point(881, 84)
+        Me.btnAddUser.Location = New System.Drawing.Point(916, 84)
         Me.btnAddUser.Name = "btnAddUser"
         Me.btnAddUser.Size = New System.Drawing.Size(32, 23)
         Me.btnAddUser.TabIndex = 99
         Me.btnAddUser.UseVisualStyleBackColor = True
         '
+        'GridControl1
+        '
+        Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.GridControl1.Location = New System.Drawing.Point(370, 349)
+        Me.GridControl1.MainView = Me.GridView1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.Size = New System.Drawing.Size(578, 300)
+        Me.GridControl1.TabIndex = 100
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'GridView1
+        '
+        Me.GridView1.GridControl = Me.GridControl1
+        Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways
+        Me.GridView1.OptionsView.ShowGroupPanel = False
+        '
         'frmSQL_DESIGNER
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(930, 523)
+        Me.ClientSize = New System.Drawing.Size(952, 689)
+        Me.Controls.Add(Me.GridControl1)
         Me.Controls.Add(Me.btnAddUser)
         Me.Controls.Add(Me.btnAddStatic)
         Me.Controls.Add(Me.btnAddControl)
@@ -356,7 +358,6 @@ Partial Class frmSQL_DESIGNER
         Me.Controls.Add(Me.cmbIndexe)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.dgvResult)
         Me.Controls.Add(Me.dgvPlaceholders)
         Me.Controls.Add(Me.btnTestSQL)
         Me.Controls.Add(Me.SQL_COMMANDTextBox)
@@ -366,15 +367,15 @@ Partial Class frmSQL_DESIGNER
         Me.Controls.Add(Me.cmbConnection)
         Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.MinimumSize = New System.Drawing.Size(937, 392)
         Me.Name = "frmSQL_DESIGNER"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "SQL - Designer"
         CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -390,7 +391,6 @@ Partial Class frmSQL_DESIGNER
     Friend WithEvents Label4 As System.Windows.Forms.Label
     Friend WithEvents Label1 As System.Windows.Forms.Label
     Friend WithEvents Label5 As System.Windows.Forms.Label
-    Friend WithEvents dgvResult As System.Windows.Forms.DataGridView
     Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView
     Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn
@@ -409,4 +409,6 @@ Partial Class frmSQL_DESIGNER
     Friend WithEvents cmbUser As ComboBox
     Friend WithEvents Label3 As Label
     Friend WithEvents btnAddUser As Button
+    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
 End Class
diff --git a/Global_Indexer/frmSQL_DESIGNER.vb b/Global_Indexer/frmSQL_DESIGNER.vb
index 354c697..dbb8013 100644
--- a/Global_Indexer/frmSQL_DESIGNER.vb
+++ b/Global_Indexer/frmSQL_DESIGNER.vb
@@ -175,7 +175,7 @@ Public Class frmSQL_DESIGNER
 
 
         If ds IsNot Nothing Then
-            dgvResult.DataSource = ds.Tables(0)
+            GridControl1.DataSource = ds.Tables(0)
         End If
     End Sub
     Private Function ExecuteWithConnection(connectionId As Integer, sql As String) As DataSet
diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb
index 9b22c7a..8b59f8c 100644
--- a/Global_Indexer/frmStart.Designer.vb
+++ b/Global_Indexer/frmStart.Designer.vb
@@ -256,7 +256,7 @@ Partial Class frmStart
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
         Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon)
-        Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.FileFlow_Icon
+        Me.IconOptions.Image = Global.Global_Indexer.My.Resources.Resources.file
         Me.KeyPreview = True
         Me.MaximizeBox = False
         Me.Name = "frmStart"