diff --git a/Global_Indexer/App.config b/Global_Indexer/App.config
index a636abe..abe144e 100644
--- a/Global_Indexer/App.config
+++ b/Global_Indexer/App.config
@@ -18,6 +18,9 @@
             <setting name="SplitterDistance_Viewer" serializeAs="String">
                 <value>526</value>
             </setting>
+            <setting name="WDSearch_maximized" serializeAs="String">
+                <value>True</value>
+            </setting>
         </Global_Indexer.My.MySettings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/Global_Indexer/ClassHotkey_Windream.vb b/Global_Indexer/ClassHotkey_Windream.vb
index 952ba12..38df4bc 100644
--- a/Global_Indexer/ClassHotkey_Windream.vb
+++ b/Global_Indexer/ClassHotkey_Windream.vb
@@ -59,7 +59,21 @@ Public Class ClassHotkey_Windream
             Return Nothing
         End Try
     End Function
-
+    'Fenster position ermitteln/auslesen
+    Private Declare Function FindWindow Lib "user32" Alias "FindWindowA" (ByVal lpClassName As String, ByVal lpWindowName As String) As Integer
+    Private Declare Function GetWindowRect Lib "user32.dll" (ByVal hWnd As IntPtr, ByRef lpRect As RECT) As Int32
+    Private Structure RECT
+        Dim Left As Integer
+        Dim Top As Integer
+        Dim Right As Integer
+        Dim Bottom As Integer
+    End Structure
+    Private Shared Sub GetWindowClientSize(ByVal hWnd As Long)
+        Dim rc As RECT
+        GetWindowRect(hWnd, rc)
+        'Left = rc.Right - rc.Left
+        'Height = rc.Bottom - rc.Top
+    End Sub
     Public Shared Function RUN_WD_SEARCH(HK_USR_PROFILE_ID As Integer)
         Try
             If LogErrorsOnly = False Then ClassLogger.Add(" ...RUN_WD_SEARCH with HK_USR_PROFILE_ID '" & HK_USR_PROFILE_ID & "'", False)
@@ -67,7 +81,7 @@ Public Class ClassHotkey_Windream
             Dim Objecttype As String
             Dim windowname As String
             Dim HKPROFILE_ID As Integer
-          
+
 
             Dim _sql = "SELECT WD_SEARCH,HKPROFILE_ID FROM TBHOTKEY_USER_PROFILE WHERE GUID = " & HK_USR_PROFILE_ID
             DTWD = ClassDatabase.Return_Datatable(_sql)
@@ -189,21 +203,57 @@ Public Class ClassHotkey_Windream
                     ClassLogger.Add("TempFile could not be created: " & ex.Message, True)
                     MsgBox(ex.Message, MsgBoxStyle.Critical, "Unerwarteter Fehler in Write XmlSearch:")
                 End Try
-                
+
                 CURRENT_WD_TEMPSEARCH = windream_temp_search
                 Try
+                    Dim myhWnd As IntPtr
                     Dim p As New Process()
                     p.StartInfo.FileName = windream_temp_search
-                    p.StartInfo.WindowStyle = ProcessWindowStyle.Normal
+                    If My.Settings.WDSearch_maximized = True Then
+                        p.StartInfo.WindowStyle = ProcessWindowStyle.Maximized
+                    Else
+                        p.StartInfo.WindowStyle = ProcessWindowStyle.Normal
+                    End If
                     p.Start()
-                    'p.WaitForExit()
-                    'p.Close()
+
+                    myhWnd = p.MainWindowHandle
+                    Threading.Thread.Sleep(1000)
+                    Dim rctMain As RECT
+                    GetWindowRect(p.MainWindowHandle, rctMain)
+                    If LogErrorsOnly = False Then
+                        ClassLogger.Add(" ...Top-Position: " & rctMain.Top.ToString, False)
+                        ClassLogger.Add(" ...Left-Position: " & rctMain.Left.ToString, False)
+                        ClassLogger.Add(" ...Right-Position: " & rctMain.Right.ToString, False)
+                        ClassLogger.Add(" ...Bottom-Position: " & rctMain.Bottom.ToString, False)
+                    End If
                 Catch ex As Exception
                     MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Ausführen der windream-Suche:")
                     ClassLogger.Add("Unexpected error while executing search: " & ex.Message, True)
                     Return "Unexpected error while executing search"
                 End Try
-               
+                Dim psList() As Process
+                Try
+                    psList = Process.GetProcesses()
+
+                    For Each p As Process In psList
+                        Console.WriteLine(p.Id.ToString() + " " + p.ProcessName)
+                        If p.ProcessName.Contains("indream.Find") Then
+                            AppActivate(p.Id)
+                            If My.Settings.WDSearch_maximized = False Then
+                                Dim rctMain As RECT
+                                GetWindowRect(p.MainWindowHandle, rctMain)
+                                If rctMain.Left = 0 Or rctMain.Right = 0 Then
+                                    ShowWindow(p.MainWindowHandle, 3) ' SW_MAXIMIZE
+                                End If
+                            End If
+                            ' SetForeGroundWindow(p.MainWindowHandle)
+                        End If
+
+                    Next p
+
+                Catch ex As Exception
+                    ClassLogger.Add("Unexpected error while Setting foreground: " & ex.Message, True)
+                End Try
                 Return ""
             Catch ex As Exception
                 ClassLogger.Add("Unexpected error in Create Search: " & ex.Message, True)
@@ -219,4 +269,9 @@ Public Class ClassHotkey_Windream
 
 
     End Function
+   Private Declare Function ShowWindow Lib "user32" (ByVal handle As IntPtr, ByVal nCmdShow As Integer) As Integer
+    Declare Auto Function SetForeGroundWindow Lib "User32.dll" (ByVal Hwnd As IntPtr) As Integer
+
+    
+
 End Class
diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj
index 1cf0d16..3087e9a 100644
--- a/Global_Indexer/Global_Indexer.vbproj
+++ b/Global_Indexer/Global_Indexer.vbproj
@@ -46,6 +46,9 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>globe_handdrawn.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Charts.v14.2.Core, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -219,6 +222,7 @@
     </Compile>
     <Compile Include="ModuleCURRENT.vb" />
     <Compile Include="ModuleMySettings.vb" />
+    <Compile Include="ModuleWindowHandles.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -491,6 +495,10 @@
   <ItemGroup>
     <None Include="Resources\arrow_Up_16xLG.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="globe_handdrawn.ico" />
+    <None Include="Resources\refresh_16xLG.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/Global_Indexer/ModuleWindowHandles.vb b/Global_Indexer/ModuleWindowHandles.vb
new file mode 100644
index 0000000..39a6eb9
--- /dev/null
+++ b/Global_Indexer/ModuleWindowHandles.vb
@@ -0,0 +1,3 @@
+Module ModuleWindowHandles
+
+End Module
diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb
index e58f741..a11dda0 100644
--- a/Global_Indexer/My Project/AssemblyInfo.vb	
+++ b/Global_Indexer/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.6.0.0")> 
+<Assembly: AssemblyVersion("1.7.0.0")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb
index 213e06a..20807b2 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 refresh_16xLG() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("refresh_16xLG", 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 b498b1c..10b7db2 100644
--- a/Global_Indexer/My Project/Resources.resx	
+++ b/Global_Indexer/My Project/Resources.resx	
@@ -121,6 +121,9 @@
   <data name="arrow_back_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_back_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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="bell_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,9 +139,6 @@
   <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bell_delete.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="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>
@@ -166,6 +166,9 @@
   <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>
   </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>
+  </data>
   <data name="handdrawn_arrow_right_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -175,6 +178,9 @@
   <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Save_6530" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Save_6530.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>
@@ -199,15 +205,12 @@
   <data name="CheckOutforEdit_13187_32x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CheckOutforEdit_13187_32x.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>
+  <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="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="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="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>
@@ -238,13 +241,13 @@
   <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>
-  <data name="Save_6530" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="database_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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 name="refresh_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh_16xLG.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/Settings.Designer.vb b/Global_Indexer/My Project/Settings.Designer.vb
index 8b903e6..5aea6ac 100644
--- a/Global_Indexer/My Project/Settings.Designer.vb	
+++ b/Global_Indexer/My Project/Settings.Designer.vb	
@@ -76,6 +76,18 @@ Namespace My
                 Me("SplitterDistance_Viewer") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property WDSearch_maximized() As Boolean
+            Get
+                Return CType(Me("WDSearch_maximized"),Boolean)
+            End Get
+            Set
+                Me("WDSearch_maximized") = value
+            End Set
+        End Property
     End Class
 End Namespace
 
diff --git a/Global_Indexer/My Project/Settings.settings b/Global_Indexer/My Project/Settings.settings
index 2afad61..8ab03e3 100644
--- a/Global_Indexer/My Project/Settings.settings	
+++ b/Global_Indexer/My Project/Settings.settings	
@@ -13,5 +13,8 @@
     <Setting Name="SplitterDistance_Viewer" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">526</Value>
     </Setting>
+    <Setting Name="WDSearch_maximized" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb
index d85033b..9dacb0e 100644
--- a/Global_Indexer/frmAdministration.Designer.vb
+++ b/Global_Indexer/frmAdministration.Designer.vb
@@ -241,7 +241,7 @@ Partial Class frmAdministration
         Me.btnNamenkonvention = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.NAMENKONVENTIONTextBox = New System.Windows.Forms.TextBox()
-        Me.ListBox1 = New System.Windows.Forms.ListBox()
+        Me.ListBoxDokart = New System.Windows.Forms.ListBox()
         Me.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
@@ -1224,7 +1224,7 @@ Partial Class frmAdministration
         Me.XtraTabPage1.Controls.Add(Me.btnNamenkonvention)
         Me.XtraTabPage1.Controls.Add(Me.Button1)
         Me.XtraTabPage1.Controls.Add(Me.NAMENKONVENTIONTextBox)
-        Me.XtraTabPage1.Controls.Add(Me.ListBox1)
+        Me.XtraTabPage1.Controls.Add(Me.ListBoxDokart)
         Me.XtraTabPage1.Controls.Add(Me.TBDD_DOKUMENTARTBindingNavigator)
         Me.XtraTabPage1.Controls.Add(GUIDLabel)
         Me.XtraTabPage1.Controls.Add(Me.DOKART_GUIDTextBox)
@@ -1372,7 +1372,6 @@ Partial Class frmAdministration
         '
         'ListBox5
         '
-        Me.ListBox5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ListBox5.DataSource = Me.TBDD_INDEX_MANBindingSource
         Me.ListBox5.DisplayMember = "NAME"
         Me.ListBox5.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -2031,7 +2030,6 @@ Partial Class frmAdministration
         '
         'ListBox6
         '
-        Me.ListBox6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ListBox6.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
         Me.ListBox6.DisplayMember = "INDEXNAME"
         Me.ListBox6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -2452,10 +2450,10 @@ Partial Class frmAdministration
         'FOLDER_FOR_INDEXTextBox
         '
         Me.FOLDER_FOR_INDEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "FOLDER_FOR_INDEX", True))
-        Me.FOLDER_FOR_INDEXTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.FOLDER_FOR_INDEXTextBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.FOLDER_FOR_INDEXTextBox.Location = New System.Drawing.Point(12, 40)
         Me.FOLDER_FOR_INDEXTextBox.Name = "FOLDER_FOR_INDEXTextBox"
-        Me.FOLDER_FOR_INDEXTextBox.Size = New System.Drawing.Size(493, 22)
+        Me.FOLDER_FOR_INDEXTextBox.Size = New System.Drawing.Size(697, 25)
         Me.FOLDER_FOR_INDEXTextBox.TabIndex = 11
         '
         'Label25
@@ -2471,7 +2469,7 @@ Partial Class frmAdministration
         'btncrFolder_delete
         '
         Me.btncrFolder_delete.Image = Global.Global_Indexer.My.Resources.Resources.delete_12x12
-        Me.btncrFolder_delete.Location = New System.Drawing.Point(511, 38)
+        Me.btncrFolder_delete.Location = New System.Drawing.Point(715, 41)
         Me.btncrFolder_delete.Name = "btncrFolder_delete"
         Me.btncrFolder_delete.Size = New System.Drawing.Size(31, 23)
         Me.btncrFolder_delete.TabIndex = 9
@@ -2668,7 +2666,7 @@ Partial Class frmAdministration
         'btnNamenkonvention
         '
         Me.btnNamenkonvention.Image = Global.Global_Indexer.My.Resources.Resources.database_go
-        Me.btnNamenkonvention.Location = New System.Drawing.Point(621, 230)
+        Me.btnNamenkonvention.Location = New System.Drawing.Point(621, 232)
         Me.btnNamenkonvention.Name = "btnNamenkonvention"
         Me.btnNamenkonvention.Size = New System.Drawing.Size(38, 23)
         Me.btnNamenkonvention.TabIndex = 29
@@ -2686,22 +2684,23 @@ Partial Class frmAdministration
         'NAMENKONVENTIONTextBox
         '
         Me.NAMENKONVENTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True))
+        Me.NAMENKONVENTIONTextBox.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.NAMENKONVENTIONTextBox.Location = New System.Drawing.Point(267, 231)
         Me.NAMENKONVENTIONTextBox.Name = "NAMENKONVENTIONTextBox"
-        Me.NAMENKONVENTIONTextBox.Size = New System.Drawing.Size(339, 23)
+        Me.NAMENKONVENTIONTextBox.Size = New System.Drawing.Size(339, 25)
         Me.NAMENKONVENTIONTextBox.TabIndex = 27
         '
-        'ListBox1
+        'ListBoxDokart
         '
-        Me.ListBox1.DataSource = Me.TBDD_DOKUMENTARTBindingSource
-        Me.ListBox1.DisplayMember = "BEZEICHNUNG"
-        Me.ListBox1.FormattingEnabled = True
-        Me.ListBox1.ItemHeight = 15
-        Me.ListBox1.Location = New System.Drawing.Point(3, 28)
-        Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(240, 259)
-        Me.ListBox1.TabIndex = 26
-        Me.ListBox1.ValueMember = "GUID"
+        Me.ListBoxDokart.DataSource = Me.TBDD_DOKUMENTARTBindingSource
+        Me.ListBoxDokart.DisplayMember = "BEZEICHNUNG"
+        Me.ListBoxDokart.FormattingEnabled = True
+        Me.ListBoxDokart.ItemHeight = 15
+        Me.ListBoxDokart.Location = New System.Drawing.Point(3, 28)
+        Me.ListBoxDokart.Name = "ListBoxDokart"
+        Me.ListBoxDokart.Size = New System.Drawing.Size(240, 259)
+        Me.ListBoxDokart.TabIndex = 26
+        Me.ListBoxDokart.ValueMember = "GUID"
         '
         'TBDD_DOKUMENTARTBindingNavigator
         '
@@ -2824,12 +2823,11 @@ Partial Class frmAdministration
         '
         'ToolStripButton40
         '
-        Me.ToolStripButton40.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton40.Image = Global.Global_Indexer.My.Resources.Resources.arrow_refresh
+        Me.ToolStripButton40.Image = Global.Global_Indexer.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton40.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton40.Name = "ToolStripButton40"
-        Me.ToolStripButton40.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton40.Text = "ToolStripButton40"
+        Me.ToolStripButton40.Size = New System.Drawing.Size(95, 22)
+        Me.ToolStripButton40.Text = "Aktualisieren"
         '
         'tsbtnCopyDoctype
         '
@@ -4108,7 +4106,7 @@ Partial Class frmAdministration
     Friend WithEvents BindingNavigatorSeparator2 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents TBDD_DOKUMENTARTBindingNavigatorSaveItem As System.Windows.Forms.ToolStripButton
     Friend WithEvents NAMENKONVENTIONTextBox As System.Windows.Forms.TextBox
-    Friend WithEvents ListBox1 As System.Windows.Forms.ListBox
+    Friend WithEvents ListBoxDokart As System.Windows.Forms.ListBox
     Friend WithEvents DOKART_GUIDTextBox As System.Windows.Forms.TextBox
     Friend WithEvents BEZEICHNUNGTextBox As System.Windows.Forms.TextBox
     Friend WithEvents KURZNAMETextBox As System.Windows.Forms.TextBox
diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb
index b54bea5..f7ada6a 100644
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@@ -60,7 +60,6 @@
         If frmloaded = False Then
             Exit Sub
         End If
-        Save_Dokumentart()
         Select Case XtraTabControl2.SelectedTabPageIndex
             Case 0
                 If DOKART_GUIDTextBox.Text <> "" Then
@@ -215,11 +214,14 @@
             MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices2AutoIndizes: ")
         End Try
     End Sub
-    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged
-        If Not ListBox1.SelectedValue Is Nothing Then
-            Load_ZuordnungDokart_Module(ListBox1.SelectedValue)
-            Load_TabData()
+    Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxDokart.SelectedIndexChanged
+        If ListBoxDokart.SelectedIndex <> -1 Then
+            If Not ListBoxDokart.SelectedValue Is Nothing Then
+                Load_ZuordnungDokart_Module(ListBoxDokart.SelectedValue)
+                Load_TabData()
+            End If
         End If
+     
 
     End Sub
 
@@ -572,7 +574,6 @@
     End Sub
 
     Public Sub New()
-
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
         Try
@@ -894,10 +895,6 @@
         cmbCrFolderIndex.SelectedIndex = -1
     End Sub
 
-    Private Sub XtraTabControl2_SelectedPageChanging(sender As Object, e As DevExpress.XtraTab.TabPageChangingEventArgs) Handles XtraTabControl2.SelectedPageChanging
-
-    End Sub
-
     Private Sub tsbtnCopyDoctype_Click(sender As Object, e As EventArgs) Handles tsbtnCopyDoctype.Click
         Dim result As MsgBoxResult
         result = MessageBox.Show("Sind Sie sicher dass Sie diese Dokumentart kopieren wollen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
@@ -918,4 +915,13 @@
             End Try
         End If
     End Sub
+
+    Private Sub FOLDER_FOR_INDEXTextBox_LostFocus(sender As Object, e As EventArgs) Handles FOLDER_FOR_INDEXTextBox.LostFocus
+        'Me.TBDD_DOKUMENTARTTableAdapter.cmdUpdateFolderIndex(Environment.UserName, FOLDER_FOR_INDEXTextBox.Text, DOKART_GUIDTextBox.Text)
+        'Me.lblSaveDokart.Visible = True
+    End Sub
+
+    Private Sub XtraTabControl2_SelectedPageChanging(sender As Object, e As DevExpress.XtraTab.TabPageChangingEventArgs) Handles XtraTabControl2.SelectedPageChanging
+        Save_Dokumentart()
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Global_Indexer/frmHotKey_Add.Designer.vb b/Global_Indexer/frmHotKey_Add.Designer.vb
index 1cb2e07..bdc5b2b 100644
--- a/Global_Indexer/frmHotKey_Add.Designer.vb
+++ b/Global_Indexer/frmHotKey_Add.Designer.vb
@@ -1481,7 +1481,7 @@ Partial Class frmHotKey_Add
         Me.lblsavePatternsRework.AutoSize = True
         Me.lblsavePatternsRework.BackColor = System.Drawing.Color.Yellow
         Me.lblsavePatternsRework.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblsavePatternsRework.Location = New System.Drawing.Point(437, 89)
+        Me.lblsavePatternsRework.Location = New System.Drawing.Point(225, 161)
         Me.lblsavePatternsRework.Name = "lblsavePatternsRework"
         Me.lblsavePatternsRework.Size = New System.Drawing.Size(164, 13)
         Me.lblsavePatternsRework.TabIndex = 81
@@ -1491,7 +1491,7 @@ Partial Class frmHotKey_Add
         'CHANGED_WHOTextBox1
         '
         Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBHOTKEY_PATTERNS_REWORKBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(230, 136)
+        Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(228, 136)
         Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1"
         Me.CHANGED_WHOTextBox1.ReadOnly = True
         Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(100, 22)
diff --git a/Global_Indexer/frmHotKey_Add.resx b/Global_Indexer/frmHotKey_Add.resx
index abc1b8f..2c39b7d 100644
--- a/Global_Indexer/frmHotKey_Add.resx
+++ b/Global_Indexer/frmHotKey_Add.resx
@@ -231,80 +231,22 @@
   <metadata name="TBHOTKEY_WINDOW_HOOKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>471, 95</value>
   </metadata>
-  <metadata name="TBHOTKEY_WINDOW_HOOKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>471, 95</value>
-  </metadata>
   <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1040, 95</value>
   </metadata>
-  <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1040, 95</value>
+  <metadata name="TBHOTKEY_PATTERNS_REWORKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1098, 56</value>
+  </metadata>
+  <metadata name="TBHOTKEY_PATTERNS_REWORKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1098, 56</value>
+  </metadata>
+  <metadata name="TBHOTKEY_PATTERNS_REWORKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1098, 56</value>
+  </metadata>
+  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>317, 95</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
-        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
-        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
-        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
-        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
-        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
-        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
-        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
-        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
-        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
-        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
-        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
-        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
-        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
-        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="BindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
-        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
-        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
-        oAc0QjgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
-        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
-        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
-        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
-        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
-        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>317, 95</value>
-  </metadata>
-  <metadata name="TBHOTKEY_PATTERNS_REWORKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1098, 56</value>
-  </metadata>
-  <metadata name="TBHOTKEY_PATTERNS_REWORKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1098, 56</value>
-  </metadata>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>317, 95</value>
-  </metadata>
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -372,6 +314,64 @@
   <metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1194, 95</value>
   </metadata>
+  <metadata name="TBHOTKEY_WINDOW_HOOKBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>471, 95</value>
+  </metadata>
+  <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1040, 95</value>
+  </metadata>
+  <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1194, 95</value>
   </metadata>
diff --git a/Global_Indexer/frmHotKey_Add.vb b/Global_Indexer/frmHotKey_Add.vb
index 5e102ea..424feb2 100644
--- a/Global_Indexer/frmHotKey_Add.vb
+++ b/Global_Indexer/frmHotKey_Add.vb
@@ -718,4 +718,15 @@
         GroupBox2_Controls.Visible = False
         ListBox_FormTitles.Enabled = True
     End Sub
+
+    Private Sub TEXT1TextBox_TextChanged(sender As Object, e As EventArgs) Handles TEXT1TextBox.TextChanged
+        If TEXT1TextBox.Text = " " Then
+            TEXT1TextBox.SelectAll()
+            TEXT1TextBox.BackColor = Color.DarkOrange
+            TEXT1TextBox.ForeColor = Color.White
+        Else
+            TEXT1TextBox.BackColor = Color.White
+            TEXT1TextBox.ForeColor = Color.Black
+        End If
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Global_Indexer/frmHotkey_User.Designer.vb b/Global_Indexer/frmHotkey_User.Designer.vb
index e04e868..adf6860 100644
--- a/Global_Indexer/frmHotkey_User.Designer.vb
+++ b/Global_Indexer/frmHotkey_User.Designer.vb
@@ -50,6 +50,7 @@ Partial Class frmHotkey_User
         Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
         Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.chkbxMaximizeWS = New System.Windows.Forms.CheckBox()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.lblSave = New System.Windows.Forms.Label()
         Me.btnsave = New System.Windows.Forms.Button()
@@ -173,6 +174,7 @@ Partial Class frmHotkey_User
         Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing
         Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Me.TBHOTKEY_PROFILETableAdapter
         Me.TableAdapterManager.TBHOTKEY_USER_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_WINDOW_HOOKTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = Global_Indexer.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'ListBox1
@@ -280,6 +282,7 @@ Partial Class frmHotkey_User
         '
         'GroupBox1
         '
+        Me.GroupBox1.Controls.Add(Me.chkbxMaximizeWS)
         Me.GroupBox1.Controls.Add(Me.Button1)
         Me.GroupBox1.Controls.Add(Me.lblSave)
         Me.GroupBox1.Controls.Add(Me.btnsave)
@@ -297,11 +300,24 @@ Partial Class frmHotkey_User
         Me.GroupBox1.Controls.Add(Me.HOTKEY2TextBox)
         Me.GroupBox1.Location = New System.Drawing.Point(15, 284)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(731, 147)
+        Me.GroupBox1.Size = New System.Drawing.Size(731, 181)
         Me.GroupBox1.TabIndex = 18
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Bearbeitung Hotkey:"
         '
+        'chkbxMaximizeWS
+        '
+        Me.chkbxMaximizeWS.AutoSize = True
+        Me.chkbxMaximizeWS.Checked = Global.Global_Indexer.My.MySettings.Default.WDSearch_maximized
+        Me.chkbxMaximizeWS.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.chkbxMaximizeWS.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.Global_Indexer.My.MySettings.Default, "WDSearch_maximized", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.chkbxMaximizeWS.Location = New System.Drawing.Point(9, 143)
+        Me.chkbxMaximizeWS.Name = "chkbxMaximizeWS"
+        Me.chkbxMaximizeWS.Size = New System.Drawing.Size(203, 17)
+        Me.chkbxMaximizeWS.TabIndex = 81
+        Me.chkbxMaximizeWS.Text = "windream-Suche maximiert starten"
+        Me.chkbxMaximizeWS.UseVisualStyleBackColor = True
+        '
         'Button1
         '
         Me.Button1.Location = New System.Drawing.Point(640, 36)
@@ -417,4 +433,5 @@ Partial Class frmHotkey_User
     Friend WithEvents lblSave As System.Windows.Forms.Label
     Friend WithEvents Button1 As System.Windows.Forms.Button
     Friend WithEvents OFDWindreamsuche As System.Windows.Forms.OpenFileDialog
+    Friend WithEvents chkbxMaximizeWS As System.Windows.Forms.CheckBox
 End Class
diff --git a/Global_Indexer/frmHotkey_User.vb b/Global_Indexer/frmHotkey_User.vb
index 40fd321..9288b3d 100644
--- a/Global_Indexer/frmHotkey_User.vb
+++ b/Global_Indexer/frmHotkey_User.vb
@@ -97,4 +97,8 @@
     Private Sub HOTKEY2TextBox_KeyDown(sender As Object, e As KeyEventArgs) Handles HOTKEY2TextBox.KeyDown
         HOTKEY2TextBox.Text = ""
     End Sub
+
+    Private Sub chkbxMaximizeWS_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxMaximizeWS.CheckedChanged
+        My.Settings.Save()
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx
index e7981cf..e9170d3 100644
--- a/Global_Indexer/frmIndex.resx
+++ b/Global_Indexer/frmIndex.resx
@@ -120,9 +120,6 @@
   <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 212</value>
   </metadata>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 212</value>
-  </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -150,9 +147,6 @@
   <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1212, 173</value>
   </metadata>
-  <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1212, 173</value>
-  </metadata>
   <metadata name="PdfBarController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>244, 56</value>
   </metadata>
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 87beb3a..33d4b11 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -154,24 +154,28 @@ Public Class frmIndex
                 cmb.Width = g.MeasureString(cmb.Text, cmb.Font).Width + 30
                 g.Dispose()
             End If
-            Try
-                Dim indexname = cmb.Name.Replace("cmb", "")
-                Dim sql = "SELECT GUID,NAME,SQL_RESULT FROM TBDD_INDEX_MAN where SUGGESTION = 1 AND SQL_RESULT like '%@" & indexname & "%' and DOK_ID = " & CURRENT_DOKART_ID & " ORDER BY SEQUENCE"
-                Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
-                If Not IsNothing(DT) Then
-                    If DT.Rows.Count > 0 Then
-                        Dim cmbname = "cmb" & DT.Rows(0).Item("NAME")
-                        Renew_ComboboxResults(DT.Rows(0).Item("GUID"), indexname, cmb.Text)
-                    End If
-                  
-                End If
-            Catch ex As Exception
-                MsgBox("Error in ComboBox - Get Patterns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End Try
+            Get_NextComboBoxResults(cmb)
+           
 
             SendKeys.Send("{TAB}")
         End If
     End Sub
+    Sub Get_NextComboBoxResults(cmb As ComboBox)
+        Try
+            Dim indexname = cmb.Name.Replace("cmb", "")
+            Dim sql = "SELECT GUID,NAME,SQL_RESULT FROM TBDD_INDEX_MAN where SUGGESTION = 1 AND SQL_RESULT like '%@" & indexname & "%' and DOK_ID = " & CURRENT_DOKART_ID & " ORDER BY SEQUENCE"
+            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+            If Not IsNothing(DT) Then
+                If DT.Rows.Count > 0 Then
+                    Dim cmbname = "cmb" & DT.Rows(0).Item("NAME")
+                    Renew_ComboboxResults(DT.Rows(0).Item("GUID"), indexname, cmb.Text)
+                End If
+
+            End If
+        Catch ex As Exception
+            MsgBox("Error in Get_NextComboBoxResults:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
     '    'Public Sub AutoCompleteCombo_KeyUp(ByVal cbo As ComboBox, ByVal e As KeyEventArgs)
     '    '    System.Threading.Thread.Sleep(400)
     '    '    Dim sTypedText As String
@@ -404,6 +408,10 @@ Public Class frmIndex
                     ergebnis = ClassDatabase.Execute_Scalar(vsqlstatement, connectionString)
                 End If
 
+                If LogErrorsOnly = False Then
+                    ClassLogger.Add(" ...SQL-ConnectionString: " & connectionString.Substring(0, connectionString.LastIndexOf("=")), False)
+                End If
+
                 If ergebnis Is Nothing Then
                     showlblhinweis("Kein Ergebnis für automatisches SQL: " & vsqlstatement)
                     Return ""
@@ -497,6 +505,7 @@ Public Class frmIndex
                         If Vorgabe <> "" Then
                             newCMB.SelectedIndex = newCMB.FindStringExact(Vorgabe)
                             newCMB.Text = Vorgabe
+                            Get_NextComboBoxResults(newCMB)
                         End If
                     Else
 
@@ -841,7 +850,7 @@ Public Class frmIndex
                                 End If
                                
                             Else
-                                ClassLogger.Add(" >> Der Indexvalue ist String.Empty", False)
+                                ClassLogger.Add(" >> Der Indexvalue für Index '" & Indexname & "' ist String.Empty", False)
                                 err = True
                             End If
 
@@ -1368,7 +1377,7 @@ Public Class frmIndex
     '    <STAThread()> _
     Private Sub Refresh_IndexeMan(dokartid As Integer)
         Try
-            DT_INDEXEMAN = ClassDatabase.Return_Datatable("select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid)
+            DT_INDEXEMAN = ClassDatabase.Return_Datatable("select T1.BEZEICHNUNG AS DOKUMENTART,T.* from TBDD_INDEX_MAN T, TBDD_DOKUMENTART T1 where T.ACTIVE = 1 AND T.DOK_ID = T1.GUID AND T.DOK_ID = " & dokartid)
             pnlIndex.Visible = True
             LoadIndexe_Man()
         Catch ex As System.Exception
diff --git a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb
index 201f93c..411ad50 100644
--- a/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb
+++ b/Global_Indexer/frmSQLConfigAutoIndex.Designer.vb
@@ -56,7 +56,7 @@ Partial Class SQLConfigAutoIndex
         Me.btnVorschlag.Name = "btnVorschlag"
         Me.btnVorschlag.Size = New System.Drawing.Size(151, 25)
         Me.btnVorschlag.TabIndex = 48
-        Me.btnVorschlag.Text = "Teste Vorschlagsliste"
+        Me.btnVorschlag.Text = "Teste SQL"
         Me.btnVorschlag.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnVorschlag.UseVisualStyleBackColor = True
         '
@@ -64,9 +64,11 @@ Partial Class SQLConfigAutoIndex
         '
         Me.SQL_ERGEBNISTextBox.AcceptsReturn = True
         Me.SQL_ERGEBNISTextBox.AcceptsTab = True
+        Me.SQL_ERGEBNISTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.SQL_ERGEBNISTextBox.Location = New System.Drawing.Point(15, 82)
         Me.SQL_ERGEBNISTextBox.Multiline = True
         Me.SQL_ERGEBNISTextBox.Name = "SQL_ERGEBNISTextBox"
+        Me.SQL_ERGEBNISTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both
         Me.SQL_ERGEBNISTextBox.Size = New System.Drawing.Size(654, 136)
         Me.SQL_ERGEBNISTextBox.TabIndex = 47
         '
@@ -109,6 +111,11 @@ Partial Class SQLConfigAutoIndex
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_USER_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_WINDOW_HOOKTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = Global_Indexer.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'Button1
diff --git a/Global_Indexer/frmSQLConfigAutoIndex.vb b/Global_Indexer/frmSQLConfigAutoIndex.vb
index ef149e3..706abd0 100644
--- a/Global_Indexer/frmSQLConfigAutoIndex.vb
+++ b/Global_Indexer/frmSQLConfigAutoIndex.vb
@@ -110,4 +110,11 @@ Public Class SQLConfigAutoIndex
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Save SQL IndexAuto:")
         End Try
     End Sub
+
+    Private Sub SQL_ERGEBNISTextBox_KeyPress(sender As Object, e As KeyPressEventArgs) Handles SQL_ERGEBNISTextBox.KeyPress
+        If e.KeyChar = Convert.ToChar(1) Then
+            DirectCast(sender, TextBox).SelectAll()
+            e.Handled = True
+        End If
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Global_Indexer/frmSQLSuggestion.Designer.vb b/Global_Indexer/frmSQLSuggestion.Designer.vb
index 7f4bb1c..1883958 100644
--- a/Global_Indexer/frmSQLSuggestion.Designer.vb
+++ b/Global_Indexer/frmSQLSuggestion.Designer.vb
@@ -113,20 +113,23 @@ Partial Class frmSQLSuggestion
         Me.btnVorschlag.Name = "btnVorschlag"
         Me.btnVorschlag.Size = New System.Drawing.Size(151, 25)
         Me.btnVorschlag.TabIndex = 48
-        Me.btnVorschlag.Text = "Teste Vorschlagsliste"
+        Me.btnVorschlag.Text = "Teste SQL"
         Me.btnVorschlag.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnVorschlag.UseVisualStyleBackColor = True
         '
         'SQL_ERGEBNISTextBox
         '
+        Me.SQL_ERGEBNISTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.SQL_ERGEBNISTextBox.Location = New System.Drawing.Point(15, 82)
         Me.SQL_ERGEBNISTextBox.Multiline = True
         Me.SQL_ERGEBNISTextBox.Name = "SQL_ERGEBNISTextBox"
+        Me.SQL_ERGEBNISTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both
         Me.SQL_ERGEBNISTextBox.Size = New System.Drawing.Size(351, 136)
         Me.SQL_ERGEBNISTextBox.TabIndex = 47
         '
         'SQL_UEBERPRUEFUNGTextBox
         '
+        Me.SQL_UEBERPRUEFUNGTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.SQL_UEBERPRUEFUNGTextBox.Location = New System.Drawing.Point(536, 82)
         Me.SQL_UEBERPRUEFUNGTextBox.Multiline = True
         Me.SQL_UEBERPRUEFUNGTextBox.Name = "SQL_UEBERPRUEFUNGTextBox"
@@ -164,11 +167,19 @@ Partial Class frmSQLSuggestion
         Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter
         Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_INDEX_MANTableAdapter = Nothing
+        Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_USER_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBHOTKEY_WINDOW_HOOKTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = Global_Indexer.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'Button1
diff --git a/Global_Indexer/frmSQLSuggestion.resx b/Global_Indexer/frmSQLSuggestion.resx
index dc1a376..d18b4cc 100644
--- a/Global_Indexer/frmSQLSuggestion.resx
+++ b/Global_Indexer/frmSQLSuggestion.resx
@@ -126,6 +126,12 @@
   <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>127, 17</value>
   </metadata>
+  <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
+  <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="MyDataset.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/frmSQLSuggestion.vb b/Global_Indexer/frmSQLSuggestion.vb
index 973355e..6973496 100644
--- a/Global_Indexer/frmSQLSuggestion.vb
+++ b/Global_Indexer/frmSQLSuggestion.vb
@@ -90,7 +90,7 @@ Public Class frmSQLSuggestion
             Else
                 isinsert = True
             End If
-            lblSave.Visible = True
+            lblSave.Visible = False
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Open Form:")
         End Try
@@ -147,4 +147,12 @@ Public Class frmSQLSuggestion
             End If
         End If
     End Sub
+
+
+    Private Sub SQL_ERGEBNISTextBox_KeyPress(sender As Object, e As KeyPressEventArgs) Handles SQL_ERGEBNISTextBox.KeyPress
+        If e.KeyChar = Convert.ToChar(1) Then
+            DirectCast(sender, TextBox).SelectAll()
+            e.Handled = True
+        End If
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Global_Indexer/frmSQL_Admin.designer.vb b/Global_Indexer/frmSQL_Admin.designer.vb
index 32f8796..5cd2945 100644
--- a/Global_Indexer/frmSQL_Admin.designer.vb
+++ b/Global_Indexer/frmSQL_Admin.designer.vb
@@ -33,8 +33,10 @@ Partial Class frmSQL_Admin
         Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
         Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
-        Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components)
+        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
         Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
         Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
@@ -44,17 +46,15 @@ Partial Class frmSQL_Admin
         Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
-        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
         Me.XtraTabPage1.SuspendLayout()
         Me.XtraTabPage2.SuspendLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.BindingNavigator1.SuspendLayout()
-        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'Label1
@@ -114,7 +114,7 @@ Partial Class frmSQL_Admin
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtSQL.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSQL.Location = New System.Drawing.Point(3, 3)
+        Me.txtSQL.Location = New System.Drawing.Point(-1, 11)
         Me.txtSQL.Multiline = True
         Me.txtSQL.Name = "txtSQL"
         Me.txtSQL.ScrollBars = System.Windows.Forms.ScrollBars.Both
@@ -145,6 +145,33 @@ Partial Class frmSQL_Admin
         Me.XtraTabPage2.Size = New System.Drawing.Size(721, 377)
         Me.XtraTabPage2.Text = "Ergebnis:"
         '
+        'GridControl1
+        '
+        Me.GridControl1.DataSource = Me.BindingSource1
+        Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.GridControl1.Location = New System.Drawing.Point(0, 25)
+        Me.GridControl1.MainView = Me.GridView1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.Size = New System.Drawing.Size(721, 352)
+        Me.GridControl1.TabIndex = 1
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'GridView1
+        '
+        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridView1.Appearance.OddRow.BackColor = System.Drawing.Color.White
+        Me.GridView1.Appearance.OddRow.Options.UseBackColor = True
+        Me.GridView1.GridControl = Me.GridControl1
+        Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView1.OptionsBehavior.Editable = False
+        Me.GridView1.OptionsBehavior.ReadOnly = True
+        Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridView1.OptionsView.EnableAppearanceOddRow = True
+        Me.GridView1.OptionsView.ShowAutoFilterRow = True
+        '
         'BindingNavigator1
         '
         Me.BindingNavigator1.AddNewItem = Nothing
@@ -231,33 +258,6 @@ Partial Class frmSQL_Admin
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
         Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25)
         '
-        'GridControl1
-        '
-        Me.GridControl1.DataSource = Me.BindingSource1
-        Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GridControl1.Location = New System.Drawing.Point(0, 25)
-        Me.GridControl1.MainView = Me.GridView1
-        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(721, 352)
-        Me.GridControl1.TabIndex = 1
-        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
-        '
-        'GridView1
-        '
-        Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
-        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridView1.Appearance.OddRow.BackColor = System.Drawing.Color.White
-        Me.GridView1.Appearance.OddRow.Options.UseBackColor = True
-        Me.GridView1.GridControl = Me.GridControl1
-        Me.GridView1.Name = "GridView1"
-        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView1.OptionsBehavior.Editable = False
-        Me.GridView1.OptionsBehavior.ReadOnly = True
-        Me.GridView1.OptionsView.EnableAppearanceEvenRow = True
-        Me.GridView1.OptionsView.EnableAppearanceOddRow = True
-        Me.GridView1.OptionsView.ShowAutoFilterRow = True
-        '
         'frmSQL_Admin
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
@@ -279,12 +279,12 @@ Partial Class frmSQL_Admin
         Me.XtraTabPage1.PerformLayout()
         Me.XtraTabPage2.ResumeLayout(False)
         Me.XtraTabPage2.PerformLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.BindingNavigator1.ResumeLayout(False)
         Me.BindingNavigator1.PerformLayout()
-        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
diff --git a/Global_Indexer/frmSQL_Admin.resx b/Global_Indexer/frmSQL_Admin.resx
index 3614138..ab9a971 100644
--- a/Global_Indexer/frmSQL_Admin.resx
+++ b/Global_Indexer/frmSQL_Admin.resx
@@ -120,15 +120,12 @@
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>159, 17</value>
-  </metadata>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>159, 17</value>
-  </metadata>
   <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>313, 17</value>
   </metadata>
+  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>159, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index eacefb7..b9b77d5 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -83,10 +83,11 @@ Public Class frmStart
     Sub Check_Dropped_Files()
         Try
             ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+            CURRENT_ABBRUCH = 0
             Dim i As Integer
             For Each Str As Object In ClassDragDrop.files_dropped
                 If Not Str Is Nothing Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(">> Check Drop-File:" & Str.ToString, False)
+                    If LogErrorsOnly = False Then ClassLogger.Add(">> Check Drop-File: " & Str.ToString, False)
                     Dim handleType As String = Str.Substring(0, Str.LastIndexOf("@") + 1)
                     Dim filename As String = Str.Substring(Str.LastIndexOf("@") + 1)
                     If ClassIndexFunctions.FileExistsinDropTable(filename) = False Then
@@ -99,16 +100,17 @@ Public Class frmStart
                     Else
                         Console.WriteLine("File gibt es bereits")
                     End If
-                    
+
                 End If
             Next
 
             Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
             Dim DTFiles As DataTable = ClassDatabase.Return_Datatable(sql, True)
             For Each Filerow As DataRow In DTFiles.Rows
-                'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "")
+                CURRENT_FILENAME = Filerow.Item(0)
                 CURRENT_WORKFILE_GUID = Filerow.Item(0)
                 CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK")
+                If LogErrorsOnly = False Then ClassLogger.Add(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE, False)
                 Open_IndexDialog()
             Next
 
@@ -146,7 +148,6 @@ Public Class frmStart
                     End If
                 Next
             End If
-
         Catch ex As Exception
             MsgBox("Check_Dropped_Files: " & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -166,13 +167,12 @@ Public Class frmStart
                             CURRENT_ABBRUCH = 1
                         Case 1
                             CURRENT_ABBRUCH = 2
-                        Case 2
-                            CURRENT_ABBRUCH = 0
                     End Select
                     If CURRENT_ABBRUCH = 2 Then
                         Dim result As MsgBoxResult
                         result = MessageBox.Show("Sie brechen nun zum zweiten Mal den Indexierungsvorgang ab!" & vbNewLine & "Wollen Sie abbrechen?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                         If result = MsgBoxResult.Yes Then
+                            CURRENT_ABBRUCH = 0
                             Exit Sub
                         End If
                     Else
@@ -213,6 +213,7 @@ Public Class frmStart
                 Next
             End If
         Catch ex As Exception
+            MsgBox("Fehler bei Aufruf Indexdialog: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Me.Visible = True
         End Try
     End Sub
diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index 043cb10..c00d6cb 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="1.2.4.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="1.7.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
     <Package Id="*" Keywords="Installer" Description="Digital Data Global Indexer Setup" Comments="Global Indexer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
 
     <!-- Nicht entfernen! -->
@@ -33,7 +33,7 @@
     <!-- UPGRADE END -->
 
     <!-- Legt das Icon fest -->
-    <Icon Id="GlobalIndexer.exe" SourceFile="Global_Indexer.exe" />
+    <Icon Id="GlobalIndexer.exe" SourceFile="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\bin\Debug\Global_Indexer.exe" />
 
     <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
     <Property Id="ARPPRODUCTICON" Value="GlobalIndexer.exe" />
@@ -56,48 +56,77 @@
           </Component>
 
           <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Global Indexer 1.0">
+          <Directory Id="INSTALLDIR" Name="Global Indexer">
 
             <!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-              <File Id="GIEXE" Name="Global_Indexer.exe" Source="Global_Indexer.exe" KeyPath="yes">
+            <Component Id="MainExecutable" Guid="EE8034F0-A2DE-4C38-A961-7F7668229416">
+              <File Id="GIEXE" Name="Global_Indexer.exe" Source="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\bin\Debug\Global_Indexer.exe" KeyPath="yes">
                 <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
                 <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
               </File>
               <!-- Programmordner bei Deinstallation entfernen-->
               <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
             </Component>
+            <!-- Die ReleaseNotes -->
+            <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
+              <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\GlobalIndexer\Release Notes.txt" KeyPath="yes">
+              </File>
+            </Component>
 
-            <!-- WINDREAM Bibliotheken -->
+             <!--WINDREAM Bibliotheken--> 
             <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="AxInterop.INDEXLib.dll" KeyPath="yes" />
-              <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="OBJECTLISTCONTROLLibDDL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" KeyPath="no" />
+              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll" KeyPath="yes" />
+              <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="\\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
+              <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\obj\Debug\Interop.WMOBRWSLib.dll" KeyPath="no" />
+              <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="E:\SchreiberM\Visual Studio\GIT\GlobalIndexer\Global_Indexer\obj\Debug\Interop.WMOSRCHLib.dll" KeyPath="no" />
             </Component>
 
             <!-- MAIL.NET Bibliothek -->
             <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
+              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="\\dd-sto01\DD-STO01-A2\Projekte\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
             </Component>
 
             <!-- DEVEXPRESS Bibliotheken -->
             <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Data.v14.2" Name="DevExpress.Data.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Data.v14.2.dll" KeyPath="yes" />
-              <File Id="DevExpress.Office.v14.2.Core" Name="DevExpress.Office.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Office.v14.2.Core.dll" />
-              <File Id="DevExpress.Printing.v14.2.Core" Name="DevExpress.Printing.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Printing.v14.2.Core.dll" />
-              <File Id="DevExpress.RichEdit.v14.2.Core" Name="DevExpress.RichEdit.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.RichEdit.v14.2.Core.dll" />
-              <File Id="DevExpress.Utils.v14.2" Name="DevExpress.Utils.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Utils.v14.2.dll" />
-              <File Id="DevExpress.XtraBars.v14.2" Name="DevExpress.XtraBars.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraBars.v14.2.dll" />
-              <File Id="DevExpress.XtraEditors.v14.2" Name="DevExpress.XtraEditors.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraEditors.v14.2.dll" />
-              <File Id="DevExpress.XtraGrid.v14.2" Name="DevExpress.XtraGrid.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraGrid.v14.2.dll" />
-              <File Id="DevExpress.XtraLayout.v14.2" Name="DevExpress.XtraLayout.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraLayout.v14.2.dll" />
-              <File Id="DevExpress.XtraNavBar.v14.2" Name="DevExpress.XtraNavBar.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraNavBar.v14.2.dll" />
-              <File Id="DevExpress.XtraPrinting.v14.2" Name="DevExpress.XtraPrinting.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraPrinting.v14.2.dll" />
-              <File Id="DevExpress.XtraRichEdit.v14.2" Name="DevExpress.XtraRichEdit.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v14.2.dll" />
-              <File Id="DevExpress.XtraTreeList.v14.2" Name="DevExpress.XtraTreeList.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraTreeList.v14.2.dll" />
-              <File Id="DevExpress.XtraVerticalGrid.v14.2" Name="DevExpress.XtraVerticalGrid.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraVerticalGrid.v14.2.dll" />
-              <File Id="DevExpress.XtraWizard.v14.2" Name="DevExpress.XtraWizard.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraWizard.v14.2.dll" />
+              <File Id="DevExpress.Charts.v14.2.Core" Name="DevExpress.Charts.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Charts.v14.2.Core.dll" KeyPath="yes" />
+              <File Id="DevExpress.Data.v14.2" Name="DevExpress.Data.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Data.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.DataAccess.v14.2" Name="DevExpress.DataAccess.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.DataAccess.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.DataAccess.v14.2.UI.dll" Name="DevExpress.DataAccess.v14.2.UI.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.DataAccess.v14.2.UI.dll" KeyPath="no" />
+              <File Id="DevExpress.Office.v14.2.Core" Name="DevExpress.Office.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Office.v14.2.Core.dll" KeyPath="no"/>
+              <File Id="DevExpress.Pdf.v14.2.Core" Name="DevExpress.Pdf.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Pdf.v14.2.Core.dll" KeyPath="no"/>
+              <File Id="DevExpress.Pdf.v14.2.Drawing" Name="DevExpress.Pdf.v14.2.Drawing.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Pdf.v14.2.Drawing.dll" KeyPath="no" />
+              <File Id="DevExpress.Printing.v14.2.Core" Name="DevExpress.Printing.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Printing.v14.2.Core.dll" KeyPath="no" />
+              <File Id="DevExpress.RichEdit.v14.2.Core" Name="DevExpress.RichEdit.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.RichEdit.v14.2.Core.dll" KeyPath="no" />
+              <File Id="DevExpress.Sparkline.v14.2.Core" Name="DevExpress.Sparkline.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Sparkline.v14.2.Core.dll" KeyPath="no" />
+              <File Id="DevExpress.Spreadsheet.v14.2.Core" Name="DevExpress.Spreadsheet.v14.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Spreadsheet.v14.2.Core.dll" KeyPath="no" />
+              <File Id="DevExpress.Utils.v14.2" Name="DevExpress.Utils.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Utils.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.Utils.v14.2.UI" Name="DevExpress.Utils.v14.2.UI.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.Utils.v14.2.UI.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraCharts.v14.2" Name="DevExpress.XtraCharts.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraCharts.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraBars.v14.2" Name="DevExpress.XtraBars.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraBars.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraEditors.v14.2" Name="DevExpress.XtraEditors.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraEditors.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraGrid.v14.2" Name="DevExpress.XtraGrid.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraGrid.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraNavBar.v14.2" Name="DevExpress.XtraNavBar.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraNavBar.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraPdfViewer.v14.2" Name="DevExpress.XtraPdfViewer.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraPdfViewer.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraPrinting.v14.2" Name="DevExpress.XtraPrinting.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraPrinting.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraRichEdit.v14.2" Name="DevExpress.XtraRichEdit.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraSpreadsheet.v14.2" Name="DevExpress.XtraSpreadsheet.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v14.2.dll" KeyPath="no" />
+              <File Id="DevExpress.XtraTreeList.v14.2" Name="DevExpress.XtraTreeList.v14.2.dll" Source="D:\Programme\Sprachen\DevExpress 14.2\Components\Bin\Framework\DevExpress.XtraTreeList.v14.2.dll" KeyPath="no" />
+            </Component>
+            
+             <!-- Digital-Data DLLS -->
+            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
+              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="E:\SchreiberM\Visual Studio\Kunden - Produktiv\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll" KeyPath="yes" />
+            </Component>
+            
+           <!-- Office-Bibliotheken -->
+            <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
+              <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
+              <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
+            </Component>
+          
+           <!-- Oracle-Bibliothek -->
+            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
             </Component>
           </Directory>
         </Directory>
@@ -122,10 +151,12 @@
     <!-- Installierte Features -->
     <Feature Id="Complete" Level="1">
       <ComponentRef Id="MainExecutable" />
+      <ComponentRef Id="ReleaseNotes"/>
       <ComponentRef Id="WindreamLibs" />
       <ComponentRef Id="DDLibs" />
       <ComponentRef Id="IndependentsoftLibs" />
-      <ComponentRef Id="Scheduler.Locales" />
+      <ComponentRef Id="Microsoft.Office" />
+      <ComponentRef Id="Oracle" />
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="ProgramMenuDir"/>
       <ComponentRef Id="RegistryEntries"/>
diff --git a/SetupWix/SetupWix.wixproj b/SetupWix/SetupWix.wixproj
index 858bdd2..66eb697 100644
--- a/SetupWix/SetupWix.wixproj
+++ b/SetupWix/SetupWix.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>5bf6646d-6f46-45e5-8806-8783f030f311</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>SetupWix</OutputName>
+    <OutputName>GlobalIndexer</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -23,6 +23,16 @@
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.