diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
new file mode 100644
index 0000000..692440b
--- /dev/null
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -0,0 +1,204 @@
+Imports DD_LIB_Standards
+
+Public Class ClassControlCreator
+
+    ''' <summary>
+    ''' Konstanten
+    ''' </summary>
+    Private Const LABEL_TEXT = "Bezeichnung definieren"
+
+    Private Const DEFAULT_FONT_SIZE As Integer = 10
+    Private Const DEFAULT_FONT_FAMILY As String = "Arial"
+    Private Const DEFAULT_FONT_STYLE As FontStyle = FontStyle.Regular
+    Private Const DEFAULT_COLOR As Integer = 0
+    Private Const DEFAULT_WIDTH As Integer = 170
+    Private Const DEFAULT_HEIGHT As Integer = 20
+
+    Private Const PREFIX_TEXTBOX = "TXT"
+
+    ''' <summary>
+    ''' Standard Eigenschaften für alle Controls
+    ''' </summary>
+    Private Class ControlDBProps
+        Public Guid As Integer
+        Public Name As String
+        Public Location As Point
+        Public [Font] As Font
+        Public [Color] As Color
+    End Class
+
+    Private Shared Function TransformDataRow(row As DataRow) As ControlDBProps
+        Dim x As Integer = row.Item("X_LOC")
+        Dim y As Integer = row.Item("Y_LOC")
+        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
+        Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
+        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
+        Dim family As FontFamily = New FontFamily(familyString)
+
+        Dim Guid As Integer = row.Item("GUID")
+        Dim Name As String = row.Item("NAME")
+        Dim Location As New Point(x, y)
+        Dim Font As New Font(family, size, style, GraphicsUnit.Point)
+        Dim Color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+
+        Return New ControlDBProps() With {
+            .Guid = Guid,
+            .Name = Name,
+            .Location = Location,
+            .Font = Font,
+            .Color = Color
+        }
+    End Function
+
+    Public Shared Function CreateBaseControl(ctrl As Control, row As DataRow) As Control
+        Dim props As ControlDBProps = TransformDataRow(row)
+
+        ctrl.Tag = props.Guid
+        ctrl.Name = props.Name
+        ctrl.Location = props.Location
+        ctrl.Font = props.Font
+        ctrl.ForeColor = props.Color
+
+        Return ctrl
+    End Function
+
+    ' ----------------------- NEW CONTROLS -----------------------
+
+    Public Shared Function CreateNewTextBox(location As Point) As TextBox
+        Dim control As New TextBox With {
+            .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGUID()}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
+            .Location = location,
+            .ReadOnly = True,
+            .BackColor = Color.White,
+            .Cursor = Cursors.Hand
+        }
+
+        Return control
+
+    End Function
+
+    ' ----------------------- EXISITING CONTROLS -----------------------
+
+    Public Shared Function CreateExistingTextbox(row As DataRow, designMode As Boolean) As TextBox
+        Dim control As TextBox = CreateBaseControl(New TextBox(), row)
+
+        control.BackColor = Color.White
+        control.Cursor = Cursors.Hand
+
+        If row.Item("HEIGHT") > 27 Then
+            control.Multiline = True
+
+        End If
+
+        control.Height = row.Item("HEIGHT")
+        control.Width = row.Item("WIDTH")
+
+        If Not designMode Then
+            control.AcceptsReturn = True
+            control.ReadOnly = row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+        Else
+            control.ReadOnly = True
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
+        Dim control As Label = CreateBaseControl(New Label(), row)
+
+        control.Text = row.Item("CTRL_TEXT")
+        control.AutoSize = True
+        control.Cursor = Cursors.Hand
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As ComboBox
+        Dim control As ComboBox = CreateBaseControl(New ComboBox(), row)
+
+        control.Cursor = Cursors.Hand
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+
+        If Not designMode Then
+            control.Enabled = Not row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+
+            control.AutoCompleteMode = AutoCompleteMode.SuggestAppend
+            control.AutoCompleteSource = AutoCompleteSource.ListItems
+
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
+        Dim control As DateTimePicker = CreateBaseControl(New DateTimePicker(), row)
+
+        control.Cursor = Cursors.Hand
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Format = DateTimePickerFormat.Short
+
+        If Not designMode Then
+            control.Enabled = Not row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExisingCheckbox(row As DataRow, designMode As Boolean) As CheckBox
+        Dim control As CheckBox = CreateBaseControl(New CheckBox(), row)
+
+        control.AutoSize = True
+        control.Text = row.Item("CTRL_TEXT")
+        control.Cursor = Cursors.Hand
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingDataGridView(row As DataRow, designMode As Boolean) As DataGridView
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Cursor = Cursors.Hand
+        control.AllowUserToAddRows = False
+        control.AllowUserToDeleteRows = False
+        control.AllowUserToResizeColumns = False
+        control.AllowUserToResizeRows = False
+        control.AlternatingRowsDefaultCellStyle.BackColor = Color.Aqua
+
+        Dim col As New DataGridViewTextBoxColumn
+        col.HeaderText = ""
+        col.Name = "column1"
+        col.Width = control.Width - 30
+        control.Columns.Add(col)
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Cursor = Cursors.Hand
+        control.AllowUserToAddRows = False
+        control.AllowUserToDeleteRows = False
+        control.AllowUserToResizeColumns = False
+        control.AllowUserToResizeRows = False
+
+        For Each column As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In columns
+            Dim col As New DataGridViewTextBoxColumn() With {
+                .HeaderText = column.SPALTEN_HEADER,
+                .Name = column.SPALTENNAME,
+                .Width = column.SPALTENBREITE
+            }
+
+            control.Columns.Add(col)
+        Next
+
+        Return control
+    End Function
+
+End Class
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
index f9b280f..2c20a23 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
@@ -19643,7 +19643,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(4) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
@@ -19670,19 +19670,23 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(2).Connection = Me.Connection
-            Me._commandCollection(2).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
+            Me._commandCollection(2).CommandText = "SELECT       *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"
+            Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(3).Connection = Me.Connection
+            Me._commandCollection(3).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
                 "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ 
                 "_WHO, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM    "& _ 
                 "        TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @GUID)"
-            Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand()
-            Me._commandCollection(3).Connection = Me.Connection
-            Me._commandCollection(3).CommandText = "SELECT GUID FROM TBPM_CONTROL_TABLE where Control_ID = @control_id and Spaltennam"& _ 
-                "e = @spaltenname"
             Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@control_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@spaltenname", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(4).Connection = Me.Connection
+            Me._commandCollection(4).CommandText = "SELECT GUID FROM TBPM_CONTROL_TABLE where Control_ID = @control_id and Spaltennam"& _ 
+                "e = @spaltenname"
+            Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@control_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@spaltenname", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -19715,8 +19719,32 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
-        Public Overloads Overridable Function FillByGUID(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function FillAll(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable) As Integer
             Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
+        Public Overloads Overridable Function GetDataAll() As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Dim dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable = New DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
+        Public Overloads Overridable Function FillByGUID(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable, ByVal GUID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             If (Me.ClearBeforeFill = true) Then
                 dataTable.Clear
@@ -19730,7 +19758,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
         Public Overloads Overridable Function GetDataByGUID(ByVal GUID As Integer) As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable
-            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             Dim dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable = New DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable()
             Me.Adapter.Fill(dataTable)
@@ -20059,7 +20087,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
         Public Overloads Overridable Function getColumnID(ByVal control_id As Integer, ByVal spaltenname As String) As Global.System.Nullable(Of Integer)
-            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3)
+            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(4)
             command.Parameters(0).Value = CType(control_id,Integer)
             If (spaltenname Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("spaltenname")
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
index b2ad97a..6584515 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
@@ -1925,6 +1925,15 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </UpdateCommand>
               </DbSource>
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillAll" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataAll" GeneratorSourceName="FillAll" GetMethodModifier="Public" GetMethodName="GetDataAll" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataAll" UserSourceName="FillAll">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT       *
+FROM            TBPM_CONTROL_TABLE</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByGUID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByGUID" GeneratorSourceName="FillByGUID" GetMethodModifier="Public" GetMethodName="GetDataByGUID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByGUID" UserSourceName="FillByGUID">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
@@ -1959,7 +1968,7 @@ WHERE        (GUID = @GUID)</CommandText>
   <xs:element name="DD_DMSLiteDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="DD_DMSLiteDataSet" msprop:Generator_UserDSName="DD_DMSLiteDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
@@ -2004,7 +2013,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent">
+        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PROFIL_ID" msprop:Generator_ColumnVarNameInTable="columnPROFIL_ID" msprop:Generator_ColumnPropNameInRow="PROFIL_ID" msprop:Generator_ColumnPropNameInTable="PROFIL_IDColumn" msprop:Generator_UserColumnName="PROFIL_ID" type="xs:int" />
@@ -2107,7 +2116,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent">
+        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -2203,7 +2212,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2266,7 +2275,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_RowClassName="TBPM_TYPERow" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent">
+        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent" msprop:Generator_RowClassName="TBPM_TYPERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2296,7 +2305,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent">
+        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2319,7 +2328,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent">
+        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2408,7 +2417,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONNECTION" msprop:Generator_TableClassName="TBPM_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBPM_CONNECTION" msprop:Generator_RowChangedName="TBPM_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBPM_CONNECTION" msprop:Generator_RowDeletingName="TBPM_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBPM_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBPM_CONNECTIONRow" msprop:Generator_UserTableName="TBPM_CONNECTION" msprop:Generator_RowEvArgName="TBPM_CONNECTIONRowChangeEvent">
+        <xs:element name="TBPM_CONNECTION" msprop:Generator_TableClassName="TBPM_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBPM_CONNECTION" msprop:Generator_TablePropName="TBPM_CONNECTION" msprop:Generator_RowDeletingName="TBPM_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBPM_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBPM_CONNECTION" msprop:Generator_RowChangedName="TBPM_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBPM_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_CONNECTIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2481,7 +2490,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_RowClassName="TBPROFILE_USERRow" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent">
+        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2517,7 +2526,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2532,7 +2541,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent">
+        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="USR_NAME" msprop:Generator_ColumnVarNameInTable="columnUSR_NAME" msprop:Generator_ColumnPropNameInRow="USR_NAME" msprop:Generator_ColumnPropNameInTable="USR_NAMEColumn" msprop:Generator_UserColumnName="USR_NAME" minOccurs="0">
@@ -2553,7 +2562,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_RowClassName="TBPM_PROFILERow" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent">
+        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2661,7 +2670,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBWH_CONNECTIONRow">
+        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBWH_CONNECTIONRow" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2734,7 +2743,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow">
+        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2785,7 +2794,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow">
+        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2876,7 +2885,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow">
+        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3007,11 +3016,11 @@ WHERE        (GUID = @GUID)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" msprop:Generator_ParentPropName="TBPM_TYPERow" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_ParentPropName="TBPM_TYPERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
index 1669183..fb01cd3 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
@@ -20,7 +20,7 @@
     <Shape ID="DesignTable:TBPM_PROFILE" ZOrder="17" X="255" Y="387" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBWH_CHECK_PROFILE_CONTROLS" ZOrder="12" X="0" Y="-72" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
     <Shape ID="DesignTable:TBPM_PROFILE_CONTROLS" ZOrder="10" X="595" Y="421" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="5" X="940" Y="517" Height="324" Width="284" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="5" X="861" Y="110" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBWH_CONNECTION" ZOrder="13" X="625" Y="114" Height="276" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="272" />
   </Shapes>
   <Connectors>
@@ -63,32 +63,32 @@
     <Connector ID="DesignRelation:FK_TBPM_CONTROL_TABLE_CONTROL1" ZOrder="9" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>895</X>
-          <Y>565</Y>
+          <X>844</X>
+          <Y>421</Y>
         </Point>
         <Point>
-          <X>940</X>
-          <Y>565</Y>
+          <X>844</X>
+          <Y>394</Y>
+        </Point>
+        <Point>
+          <X>861</X>
+          <Y>394</Y>
         </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:FK_TBPM_CONTROL_TABLE_CONTROL" ZOrder="8" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>118</X>
-          <Y>0</Y>
+          <X>141</X>
+          <Y>96</Y>
         </Point>
         <Point>
-          <X>118</X>
-          <Y>-30</Y>
+          <X>141</X>
+          <Y>127</Y>
         </Point>
         <Point>
-          <X>118</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>118</X>
-          <Y>0</Y>
+          <X>861</X>
+          <Y>127</Y>
         </Point>
       </RoutePoints>
     </Connector>
diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
index d8beaa7..e23fb6e 100644
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@@ -154,6 +154,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClassAnnotation.vb" />
+    <Compile Include="ClassControlCreator.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLogger.vb" />
     <Compile Include="ClassSQLEditor.vb" />
diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
index 626cce7..927efe9 100644
--- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb
+++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
@@ -15,6 +15,30 @@ Public Module ModuleControlProperties
         Private _size As Size
         Private _font As Font
         Private _text_color As Color
+        Private _changed_at As Date
+        Private _changed_who As String
+
+        <Category("Allgemein")>
+        <[ReadOnly](True)>
+        Public Property ChangedAt As Date
+            Get
+                Return _changed_at
+            End Get
+            Set(value As Date)
+                _changed_at = value
+            End Set
+        End Property
+
+        <Category("Allgemein")>
+        <[ReadOnly](True)>
+        Public Property ChangedWho As String
+            Get
+                Return _changed_who
+            End Get
+            Set(value As String)
+                _changed_who = value
+            End Set
+        End Property
 
         <Category("Allgemein")>
         <[ReadOnly](True)>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index 33db3c8..f2e3e25 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -29,12 +29,39 @@ Partial Class frmFormDesigner
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.lblDesign = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.btnTabelle = New System.Windows.Forms.Button()
+        Me.btnCheckbox = New System.Windows.Forms.Button()
+        Me.btnVektor = New System.Windows.Forms.Button()
+        Me.btndtp = New System.Windows.Forms.Button()
+        Me.btncmb = New System.Windows.Forms.Button()
+        Me.btntextbox = New System.Windows.Forms.Button()
+        Me.btnlabel = New System.Windows.Forms.Button()
         Me.pnldesigner = New System.Windows.Forms.Panel()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblhintergrund = New System.Windows.Forms.Label()
         Me.gbxControl = New System.Windows.Forms.GroupBox()
         Me.TabControlEigenschaften = New System.Windows.Forms.TabControl()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.pageProperties = New System.Windows.Forms.TabPage()
+        Me.pgControls = New System.Windows.Forms.PropertyGrid()
+        Me.pageFormat = New System.Windows.Forms.TabPage()
+        Me.btnheight_minus = New System.Windows.Forms.Button()
+        Me.btnheight_plus = New System.Windows.Forms.Button()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.btnwidth_minus = New System.Windows.Forms.Button()
+        Me.btnwidth_plus = New System.Windows.Forms.Button()
+        Me.pageSQL = New System.Windows.Forms.TabPage()
+        Me.pnlAuswahlliste = New System.Windows.Forms.Panel()
+        Me.btnEditor = New System.Windows.Forms.Button()
+        Me.btnShowConnections = New System.Windows.Forms.Button()
+        Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox()
+        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cmbConnection = New System.Windows.Forms.ComboBox()
+        Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.pagePropertiesOld = New System.Windows.Forms.TabPage()
         Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox()
         Me.READ_ONLYCheckBox = New System.Windows.Forms.CheckBox()
         Me.INDEX_NAME_VALUE = New System.Windows.Forms.TextBox()
@@ -51,41 +78,14 @@ Partial Class frmFormDesigner
         Me.CheckBoxAuswahlliste = New System.Windows.Forms.CheckBox()
         Me.lblAuswahlliste = New System.Windows.Forms.Label()
         Me.INDEX_NAMETextBox = New System.Windows.Forms.TextBox()
-        Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.pnlAuswahlliste = New System.Windows.Forms.Panel()
-        Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.cmbConnection = New System.Windows.Forms.ComboBox()
-        Me.TabPage4 = New System.Windows.Forms.TabPage()
-        Me.pgControls = New System.Windows.Forms.PropertyGrid()
-        Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
-        Me.btnrefresh = New System.Windows.Forms.Button()
-        Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.btnheight_minus = New System.Windows.Forms.Button()
-        Me.btnheight_plus = New System.Windows.Forms.Button()
-        Me.btnwidth_minus = New System.Windows.Forms.Button()
-        Me.btnwidth_plus = New System.Windows.Forms.Button()
-        Me.btnEditor = New System.Windows.Forms.Button()
-        Me.btnShowConnections = New System.Windows.Forms.Button()
-        Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.btndelete = New System.Windows.Forms.Button()
         Me.btnsave = New System.Windows.Forms.Button()
-        Me.btnTabelle = New System.Windows.Forms.Button()
-        Me.btnCheckbox = New System.Windows.Forms.Button()
-        Me.btnVektor = New System.Windows.Forms.Button()
-        Me.btndtp = New System.Windows.Forms.Button()
-        Me.btncmb = New System.Windows.Forms.Button()
-        Me.btntextbox = New System.Windows.Forms.Button()
-        Me.btnlabel = New System.Windows.Forms.Button()
+        Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
+        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.btnrefresh = New System.Windows.Forms.Button()
         Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter()
         Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
         Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter()
@@ -100,15 +100,15 @@ Partial Class frmFormDesigner
         Me.pnldesigner.SuspendLayout()
         Me.gbxControl.SuspendLayout()
         Me.TabControlEigenschaften.SuspendLayout()
-        Me.TabPage1.SuspendLayout()
-        Me.TabPage2.SuspendLayout()
-        Me.TabPage3.SuspendLayout()
+        Me.pageProperties.SuspendLayout()
+        Me.pageFormat.SuspendLayout()
+        Me.pageSQL.SuspendLayout()
         Me.pnlAuswahlliste.SuspendLayout()
-        Me.TabPage4.SuspendLayout()
-        Me.StatusStrip1.SuspendLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.pagePropertiesOld.SuspendLayout()
+        Me.StatusStrip1.SuspendLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -172,568 +172,6 @@ Partial Class frmFormDesigner
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Control-Typ (Drag and Drop)"
         '
-        'pnldesigner
-        '
-        Me.pnldesigner.AllowDrop = True
-        Me.pnldesigner.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.pnldesigner.BackColor = System.Drawing.Color.Transparent
-        Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnldesigner.Controls.Add(Me.Label1)
-        Me.pnldesigner.Controls.Add(Me.lblhintergrund)
-        Me.pnldesigner.Location = New System.Drawing.Point(15, 72)
-        Me.pnldesigner.Name = "pnldesigner"
-        Me.pnldesigner.Size = New System.Drawing.Size(481, 337)
-        Me.pnldesigner.TabIndex = 3
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption
-        Me.Label1.Location = New System.Drawing.Point(91, 150)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(347, 16)
-        Me.Label1.TabIndex = 6
-        Me.Label1.Text = "Gestalten sie in diesem Bereich Ihre Validierungsoberfläche"
-        '
-        'lblhintergrund
-        '
-        Me.lblhintergrund.AutoSize = True
-        Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption
-        Me.lblhintergrund.Location = New System.Drawing.Point(89, 111)
-        Me.lblhintergrund.Name = "lblhintergrund"
-        Me.lblhintergrund.Size = New System.Drawing.Size(248, 29)
-        Me.lblhintergrund.TabIndex = 1
-        Me.lblhintergrund.Text = "Validierungsbereich"
-        '
-        'gbxControl
-        '
-        Me.gbxControl.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.gbxControl.Controls.Add(Me.TabControlEigenschaften)
-        Me.gbxControl.Controls.Add(Me.btndelete)
-        Me.gbxControl.Controls.Add(Me.btnsave)
-        Me.gbxControl.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.gbxControl.Location = New System.Drawing.Point(507, 205)
-        Me.gbxControl.Name = "gbxControl"
-        Me.gbxControl.Size = New System.Drawing.Size(476, 332)
-        Me.gbxControl.TabIndex = 4
-        Me.gbxControl.TabStop = False
-        Me.gbxControl.Text = "Controleigenschaften:"
-        Me.gbxControl.Visible = False
-        '
-        'TabControlEigenschaften
-        '
-        Me.TabControlEigenschaften.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.TabControlEigenschaften.Controls.Add(Me.TabPage1)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage2)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage3)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage4)
-        Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22)
-        Me.TabControlEigenschaften.Name = "TabControlEigenschaften"
-        Me.TabControlEigenschaften.SelectedIndex = 0
-        Me.TabControlEigenschaften.Size = New System.Drawing.Size(455, 263)
-        Me.TabControlEigenschaften.TabIndex = 22
-        '
-        'TabPage1
-        '
-        Me.TabPage1.AutoScroll = True
-        Me.TabPage1.BackColor = System.Drawing.Color.White
-        Me.TabPage1.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
-        Me.TabPage1.Controls.Add(Me.READ_ONLYCheckBox)
-        Me.TabPage1.Controls.Add(Me.INDEX_NAME_VALUE)
-        Me.TabPage1.Controls.Add(Me.rbVektor)
-        Me.TabPage1.Controls.Add(Me.rbIndex)
-        Me.TabPage1.Controls.Add(Me.lblCtrlName)
-        Me.TabPage1.Controls.Add(Me.CHOICE_LISTTextBox)
-        Me.TabPage1.Controls.Add(Me.lblBeschriftung)
-        Me.TabPage1.Controls.Add(Me.VALIDATIONCheckBox)
-        Me.TabPage1.Controls.Add(Me.lblIndex)
-        Me.TabPage1.Controls.Add(Me.CTRL_TEXTTextBox)
-        Me.TabPage1.Controls.Add(Me.cmbIndex)
-        Me.TabPage1.Controls.Add(Me.NAMETextBox)
-        Me.TabPage1.Controls.Add(Me.CheckBoxAuswahlliste)
-        Me.TabPage1.Controls.Add(Me.lblAuswahlliste)
-        Me.TabPage1.Controls.Add(Me.INDEX_NAMETextBox)
-        Me.TabPage1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage1.TabIndex = 0
-        Me.TabPage1.Text = "Allgemein"
-        '
-        'LOAD_IDX_VALUECheckBox
-        '
-        Me.LOAD_IDX_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "LOAD_IDX_VALUE", True))
-        Me.LOAD_IDX_VALUECheckBox.Location = New System.Drawing.Point(6, 185)
-        Me.LOAD_IDX_VALUECheckBox.Name = "LOAD_IDX_VALUECheckBox"
-        Me.LOAD_IDX_VALUECheckBox.Size = New System.Drawing.Size(121, 24)
-        Me.LOAD_IDX_VALUECheckBox.TabIndex = 19
-        Me.LOAD_IDX_VALUECheckBox.Text = "Lade Indexdaten"
-        Me.ToolTip1.SetToolTip(Me.LOAD_IDX_VALUECheckBox, "Die im zugrundeliegenden Index gepeicherten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten werden nicht angezeigt")
-        Me.LOAD_IDX_VALUECheckBox.UseVisualStyleBackColor = True
-        '
-        'READ_ONLYCheckBox
-        '
-        Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "READ_ONLY", True))
-        Me.READ_ONLYCheckBox.Location = New System.Drawing.Point(6, 164)
-        Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"
-        Me.READ_ONLYCheckBox.Size = New System.Drawing.Size(86, 24)
-        Me.READ_ONLYCheckBox.TabIndex = 18
-        Me.READ_ONLYCheckBox.Text = "Read Only"
-        Me.ToolTip1.SetToolTip(Me.READ_ONLYCheckBox, "lässt keine Änderungen am Index zu")
-        Me.READ_ONLYCheckBox.UseVisualStyleBackColor = True
-        '
-        'INDEX_NAME_VALUE
-        '
-        Me.INDEX_NAME_VALUE.BackColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.INDEX_NAME_VALUE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.INDEX_NAME_VALUE.ForeColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.Location = New System.Drawing.Point(334, 142)
-        Me.INDEX_NAME_VALUE.Name = "INDEX_NAME_VALUE"
-        Me.INDEX_NAME_VALUE.ReadOnly = True
-        Me.INDEX_NAME_VALUE.Size = New System.Drawing.Size(51, 16)
-        Me.INDEX_NAME_VALUE.TabIndex = 17
-        Me.INDEX_NAME_VALUE.TabStop = False
-        '
-        'rbVektor
-        '
-        Me.rbVektor.AutoSize = True
-        Me.rbVektor.Location = New System.Drawing.Point(174, 52)
-        Me.rbVektor.Name = "rbVektor"
-        Me.rbVektor.Size = New System.Drawing.Size(225, 20)
-        Me.rbVektor.TabIndex = 15
-        Me.rbVektor.TabStop = True
-        Me.rbVektor.Text = "Benutze Vektor-Feld für Metadaten"
-        Me.rbVektor.UseVisualStyleBackColor = True
-        Me.rbVektor.Visible = False
-        '
-        'rbIndex
-        '
-        Me.rbIndex.AutoSize = True
-        Me.rbIndex.Location = New System.Drawing.Point(9, 52)
-        Me.rbIndex.Name = "rbIndex"
-        Me.rbIndex.Size = New System.Drawing.Size(159, 20)
-        Me.rbIndex.TabIndex = 14
-        Me.rbIndex.TabStop = True
-        Me.rbIndex.Text = "Beschreibe Index direkt"
-        Me.rbIndex.UseVisualStyleBackColor = True
-        Me.rbIndex.Visible = False
-        '
-        'lblCtrlName
-        '
-        Me.lblCtrlName.AutoSize = True
-        Me.lblCtrlName.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblCtrlName.Location = New System.Drawing.Point(6, 3)
-        Me.lblCtrlName.Name = "lblCtrlName"
-        Me.lblCtrlName.Size = New System.Drawing.Size(46, 16)
-        Me.lblCtrlName.TabIndex = 0
-        Me.lblCtrlName.Text = "Name:"
-        '
-        'CHOICE_LISTTextBox
-        '
-        Me.CHOICE_LISTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHOICE_LIST", True))
-        Me.CHOICE_LISTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CHOICE_LISTTextBox.Location = New System.Drawing.Point(174, 185)
-        Me.CHOICE_LISTTextBox.Name = "CHOICE_LISTTextBox"
-        Me.CHOICE_LISTTextBox.Size = New System.Drawing.Size(178, 23)
-        Me.CHOICE_LISTTextBox.TabIndex = 13
-        '
-        'lblBeschriftung
-        '
-        Me.lblBeschriftung.AutoSize = True
-        Me.lblBeschriftung.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblBeschriftung.Location = New System.Drawing.Point(132, 4)
-        Me.lblBeschriftung.Name = "lblBeschriftung"
-        Me.lblBeschriftung.Size = New System.Drawing.Size(83, 16)
-        Me.lblBeschriftung.TabIndex = 2
-        Me.lblBeschriftung.Text = "Beschriftung:"
-        Me.lblBeschriftung.Visible = False
-        '
-        'VALIDATIONCheckBox
-        '
-        Me.VALIDATIONCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "VALIDATION", True))
-        Me.VALIDATIONCheckBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.VALIDATIONCheckBox.Location = New System.Drawing.Point(6, 143)
-        Me.VALIDATIONCheckBox.Name = "VALIDATIONCheckBox"
-        Me.VALIDATIONCheckBox.Size = New System.Drawing.Size(144, 24)
-        Me.VALIDATIONCheckBox.TabIndex = 12
-        Me.VALIDATIONCheckBox.Text = "Eingabe zwingend"
-        Me.VALIDATIONCheckBox.UseVisualStyleBackColor = True
-        '
-        'lblIndex
-        '
-        Me.lblIndex.AutoSize = True
-        Me.lblIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblIndex.Location = New System.Drawing.Point(3, 84)
-        Me.lblIndex.Name = "lblIndex"
-        Me.lblIndex.Size = New System.Drawing.Size(124, 16)
-        Me.lblIndex.TabIndex = 4
-        Me.lblIndex.Text = "zugeordneter Index:"
-        Me.lblIndex.Visible = False
-        '
-        'CTRL_TEXTTextBox
-        '
-        Me.CTRL_TEXTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CTRL_TEXT", True))
-        Me.CTRL_TEXTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CTRL_TEXTTextBox.Location = New System.Drawing.Point(135, 23)
-        Me.CTRL_TEXTTextBox.Multiline = True
-        Me.CTRL_TEXTTextBox.Name = "CTRL_TEXTTextBox"
-        Me.CTRL_TEXTTextBox.Size = New System.Drawing.Size(298, 23)
-        Me.CTRL_TEXTTextBox.TabIndex = 11
-        '
-        'cmbIndex
-        '
-        Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex.FormattingEnabled = True
-        Me.cmbIndex.Location = New System.Drawing.Point(6, 103)
-        Me.cmbIndex.Name = "cmbIndex"
-        Me.cmbIndex.Size = New System.Drawing.Size(178, 24)
-        Me.cmbIndex.TabIndex = 5
-        Me.cmbIndex.Visible = False
-        '
-        'NAMETextBox
-        '
-        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "NAME", True))
-        Me.NAMETextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.NAMETextBox.Location = New System.Drawing.Point(9, 23)
-        Me.NAMETextBox.Name = "NAMETextBox"
-        Me.NAMETextBox.Size = New System.Drawing.Size(121, 23)
-        Me.NAMETextBox.TabIndex = 10
-        '
-        'CheckBoxAuswahlliste
-        '
-        Me.CheckBoxAuswahlliste.AutoSize = True
-        Me.CheckBoxAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBoxAuswahlliste.Location = New System.Drawing.Point(174, 145)
-        Me.CheckBoxAuswahlliste.Name = "CheckBoxAuswahlliste"
-        Me.CheckBoxAuswahlliste.Size = New System.Drawing.Size(98, 20)
-        Me.CheckBoxAuswahlliste.TabIndex = 6
-        Me.CheckBoxAuswahlliste.Text = "Auswahlliste"
-        Me.CheckBoxAuswahlliste.UseVisualStyleBackColor = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        '
-        'lblAuswahlliste
-        '
-        Me.lblAuswahlliste.AutoSize = True
-        Me.lblAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAuswahlliste.Location = New System.Drawing.Point(171, 167)
-        Me.lblAuswahlliste.Name = "lblAuswahlliste"
-        Me.lblAuswahlliste.Size = New System.Drawing.Size(186, 16)
-        Me.lblAuswahlliste.TabIndex = 7
-        Me.lblAuswahlliste.Text = "Auswahllistennamen eingeben:"
-        Me.lblAuswahlliste.Visible = False
-        '
-        'INDEX_NAMETextBox
-        '
-        Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 103)
-        Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox"
-        Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23)
-        Me.INDEX_NAMETextBox.TabIndex = 16
-        Me.INDEX_NAMETextBox.Visible = False
-        '
-        'TabPage2
-        '
-        Me.TabPage2.Controls.Add(Me.btnheight_minus)
-        Me.TabPage2.Controls.Add(Me.btnheight_plus)
-        Me.TabPage2.Controls.Add(Me.Label3)
-        Me.TabPage2.Controls.Add(Me.Label2)
-        Me.TabPage2.Controls.Add(Me.btnwidth_minus)
-        Me.TabPage2.Controls.Add(Me.btnwidth_plus)
-        Me.TabPage2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage2.TabIndex = 1
-        Me.TabPage2.Text = "Format"
-        Me.TabPage2.UseVisualStyleBackColor = True
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(10, 50)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(42, 16)
-        Me.Label3.TabIndex = 5
-        Me.Label3.Text = "Höhe:"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(10, 3)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(46, 16)
-        Me.Label2.TabIndex = 4
-        Me.Label2.Text = "Breite:"
-        '
-        'TabPage3
-        '
-        Me.TabPage3.Controls.Add(Me.pnlAuswahlliste)
-        Me.TabPage3.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage3.Name = "TabPage3"
-        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage3.TabIndex = 2
-        Me.TabPage3.Text = "SQL-Liste"
-        Me.TabPage3.UseVisualStyleBackColor = True
-        '
-        'pnlAuswahlliste
-        '
-        Me.pnlAuswahlliste.AutoScroll = True
-        Me.pnlAuswahlliste.Controls.Add(Me.btnEditor)
-        Me.pnlAuswahlliste.Controls.Add(Me.btnShowConnections)
-        Me.pnlAuswahlliste.Controls.Add(Me.SQL_CommandTextBox)
-        Me.pnlAuswahlliste.Controls.Add(Me.Label5)
-        Me.pnlAuswahlliste.Controls.Add(Me.Label4)
-        Me.pnlAuswahlliste.Controls.Add(Me.cmbConnection)
-        Me.pnlAuswahlliste.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlAuswahlliste.Location = New System.Drawing.Point(3, 3)
-        Me.pnlAuswahlliste.Name = "pnlAuswahlliste"
-        Me.pnlAuswahlliste.Size = New System.Drawing.Size(441, 228)
-        Me.pnlAuswahlliste.TabIndex = 2
-        '
-        'SQL_CommandTextBox
-        '
-        Me.SQL_CommandTextBox.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.SQL_CommandTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "SQL_UEBERPRUEFUNG", True))
-        Me.SQL_CommandTextBox.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.SQL_CommandTextBox.Location = New System.Drawing.Point(5, 76)
-        Me.SQL_CommandTextBox.Multiline = True
-        Me.SQL_CommandTextBox.Name = "SQL_CommandTextBox"
-        Me.SQL_CommandTextBox.Size = New System.Drawing.Size(433, 115)
-        Me.SQL_CommandTextBox.TabIndex = 5
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(3, 57)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(76, 16)
-        Me.Label5.TabIndex = 2
-        Me.Label5.Text = "SQL-Befehl:"
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(3, 11)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(76, 16)
-        Me.Label4.TabIndex = 1
-        Me.Label4.Text = "Connection:"
-        '
-        'cmbConnection
-        '
-        Me.cmbConnection.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPM_PROFILE_CONTROLSBindingSource, "CONNECTION_ID", True))
-        Me.cmbConnection.DataSource = Me.TBPM_CONNECTIONBindingSource
-        Me.cmbConnection.DisplayMember = "BEZEICHNUNG"
-        Me.cmbConnection.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbConnection.FormattingEnabled = True
-        Me.cmbConnection.Location = New System.Drawing.Point(5, 30)
-        Me.cmbConnection.Name = "cmbConnection"
-        Me.cmbConnection.Size = New System.Drawing.Size(260, 24)
-        Me.cmbConnection.TabIndex = 0
-        Me.cmbConnection.ValueMember = "GUID"
-        '
-        'TabPage4
-        '
-        Me.TabPage4.Controls.Add(Me.pgControls)
-        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage4.Size = New System.Drawing.Size(447, 237)
-        Me.TabPage4.TabIndex = 3
-        Me.TabPage4.Text = "Eigenschaften"
-        Me.TabPage4.UseVisualStyleBackColor = True
-        '
-        'pgControls
-        '
-        Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pgControls.HelpVisible = False
-        Me.pgControls.Location = New System.Drawing.Point(3, 3)
-        Me.pgControls.Name = "pgControls"
-        Me.pgControls.Size = New System.Drawing.Size(441, 228)
-        Me.pgControls.TabIndex = 0
-        '
-        'CHANGED_WHOTextBox
-        '
-        Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 518)
-        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
-        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23)
-        Me.CHANGED_WHOTextBox.TabIndex = 19
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 556)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(995, 22)
-        Me.StatusStrip1.TabIndex = 20
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'CHANGED_WHENTextBox
-        '
-        Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True))
-        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 518)
-        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
-        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23)
-        Me.CHANGED_WHENTextBox.TabIndex = 21
-        '
-        'TBPM_PROFILE_CONTROLSBindingSource
-        '
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
-        '
-        'DD_DMSLiteDataSet
-        '
-        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
-        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
-        'btnrefresh
-        '
-        Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
-        Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnrefresh.Location = New System.Drawing.Point(415, 41)
-        Me.btnrefresh.Name = "btnrefresh"
-        Me.btnrefresh.Size = New System.Drawing.Size(81, 23)
-        Me.btnrefresh.TabIndex = 24
-        Me.btnrefresh.Text = "Refresh"
-        Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnrefresh.UseVisualStyleBackColor = True
-        '
-        'tslblAenderungen
-        '
-        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red
-        Me.tslblAenderungen.Name = "tslblAenderungen"
-        Me.tslblAenderungen.Size = New System.Drawing.Size(153, 17)
-        Me.tslblAenderungen.Text = "Änderungen gespeichert"
-        Me.tslblAenderungen.Visible = False
-        '
-        'btnheight_minus
-        '
-        Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnheight_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
-        Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnheight_minus.Location = New System.Drawing.Point(94, 69)
-        Me.btnheight_minus.Name = "btnheight_minus"
-        Me.btnheight_minus.Size = New System.Drawing.Size(75, 25)
-        Me.btnheight_minus.TabIndex = 1
-        Me.btnheight_minus.Text = "kleiner"
-        Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnheight_minus.UseVisualStyleBackColor = True
-        '
-        'btnheight_plus
-        '
-        Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnheight_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
-        Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnheight_plus.Location = New System.Drawing.Point(13, 69)
-        Me.btnheight_plus.Name = "btnheight_plus"
-        Me.btnheight_plus.Size = New System.Drawing.Size(75, 25)
-        Me.btnheight_plus.TabIndex = 0
-        Me.btnheight_plus.Text = "größer"
-        Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnheight_plus.UseVisualStyleBackColor = True
-        '
-        'btnwidth_minus
-        '
-        Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnwidth_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
-        Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22)
-        Me.btnwidth_minus.Name = "btnwidth_minus"
-        Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25)
-        Me.btnwidth_minus.TabIndex = 1
-        Me.btnwidth_minus.Text = "kleiner"
-        Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnwidth_minus.UseVisualStyleBackColor = True
-        '
-        'btnwidth_plus
-        '
-        Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnwidth_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
-        Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22)
-        Me.btnwidth_plus.Name = "btnwidth_plus"
-        Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25)
-        Me.btnwidth_plus.TabIndex = 0
-        Me.btnwidth_plus.Text = "größer"
-        Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnwidth_plus.UseVisualStyleBackColor = True
-        '
-        'btnEditor
-        '
-        Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image)
-        Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnEditor.Location = New System.Drawing.Point(6, 197)
-        Me.btnEditor.Name = "btnEditor"
-        Me.btnEditor.Size = New System.Drawing.Size(114, 28)
-        Me.btnEditor.TabIndex = 81
-        Me.btnEditor.Text = "Editor Detail"
-        Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnEditor.UseVisualStyleBackColor = True
-        '
-        'btnShowConnections
-        '
-        Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnShowConnections.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1
-        Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnShowConnections.Location = New System.Drawing.Point(271, 30)
-        Me.btnShowConnections.Name = "btnShowConnections"
-        Me.btnShowConnections.Size = New System.Drawing.Size(111, 24)
-        Me.btnShowConnections.TabIndex = 6
-        Me.btnShowConnections.Text = "Connections"
-        Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnShowConnections.UseVisualStyleBackColor = True
-        '
-        'TBPM_CONNECTIONBindingSource
-        '
-        Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION"
-        Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
-        '
-        'btndelete
-        '
-        Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btndelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
-        Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btndelete.Location = New System.Drawing.Point(13, 295)
-        Me.btndelete.Name = "btndelete"
-        Me.btndelete.Size = New System.Drawing.Size(178, 23)
-        Me.btndelete.TabIndex = 1
-        Me.btndelete.Text = "Control löschen"
-        Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btndelete.UseVisualStyleBackColor = True
-        '
-        'btnsave
-        '
-        Me.btnsave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnsave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save
-        Me.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnsave.Location = New System.Drawing.Point(279, 294)
-        Me.btnsave.Name = "btnsave"
-        Me.btnsave.Size = New System.Drawing.Size(188, 24)
-        Me.btnsave.TabIndex = 5
-        Me.btnsave.Text = "Änderungen Speichern"
-        Me.btnsave.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnsave.UseVisualStyleBackColor = True
-        Me.btnsave.Visible = False
-        '
         'btnTabelle
         '
         Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -825,6 +263,584 @@ Partial Class frmFormDesigner
         Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnlabel.UseVisualStyleBackColor = True
         '
+        'pnldesigner
+        '
+        Me.pnldesigner.AllowDrop = True
+        Me.pnldesigner.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.pnldesigner.BackColor = System.Drawing.Color.Transparent
+        Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnldesigner.Controls.Add(Me.Label1)
+        Me.pnldesigner.Controls.Add(Me.lblhintergrund)
+        Me.pnldesigner.Location = New System.Drawing.Point(15, 72)
+        Me.pnldesigner.Name = "pnldesigner"
+        Me.pnldesigner.Size = New System.Drawing.Size(481, 337)
+        Me.pnldesigner.TabIndex = 3
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption
+        Me.Label1.Location = New System.Drawing.Point(91, 150)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(347, 16)
+        Me.Label1.TabIndex = 6
+        Me.Label1.Text = "Gestalten sie in diesem Bereich Ihre Validierungsoberfläche"
+        '
+        'lblhintergrund
+        '
+        Me.lblhintergrund.AutoSize = True
+        Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption
+        Me.lblhintergrund.Location = New System.Drawing.Point(89, 111)
+        Me.lblhintergrund.Name = "lblhintergrund"
+        Me.lblhintergrund.Size = New System.Drawing.Size(248, 29)
+        Me.lblhintergrund.TabIndex = 1
+        Me.lblhintergrund.Text = "Validierungsbereich"
+        '
+        'gbxControl
+        '
+        Me.gbxControl.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.gbxControl.Controls.Add(Me.TabControlEigenschaften)
+        Me.gbxControl.Controls.Add(Me.btndelete)
+        Me.gbxControl.Controls.Add(Me.btnsave)
+        Me.gbxControl.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.gbxControl.Location = New System.Drawing.Point(507, 205)
+        Me.gbxControl.Name = "gbxControl"
+        Me.gbxControl.Size = New System.Drawing.Size(476, 332)
+        Me.gbxControl.TabIndex = 4
+        Me.gbxControl.TabStop = False
+        Me.gbxControl.Text = "Controleigenschaften:"
+        Me.gbxControl.Visible = False
+        '
+        'TabControlEigenschaften
+        '
+        Me.TabControlEigenschaften.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.TabControlEigenschaften.Controls.Add(Me.pageProperties)
+        Me.TabControlEigenschaften.Controls.Add(Me.pageFormat)
+        Me.TabControlEigenschaften.Controls.Add(Me.pageSQL)
+        Me.TabControlEigenschaften.Controls.Add(Me.pagePropertiesOld)
+        Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22)
+        Me.TabControlEigenschaften.Name = "TabControlEigenschaften"
+        Me.TabControlEigenschaften.SelectedIndex = 0
+        Me.TabControlEigenschaften.Size = New System.Drawing.Size(455, 263)
+        Me.TabControlEigenschaften.TabIndex = 22
+        '
+        'pageProperties
+        '
+        Me.pageProperties.Controls.Add(Me.pgControls)
+        Me.pageProperties.Location = New System.Drawing.Point(4, 25)
+        Me.pageProperties.Name = "pageProperties"
+        Me.pageProperties.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageProperties.Size = New System.Drawing.Size(447, 234)
+        Me.pageProperties.TabIndex = 3
+        Me.pageProperties.Text = "Eigenschaften"
+        Me.pageProperties.UseVisualStyleBackColor = True
+        '
+        'pgControls
+        '
+        Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pgControls.HelpVisible = False
+        Me.pgControls.Location = New System.Drawing.Point(3, 3)
+        Me.pgControls.Name = "pgControls"
+        Me.pgControls.Size = New System.Drawing.Size(441, 228)
+        Me.pgControls.TabIndex = 0
+        '
+        'pageFormat
+        '
+        Me.pageFormat.Controls.Add(Me.btnheight_minus)
+        Me.pageFormat.Controls.Add(Me.btnheight_plus)
+        Me.pageFormat.Controls.Add(Me.Label3)
+        Me.pageFormat.Controls.Add(Me.Label2)
+        Me.pageFormat.Controls.Add(Me.btnwidth_minus)
+        Me.pageFormat.Controls.Add(Me.btnwidth_plus)
+        Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.pageFormat.Location = New System.Drawing.Point(4, 25)
+        Me.pageFormat.Name = "pageFormat"
+        Me.pageFormat.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageFormat.Size = New System.Drawing.Size(447, 234)
+        Me.pageFormat.TabIndex = 1
+        Me.pageFormat.Text = "Format"
+        Me.pageFormat.UseVisualStyleBackColor = True
+        '
+        'btnheight_minus
+        '
+        Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnheight_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
+        Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnheight_minus.Location = New System.Drawing.Point(94, 69)
+        Me.btnheight_minus.Name = "btnheight_minus"
+        Me.btnheight_minus.Size = New System.Drawing.Size(75, 25)
+        Me.btnheight_minus.TabIndex = 1
+        Me.btnheight_minus.Text = "kleiner"
+        Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnheight_minus.UseVisualStyleBackColor = True
+        '
+        'btnheight_plus
+        '
+        Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnheight_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
+        Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnheight_plus.Location = New System.Drawing.Point(13, 69)
+        Me.btnheight_plus.Name = "btnheight_plus"
+        Me.btnheight_plus.Size = New System.Drawing.Size(75, 25)
+        Me.btnheight_plus.TabIndex = 0
+        Me.btnheight_plus.Text = "größer"
+        Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnheight_plus.UseVisualStyleBackColor = True
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(10, 50)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(42, 16)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Höhe:"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(10, 3)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(46, 16)
+        Me.Label2.TabIndex = 4
+        Me.Label2.Text = "Breite:"
+        '
+        'btnwidth_minus
+        '
+        Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnwidth_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
+        Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22)
+        Me.btnwidth_minus.Name = "btnwidth_minus"
+        Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25)
+        Me.btnwidth_minus.TabIndex = 1
+        Me.btnwidth_minus.Text = "kleiner"
+        Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnwidth_minus.UseVisualStyleBackColor = True
+        '
+        'btnwidth_plus
+        '
+        Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnwidth_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
+        Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22)
+        Me.btnwidth_plus.Name = "btnwidth_plus"
+        Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25)
+        Me.btnwidth_plus.TabIndex = 0
+        Me.btnwidth_plus.Text = "größer"
+        Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnwidth_plus.UseVisualStyleBackColor = True
+        '
+        'pageSQL
+        '
+        Me.pageSQL.Controls.Add(Me.pnlAuswahlliste)
+        Me.pageSQL.Location = New System.Drawing.Point(4, 25)
+        Me.pageSQL.Name = "pageSQL"
+        Me.pageSQL.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageSQL.Size = New System.Drawing.Size(447, 234)
+        Me.pageSQL.TabIndex = 2
+        Me.pageSQL.Text = "SQL-Liste"
+        Me.pageSQL.UseVisualStyleBackColor = True
+        '
+        'pnlAuswahlliste
+        '
+        Me.pnlAuswahlliste.AutoScroll = True
+        Me.pnlAuswahlliste.Controls.Add(Me.btnEditor)
+        Me.pnlAuswahlliste.Controls.Add(Me.btnShowConnections)
+        Me.pnlAuswahlliste.Controls.Add(Me.SQL_CommandTextBox)
+        Me.pnlAuswahlliste.Controls.Add(Me.Label5)
+        Me.pnlAuswahlliste.Controls.Add(Me.Label4)
+        Me.pnlAuswahlliste.Controls.Add(Me.cmbConnection)
+        Me.pnlAuswahlliste.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlAuswahlliste.Location = New System.Drawing.Point(3, 3)
+        Me.pnlAuswahlliste.Name = "pnlAuswahlliste"
+        Me.pnlAuswahlliste.Size = New System.Drawing.Size(441, 228)
+        Me.pnlAuswahlliste.TabIndex = 2
+        '
+        'btnEditor
+        '
+        Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image)
+        Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnEditor.Location = New System.Drawing.Point(6, 197)
+        Me.btnEditor.Name = "btnEditor"
+        Me.btnEditor.Size = New System.Drawing.Size(114, 28)
+        Me.btnEditor.TabIndex = 81
+        Me.btnEditor.Text = "Editor Detail"
+        Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnEditor.UseVisualStyleBackColor = True
+        '
+        'btnShowConnections
+        '
+        Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnShowConnections.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1
+        Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnShowConnections.Location = New System.Drawing.Point(271, 30)
+        Me.btnShowConnections.Name = "btnShowConnections"
+        Me.btnShowConnections.Size = New System.Drawing.Size(111, 24)
+        Me.btnShowConnections.TabIndex = 6
+        Me.btnShowConnections.Text = "Connections"
+        Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnShowConnections.UseVisualStyleBackColor = True
+        '
+        'SQL_CommandTextBox
+        '
+        Me.SQL_CommandTextBox.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.SQL_CommandTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "SQL_UEBERPRUEFUNG", True))
+        Me.SQL_CommandTextBox.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.SQL_CommandTextBox.Location = New System.Drawing.Point(5, 76)
+        Me.SQL_CommandTextBox.Multiline = True
+        Me.SQL_CommandTextBox.Name = "SQL_CommandTextBox"
+        Me.SQL_CommandTextBox.Size = New System.Drawing.Size(433, 115)
+        Me.SQL_CommandTextBox.TabIndex = 5
+        '
+        'TBPM_PROFILE_CONTROLSBindingSource
+        '
+        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
+        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        '
+        'DD_DMSLiteDataSet
+        '
+        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
+        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(3, 57)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(76, 16)
+        Me.Label5.TabIndex = 2
+        Me.Label5.Text = "SQL-Befehl:"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.Location = New System.Drawing.Point(3, 11)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(76, 16)
+        Me.Label4.TabIndex = 1
+        Me.Label4.Text = "Connection:"
+        '
+        'cmbConnection
+        '
+        Me.cmbConnection.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPM_PROFILE_CONTROLSBindingSource, "CONNECTION_ID", True))
+        Me.cmbConnection.DataSource = Me.TBPM_CONNECTIONBindingSource
+        Me.cmbConnection.DisplayMember = "BEZEICHNUNG"
+        Me.cmbConnection.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbConnection.FormattingEnabled = True
+        Me.cmbConnection.Location = New System.Drawing.Point(5, 30)
+        Me.cmbConnection.Name = "cmbConnection"
+        Me.cmbConnection.Size = New System.Drawing.Size(260, 24)
+        Me.cmbConnection.TabIndex = 0
+        Me.cmbConnection.ValueMember = "GUID"
+        '
+        'TBPM_CONNECTIONBindingSource
+        '
+        Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION"
+        Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        '
+        'pagePropertiesOld
+        '
+        Me.pagePropertiesOld.AutoScroll = True
+        Me.pagePropertiesOld.BackColor = System.Drawing.Color.White
+        Me.pagePropertiesOld.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.READ_ONLYCheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAME_VALUE)
+        Me.pagePropertiesOld.Controls.Add(Me.rbVektor)
+        Me.pagePropertiesOld.Controls.Add(Me.rbIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.lblCtrlName)
+        Me.pagePropertiesOld.Controls.Add(Me.CHOICE_LISTTextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.lblBeschriftung)
+        Me.pagePropertiesOld.Controls.Add(Me.VALIDATIONCheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.lblIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.CTRL_TEXTTextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.cmbIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.NAMETextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.CheckBoxAuswahlliste)
+        Me.pagePropertiesOld.Controls.Add(Me.lblAuswahlliste)
+        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAMETextBox)
+        Me.pagePropertiesOld.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.pagePropertiesOld.Location = New System.Drawing.Point(4, 25)
+        Me.pagePropertiesOld.Name = "pagePropertiesOld"
+        Me.pagePropertiesOld.Padding = New System.Windows.Forms.Padding(3)
+        Me.pagePropertiesOld.Size = New System.Drawing.Size(447, 234)
+        Me.pagePropertiesOld.TabIndex = 0
+        Me.pagePropertiesOld.Text = "Allgemein (Alt)"
+        '
+        'LOAD_IDX_VALUECheckBox
+        '
+        Me.LOAD_IDX_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "LOAD_IDX_VALUE", True))
+        Me.LOAD_IDX_VALUECheckBox.Enabled = False
+        Me.LOAD_IDX_VALUECheckBox.Location = New System.Drawing.Point(6, 185)
+        Me.LOAD_IDX_VALUECheckBox.Name = "LOAD_IDX_VALUECheckBox"
+        Me.LOAD_IDX_VALUECheckBox.Size = New System.Drawing.Size(121, 24)
+        Me.LOAD_IDX_VALUECheckBox.TabIndex = 19
+        Me.LOAD_IDX_VALUECheckBox.Text = "Lade Indexdaten"
+        Me.ToolTip1.SetToolTip(Me.LOAD_IDX_VALUECheckBox, "Die im zugrundeliegenden Index gepeicherten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten werden nicht angezeigt")
+        Me.LOAD_IDX_VALUECheckBox.UseVisualStyleBackColor = True
+        '
+        'READ_ONLYCheckBox
+        '
+        Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "READ_ONLY", True))
+        Me.READ_ONLYCheckBox.Enabled = False
+        Me.READ_ONLYCheckBox.Location = New System.Drawing.Point(6, 164)
+        Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"
+        Me.READ_ONLYCheckBox.Size = New System.Drawing.Size(86, 24)
+        Me.READ_ONLYCheckBox.TabIndex = 18
+        Me.READ_ONLYCheckBox.Text = "Read Only"
+        Me.ToolTip1.SetToolTip(Me.READ_ONLYCheckBox, "lässt keine Änderungen am Index zu")
+        Me.READ_ONLYCheckBox.UseVisualStyleBackColor = True
+        '
+        'INDEX_NAME_VALUE
+        '
+        Me.INDEX_NAME_VALUE.BackColor = System.Drawing.Color.White
+        Me.INDEX_NAME_VALUE.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.INDEX_NAME_VALUE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
+        Me.INDEX_NAME_VALUE.Enabled = False
+        Me.INDEX_NAME_VALUE.ForeColor = System.Drawing.Color.White
+        Me.INDEX_NAME_VALUE.Location = New System.Drawing.Point(334, 142)
+        Me.INDEX_NAME_VALUE.Name = "INDEX_NAME_VALUE"
+        Me.INDEX_NAME_VALUE.ReadOnly = True
+        Me.INDEX_NAME_VALUE.Size = New System.Drawing.Size(51, 16)
+        Me.INDEX_NAME_VALUE.TabIndex = 17
+        Me.INDEX_NAME_VALUE.TabStop = False
+        '
+        'rbVektor
+        '
+        Me.rbVektor.AutoSize = True
+        Me.rbVektor.Enabled = False
+        Me.rbVektor.Location = New System.Drawing.Point(174, 52)
+        Me.rbVektor.Name = "rbVektor"
+        Me.rbVektor.Size = New System.Drawing.Size(225, 20)
+        Me.rbVektor.TabIndex = 15
+        Me.rbVektor.TabStop = True
+        Me.rbVektor.Text = "Benutze Vektor-Feld für Metadaten"
+        Me.rbVektor.UseVisualStyleBackColor = True
+        Me.rbVektor.Visible = False
+        '
+        'rbIndex
+        '
+        Me.rbIndex.AutoSize = True
+        Me.rbIndex.Enabled = False
+        Me.rbIndex.Location = New System.Drawing.Point(9, 52)
+        Me.rbIndex.Name = "rbIndex"
+        Me.rbIndex.Size = New System.Drawing.Size(159, 20)
+        Me.rbIndex.TabIndex = 14
+        Me.rbIndex.TabStop = True
+        Me.rbIndex.Text = "Beschreibe Index direkt"
+        Me.rbIndex.UseVisualStyleBackColor = True
+        Me.rbIndex.Visible = False
+        '
+        'lblCtrlName
+        '
+        Me.lblCtrlName.AutoSize = True
+        Me.lblCtrlName.Enabled = False
+        Me.lblCtrlName.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblCtrlName.Location = New System.Drawing.Point(6, 3)
+        Me.lblCtrlName.Name = "lblCtrlName"
+        Me.lblCtrlName.Size = New System.Drawing.Size(46, 16)
+        Me.lblCtrlName.TabIndex = 0
+        Me.lblCtrlName.Text = "Name:"
+        '
+        'CHOICE_LISTTextBox
+        '
+        Me.CHOICE_LISTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHOICE_LIST", True))
+        Me.CHOICE_LISTTextBox.Enabled = False
+        Me.CHOICE_LISTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CHOICE_LISTTextBox.Location = New System.Drawing.Point(174, 185)
+        Me.CHOICE_LISTTextBox.Name = "CHOICE_LISTTextBox"
+        Me.CHOICE_LISTTextBox.Size = New System.Drawing.Size(178, 23)
+        Me.CHOICE_LISTTextBox.TabIndex = 13
+        '
+        'lblBeschriftung
+        '
+        Me.lblBeschriftung.AutoSize = True
+        Me.lblBeschriftung.Enabled = False
+        Me.lblBeschriftung.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBeschriftung.Location = New System.Drawing.Point(132, 4)
+        Me.lblBeschriftung.Name = "lblBeschriftung"
+        Me.lblBeschriftung.Size = New System.Drawing.Size(83, 16)
+        Me.lblBeschriftung.TabIndex = 2
+        Me.lblBeschriftung.Text = "Beschriftung:"
+        Me.lblBeschriftung.Visible = False
+        '
+        'VALIDATIONCheckBox
+        '
+        Me.VALIDATIONCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "VALIDATION", True))
+        Me.VALIDATIONCheckBox.Enabled = False
+        Me.VALIDATIONCheckBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.VALIDATIONCheckBox.Location = New System.Drawing.Point(6, 143)
+        Me.VALIDATIONCheckBox.Name = "VALIDATIONCheckBox"
+        Me.VALIDATIONCheckBox.Size = New System.Drawing.Size(144, 24)
+        Me.VALIDATIONCheckBox.TabIndex = 12
+        Me.VALIDATIONCheckBox.Text = "Eingabe zwingend"
+        Me.VALIDATIONCheckBox.UseVisualStyleBackColor = True
+        '
+        'lblIndex
+        '
+        Me.lblIndex.AutoSize = True
+        Me.lblIndex.Enabled = False
+        Me.lblIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblIndex.Location = New System.Drawing.Point(3, 84)
+        Me.lblIndex.Name = "lblIndex"
+        Me.lblIndex.Size = New System.Drawing.Size(124, 16)
+        Me.lblIndex.TabIndex = 4
+        Me.lblIndex.Text = "zugeordneter Index:"
+        Me.lblIndex.Visible = False
+        '
+        'CTRL_TEXTTextBox
+        '
+        Me.CTRL_TEXTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CTRL_TEXT", True))
+        Me.CTRL_TEXTTextBox.Enabled = False
+        Me.CTRL_TEXTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CTRL_TEXTTextBox.Location = New System.Drawing.Point(135, 23)
+        Me.CTRL_TEXTTextBox.Multiline = True
+        Me.CTRL_TEXTTextBox.Name = "CTRL_TEXTTextBox"
+        Me.CTRL_TEXTTextBox.Size = New System.Drawing.Size(298, 23)
+        Me.CTRL_TEXTTextBox.TabIndex = 11
+        '
+        'cmbIndex
+        '
+        Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
+        Me.cmbIndex.Enabled = False
+        Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbIndex.FormattingEnabled = True
+        Me.cmbIndex.Location = New System.Drawing.Point(6, 103)
+        Me.cmbIndex.Name = "cmbIndex"
+        Me.cmbIndex.Size = New System.Drawing.Size(178, 24)
+        Me.cmbIndex.TabIndex = 5
+        Me.cmbIndex.Visible = False
+        '
+        'NAMETextBox
+        '
+        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "NAME", True))
+        Me.NAMETextBox.Enabled = False
+        Me.NAMETextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.NAMETextBox.Location = New System.Drawing.Point(9, 23)
+        Me.NAMETextBox.Name = "NAMETextBox"
+        Me.NAMETextBox.Size = New System.Drawing.Size(121, 23)
+        Me.NAMETextBox.TabIndex = 10
+        '
+        'CheckBoxAuswahlliste
+        '
+        Me.CheckBoxAuswahlliste.AutoSize = True
+        Me.CheckBoxAuswahlliste.Enabled = False
+        Me.CheckBoxAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CheckBoxAuswahlliste.Location = New System.Drawing.Point(174, 145)
+        Me.CheckBoxAuswahlliste.Name = "CheckBoxAuswahlliste"
+        Me.CheckBoxAuswahlliste.Size = New System.Drawing.Size(98, 20)
+        Me.CheckBoxAuswahlliste.TabIndex = 6
+        Me.CheckBoxAuswahlliste.Text = "Auswahlliste"
+        Me.CheckBoxAuswahlliste.UseVisualStyleBackColor = True
+        Me.CheckBoxAuswahlliste.Visible = False
+        '
+        'lblAuswahlliste
+        '
+        Me.lblAuswahlliste.AutoSize = True
+        Me.lblAuswahlliste.Enabled = False
+        Me.lblAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAuswahlliste.Location = New System.Drawing.Point(171, 167)
+        Me.lblAuswahlliste.Name = "lblAuswahlliste"
+        Me.lblAuswahlliste.Size = New System.Drawing.Size(186, 16)
+        Me.lblAuswahlliste.TabIndex = 7
+        Me.lblAuswahlliste.Text = "Auswahllistennamen eingeben:"
+        Me.lblAuswahlliste.Visible = False
+        '
+        'INDEX_NAMETextBox
+        '
+        Me.INDEX_NAMETextBox.Enabled = False
+        Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 103)
+        Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox"
+        Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23)
+        Me.INDEX_NAMETextBox.TabIndex = 16
+        Me.INDEX_NAMETextBox.Visible = False
+        '
+        'btndelete
+        '
+        Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btndelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
+        Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btndelete.Location = New System.Drawing.Point(13, 295)
+        Me.btndelete.Name = "btndelete"
+        Me.btndelete.Size = New System.Drawing.Size(178, 23)
+        Me.btndelete.TabIndex = 1
+        Me.btndelete.Text = "Control löschen"
+        Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btndelete.UseVisualStyleBackColor = True
+        '
+        'btnsave
+        '
+        Me.btnsave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnsave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save
+        Me.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnsave.Location = New System.Drawing.Point(279, 294)
+        Me.btnsave.Name = "btnsave"
+        Me.btnsave.Size = New System.Drawing.Size(188, 24)
+        Me.btnsave.TabIndex = 5
+        Me.btnsave.Text = "Änderungen Speichern"
+        Me.btnsave.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnsave.UseVisualStyleBackColor = True
+        Me.btnsave.Visible = False
+        '
+        'CHANGED_WHOTextBox
+        '
+        Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True))
+        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 518)
+        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
+        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23)
+        Me.CHANGED_WHOTextBox.TabIndex = 19
+        '
+        'StatusStrip1
+        '
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 556)
+        Me.StatusStrip1.Name = "StatusStrip1"
+        Me.StatusStrip1.Size = New System.Drawing.Size(995, 22)
+        Me.StatusStrip1.TabIndex = 20
+        Me.StatusStrip1.Text = "StatusStrip1"
+        '
+        'tslblAenderungen
+        '
+        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red
+        Me.tslblAenderungen.Name = "tslblAenderungen"
+        Me.tslblAenderungen.Size = New System.Drawing.Size(153, 17)
+        Me.tslblAenderungen.Text = "Änderungen gespeichert"
+        Me.tslblAenderungen.Visible = False
+        '
+        'CHANGED_WHENTextBox
+        '
+        Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True))
+        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 518)
+        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
+        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23)
+        Me.CHANGED_WHENTextBox.TabIndex = 21
+        '
+        'btnrefresh
+        '
+        Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
+        Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnrefresh.Location = New System.Drawing.Point(415, 41)
+        Me.btnrefresh.Name = "btnrefresh"
+        Me.btnrefresh.Size = New System.Drawing.Size(81, 23)
+        Me.btnrefresh.TabIndex = 24
+        Me.btnrefresh.Text = "Refresh"
+        Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnrefresh.UseVisualStyleBackColor = True
+        '
         'TBPM_PROFILE_CONTROLSTableAdapter
         '
         Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True
@@ -832,6 +848,7 @@ Partial Class frmFormDesigner
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing
         Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing
@@ -842,7 +859,6 @@ Partial Class frmFormDesigner
         Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'TBPM_CONNECTIONTableAdapter
@@ -896,19 +912,19 @@ Partial Class frmFormDesigner
         Me.pnldesigner.PerformLayout()
         Me.gbxControl.ResumeLayout(False)
         Me.TabControlEigenschaften.ResumeLayout(False)
-        Me.TabPage1.ResumeLayout(False)
-        Me.TabPage1.PerformLayout()
-        Me.TabPage2.ResumeLayout(False)
-        Me.TabPage2.PerformLayout()
-        Me.TabPage3.ResumeLayout(False)
+        Me.pageProperties.ResumeLayout(False)
+        Me.pageFormat.ResumeLayout(False)
+        Me.pageFormat.PerformLayout()
+        Me.pageSQL.ResumeLayout(False)
         Me.pnlAuswahlliste.ResumeLayout(False)
         Me.pnlAuswahlliste.PerformLayout()
-        Me.TabPage4.ResumeLayout(False)
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.pagePropertiesOld.ResumeLayout(False)
+        Me.pagePropertiesOld.PerformLayout()
+        Me.StatusStrip1.ResumeLayout(False)
+        Me.StatusStrip1.PerformLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
@@ -947,8 +963,8 @@ Partial Class frmFormDesigner
     Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox
     Friend WithEvents TabControlEigenschaften As System.Windows.Forms.TabControl
-    Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
-    Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+    Friend WithEvents pagePropertiesOld As System.Windows.Forms.TabPage
+    Friend WithEvents pageFormat As System.Windows.Forms.TabPage
     Friend WithEvents btnwidth_minus As System.Windows.Forms.Button
     Friend WithEvents btnwidth_plus As System.Windows.Forms.Button
     Friend WithEvents btnheight_minus As System.Windows.Forms.Button
@@ -956,7 +972,7 @@ Partial Class frmFormDesigner
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents btnVektor As System.Windows.Forms.Button
-    Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+    Friend WithEvents pageSQL As System.Windows.Forms.TabPage
     Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter
     Friend WithEvents pnlAuswahlliste As System.Windows.Forms.Panel
@@ -980,6 +996,6 @@ Partial Class frmFormDesigner
     Friend WithEvents btnrefresh As System.Windows.Forms.Button
     Friend WithEvents btnShowConnections As System.Windows.Forms.Button
     Friend WithEvents btnEditor As Button
-    Friend WithEvents TabPage4 As TabPage
+    Friend WithEvents pageProperties As TabPage
     Friend WithEvents pgControls As PropertyGrid
 End Class
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index 85dcde1..832da02 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -123,15 +123,6 @@
   <metadata name="CHANGED_WHENLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
-  </metadata>
-  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>898, 56</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnEditor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -143,9 +134,18 @@
         QAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>898, 56</value>
+  </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>904, 17</value>
   </metadata>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 0aa3bc9..326ae81 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -1,5 +1,6 @@
-Public Class frmFormDesigner
-    Public _windreamPM As ClassPMWindream
+Imports DD_LIB_Standards
+
+Public Class frmFormDesigner
     Private COLUMN_GUID
     Private MouseIsDown As Boolean = False
     Private idxlbl As Integer = 0
@@ -53,11 +54,8 @@
             pnldesigner.Controls.Clear()
             CURRENT_CONTROL = Nothing
             Try
-                DD_LIB_Standards.clsWindream.Create_Session()
-                ' Windream instanziieren
-                _windreamPM = New ClassPMWindream()
-                'Windream initialisieren (Connection, Session, ... aufbauen)
-                _windreamPM.Init()
+                ' Windream initialisieren
+                clsWindream.Create_Session()
             Catch ex As Exception
                 MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
@@ -79,7 +77,7 @@
     End Sub
     Sub Load_indexe()
         cmbIndex.Items.Clear()
-        Dim indexe = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
+        Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
         If indexe IsNot Nothing Then
             cmbIndex.Items.Add("")
             For Each index As String In indexe
@@ -92,15 +90,14 @@
     Sub Load_Indexe_Vektor()
         Try
             Me.cmbIndex.Items.Clear()
-            Dim indexe = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
+
+            Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
             If indexe IsNot Nothing Then
                 Me.cmbIndex.Items.Add("")
                 For Each index As String In indexe
                     Dim _vektorString As Boolean = False
-                    'If index.StartsWith("Vektor") Or index.StartsWith("vkt") Then
-                    '    MsgBox(_windreamPM.GetTypeOfIndex(index).ToString)
-                    'End If
-                    Select Case _windreamPM.GetTypeOfIndex(index)
+
+                    Select Case clsWD_GET.GetTypeOfIndexAsIntByName(index)
                         Case 4107 'Vektor Zahl
                             _vektorString = True
                         Case 4097
@@ -122,8 +119,8 @@
         _loading = True
         Try
             TabControlEigenschaften.SelectedIndex = 0
-            Me.cmbIndex.Visible = False
-            Me.INDEX_NAMETextBox.Visible = False
+            cmbIndex.Visible = False
+            INDEX_NAMETextBox.Visible = False
             If ID = 0 Then
                 If IsNothing(CURRENT_CONTROL.Tag) Then
                     Dim ID_CTRL = GetControlGUID(CURRENT_CONTROL.Name)
@@ -185,19 +182,13 @@
         _loading = False
     End Sub
 
-    Function CreateBaseControl(ctrl As Control, guid As Integer, name As String, x As Integer, y As Integer, font As Font, color As Color)
-        ctrl.Tag = guid
-        ctrl.Name = name
-        ctrl.Location = New Point(x, y)
-        ctrl.Font = font
-        ctrl.ForeColor = color
 
-        Return ctrl
-    End Function
 
     Sub Controls_laden()
         Try
             TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+            TBPM_CONTROL_TABLETableAdapter.FillAll(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE)
+
             ' löscht alle Controls
             pnldesigner.Controls.Clear()
 
@@ -218,26 +209,55 @@
                 ' Jetzt die Control spezifischen Eigenschaften zuweisen
                 Select Case row.Item("CTRL_TYPE")
                     Case "TXT"
-                        Dim ctrl = CreateBaseControl(New TextBox, guid, name, x, y, font, color)
-                        AddExistingTextbox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim txt = ClassControlCreator.CreateExistingTextbox(row, True)
+                        pnldesigner.Controls.Add(txt)
+                        SetMovementHandlers(txt)
+
+                        'Dim ctrl = CreateBaseControl(New TextBox, guid, name, x, y, font, color)
+                        'AddExistingTextbox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "LBL"
-                        Dim ctrl = CreateBaseControl(New Label, guid, name, x, y, font, color)
-                        AddExistingLabel(ctrl, row.Item("CTRL_TEXT"))
+                        Dim lbl = ClassControlCreator.CreateExistingLabel(row, True)
+                        pnldesigner.Controls.Add(lbl)
+                        SetMovementHandlers(lbl)
+
+                        'Dim ctrl = CreateBaseControl(New Label, guid, name, x, y, font, color)
+                        'AddExistingLabel(ctrl, row.Item("CTRL_TEXT"))
                     Case "CMB"
-                        Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        AddExistingCombobox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim cmb = ClassControlCreator.CreateExistingCombobox(row, True)
+                        pnldesigner.Controls.Add(cmb)
+                        SetMovementHandlers(cmb)
+
+                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
+                        'AddExistingCombobox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "DTP"
-                        Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        AddExistingDatetimepicker(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
-                    Case "DGV"
-                        Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
-                        AddExistingDatagridview(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim dtp = ClassControlCreator.CreateExistingDatepicker(row, True)
+                        pnldesigner.Controls.Add(dtp)
+                        SetMovementHandlers(dtp)
+
+                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
+                        'AddExistingDatetimepicker(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "CHK"
-                        Dim ctrl = CreateBaseControl(New CheckBox, guid, name, x, y, font, color)
-                        AddExistingCheckbox(ctrl, row.Item("CTRL_TEXT"), row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim chk = ClassControlCreator.CreateExisingCheckbox(row, True)
+                        pnldesigner.Controls.Add(chk)
+                        SetMovementHandlers(chk)
+
+                        'Dim ctrl = CreateBaseControl(New CheckBox, guid, name, x, y, font, color)
+                        'AddExistingCheckbox(ctrl, row.Item("CTRL_TEXT"), row.Item("WIDTH"), row.Item("HEIGHT"))
+                    Case "DGV"
+                        Dim dgv = ClassControlCreator.CreateExistingDataGridView(row, True)
+                        pnldesigner.Controls.Add(dgv)
+                        SetMovementHandlers(dgv)
+
+                        'Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
+                        'AddExistingDatagridview(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "TABLE"
-                        Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
-                        AddExistingTable(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
+                                                                                           Where r.CONTROL_ID = guid
+                                                                                           Select r).ToList()
+                        Dim table = ClassControlCreator.CreateExistingTable(row, columns, True)
+
+                        pnldesigner.Controls.Add(table)
+                        SetMovementHandlers(table)
                 End Select
             Next
         Catch ex As Exception
@@ -245,7 +265,7 @@
         End Try
 
     End Sub
-    Private Sub DragDropButtons_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
+    Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
             btnTabelle.MouseDown, btnCheckbox.MouseDown
         MouseIsDown = True
         CURRENT_CONTROL = Nothing
@@ -254,11 +274,35 @@
         Catch ex As Exception
 
         End Try
-
     End Sub
 
+    Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btncmb.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove
+        If MouseIsDown Then
+            Dim btn As Button = sender
+            Dim dragDropData As String
 
-    Private Sub btnlabel_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseMove
+            Select Case btn.Name
+                Case "btnlabel"
+                    dragDropData = "lbl"
+                Case "btntextbox"
+                    dragDropData = "txt"
+                Case "btncmb"
+                    dragDropData = "cmb"
+                Case "btndtp"
+                    dragDropData = "dtp"
+                Case "btnVektor"
+                    dragDropData = "dgv"
+                Case "btnTabelle"
+                    dragDropData = "tb"
+                Case "btnCheckbox"
+                    dragDropData = "chk"
+            End Select
+
+            btn.DoDragDrop(dragDropData, DragDropEffects.Copy)
+        End If
+    End Sub
+
+    Private Sub btnlabel_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove
         If MouseIsDown Then
             ' Initiate dragging. 
             btnlabel.DoDragDrop("lbl", DragDropEffects.Copy)
@@ -266,7 +310,7 @@
         MouseIsDown = False
     End Sub
 
-    Private Sub btntextbox_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles btntextbox.MouseMove
+    Private Sub btntextbox_MouseMove(sender As Object, e As MouseEventArgs) Handles btntextbox.MouseMove
         If MouseIsDown Then
             ' Initiate dragging. 
             btntextbox.DoDragDrop("txt", DragDropEffects.Copy)
@@ -283,21 +327,21 @@
                 AddNewLabel("lbl" & random.ToString)
             Case "txt"
                 'idxtxt += 1
-                add_newtextbox("txt" & random)
+                AddNewTextbox("txt" & random)
             Case "cmb"
                 'idxcmb += 1
-                add_newCombobox("cmb" & random)
+                AddNewCombobox("cmb" & random)
             Case "dtp"
                 'idxdtp += 1
-                add_newDTP("dtp" & random)
+                AddNewDatetimepicker("dtp" & random)
             Case "dgv"
                 'idxdgv += 1
-                add_newDGV("dgv" & random)
+                AddNewDGV("dgv" & random)
             Case "chk"
                 ' idxchk += 1
-                add_newCheckbox("chk" & random)
+                AddNewCheckbox("chk" & random)
             Case "tb"
-                add_newTABLE("tb" & random)
+                AddNewTable("tb" & random)
         End Select
     End Sub
 
@@ -326,17 +370,11 @@
             lbl.Name = lblname
             lbl.Text = "Bez. definieren"
             lbl.AutoSize = True
-            'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
-            'lbl.Size = New Size(300, 27)
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             lbl.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(lbl)
             CURRENT_CONTROL = lbl
 
-            'AddHandler lbl.Click, AddressOf OnlblClick
-            'AddHandler lbl.MouseDown, AddressOf MovableLabel_MouseDown
-            'AddHandler lbl.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler lbl.MouseMove, AddressOf Control_MouseMove 'MovableLabel_MouseMove
             SetMovementHandlers(lbl)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200)
@@ -359,14 +397,14 @@
         Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", CURRENT_ProfilGUID)
         Return ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
     End Function
-    Function add_newtextbox(txtname As String)
+    Function AddNewTextbox(txtname As String)
         Try
             Dim txt As New TextBox
             txt.Name = txtname
             txt.Size = New Size(200, 27)
             txt.Cursor = Cursors.Hand
             txt.ReadOnly = True
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             txt.Location = New Point(clientPosition)
             txt.BackColor = Color.White
             pnldesigner.Controls.Add(txt)
@@ -376,8 +414,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txtname, txt.Location.X, txt.Location.Y, Environment.UserName, 27, 200)
             CURRENT_CONTROL.Tag = GetLastID()
-            'GetControlGUID(txt.Name)
-            'Load_Control()
+
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen TextBox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -400,7 +437,7 @@
 
         btnsave.Visible = True
     End Function
-    Function add_newCheckbox(chkname As String)
+    Function AddNewCheckbox(chkname As String)
         Try
 
             Dim chk As New CheckBox
@@ -409,7 +446,7 @@
             chk.AutoSize = True
             chk.Text = "Beschriftung def."
             chk.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             chk.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(chk)
             CURRENT_CONTROL = chk
@@ -418,7 +455,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chkname, chk.Location.X, chk.Location.Y, Environment.UserName, 27, 200)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Checkbox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -434,13 +471,13 @@
 
         btnsave.Visible = True
     End Function
-    Function add_newCombobox(cmbname As String)
+    Function AddNewCombobox(cmbname As String)
         Try
             Dim cmb As New ComboBox
             cmb.Name = cmbname
             cmb.Size = New Size(180, 24)
             cmb.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
             cmb.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(cmb)
             CURRENT_CONTROL = cmb
@@ -449,7 +486,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmbname, cmb.Location.X, cmb.Location.Y, Environment.UserName, 24, 180)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Combobox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -473,26 +510,23 @@
         SetMovementHandlers(dtp)
         btnsave.Visible = True
     End Function
-    Function add_newDTP(dtpname As String)
+    Function AddNewDatetimepicker(dtpname As String)
         Try
             Dim dtp As New DateTimePicker
             dtp.Name = dtpname
             dtp.Size = New Size(180, 24)
             dtp.Cursor = Cursors.Hand
             dtp.Format = DateTimePickerFormat.Short
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
             dtp.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(dtp)
             CURRENT_CONTROL = dtp
-            'AddHandler dtp.Click, AddressOf OndtpClick
-            'AddHandler dtp.MouseDown, AddressOf Movabledtp_MouseDown
-            'AddHandler dtp.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler dtp.MouseMove, AddressOf Control_MouseMove 'Movabledtp_MouseMove
+
             SetMovementHandlers(dtp)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtpname, dtp.Location.X, dtp.Location.Y, Environment.UserName, 24, 180)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
 
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen DatetimePicker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -514,15 +548,11 @@
 
         pnldesigner.Controls.Add(dgv)
 
-        'AddHandler dgv.Click, AddressOf OndgvClick
-        'AddHandler dgv.MouseDown, AddressOf MovableDGV_MouseDown
-        'AddHandler dgv.MouseUp, AddressOf MovableCtrl_MouseUp
-        'AddHandler dgv.MouseMove, AddressOf dgv_MouseMove
         SetMovementHandlers(dgv)
 
         btnsave.Visible = True
     End Function
-    Function add_newDGV(dgvName As String)
+    Function AddNewDGV(dgvName As String)
         Try
             Dim dgv As New DataGridView
             dgv.Name = dgvName
@@ -542,20 +572,16 @@
             pnldesigner.Controls.Add(dgv)
             CURRENT_CONTROL = dgv
 
-            'AddHandler dgv.Click, AddressOf OndgvClick
-            'AddHandler dgv.MouseDown, AddressOf MovableDGV_MouseDown
-            'AddHandler dgv.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler dgv.MouseMove, AddressOf dgv_MouseMove
             SetMovementHandlers(dgv)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgvName, dgv.Location.X, dgv.Location.Y, Environment.UserName, 130, 150)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen DGV: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Function
-    Function add_newTABLE(tableName As String)
+    Function AddNewTable(tableName As String)
         Try
             Dim table As New DataGridView
             table.Name = tableName
@@ -583,10 +609,6 @@
             pnldesigner.Controls.Add(table)
             CURRENT_CONTROL = table
 
-            'AddHandler table.Click, AddressOf OndgvClick
-            'AddHandler table.MouseDown, AddressOf MovableDGV_MouseDown
-            'AddHandler table.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler table.MouseMove, AddressOf dgv_MouseMove
             SetMovementHandlers(table)
 
             AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
@@ -594,7 +616,7 @@
             CURRENT_CONTROL.Tag = GetLastID()
             TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName)
             TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName)
-            Load_Control()
+            'Load_Control()
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Tabelle: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -620,21 +642,15 @@
             Next
         End If
 
-        ' table.AutoResizeColumns()
-
         pnldesigner.Controls.Add(table)
 
-        'AddHandler table.Click, AddressOf OndgvClick
-        'AddHandler table.MouseDown, AddressOf MovableDGV_MouseDown
-        'AddHandler table.MouseUp, AddressOf MovableCtrl_MouseUp
-        'AddHandler table.MouseMove, AddressOf dgv_MouseMove
         SetMovementHandlers(table)
 
         AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
 
         btnsave.Visible = True
     End Function
-    Sub Set_Active_Color()
+    Sub SetActiveControlColor()
         CURRENT_CONTROL.BackColor = Color.DarkOrange
         For Each inctrl As Control In Me.pnldesigner.Controls
             If inctrl.Name <> CURRENT_CONTROL.Name Then
@@ -652,166 +668,45 @@
             End If
         Next
     End Sub
-    Public Sub OnlblClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Set_Active_Color()
-        Dim lbl As Label = sender
-        CURRENT_CONTROL = lbl
-        Load_Control()
-        lblBeschriftung.Visible = True
-        CTRL_TEXTTextBox.Visible = True
-        lblIndex.Visible = False
 
-        cmbIndex.Visible = False
-        rbIndex.Visible = False
-        rbVektor.Visible = False
+    'Public Sub OndgvClick(sender As System.Object, e As System.EventArgs)
+    '    CURRENT_CONTROL = sender
+    '    Dim dgv As DataGridView = sender
 
-        VALIDATIONCheckBox.Visible = False
-        CheckBoxAuswahlliste.Visible = False
-        CHOICE_LISTTextBox.Visible = False
-        lblAuswahlliste.Visible = False
-        gbxControl.Visible = True
-
-        READ_ONLYCheckBox.Visible = False
-        LOAD_IDX_VALUECheckBox.Visible = False
-
-        INDEX_NAMETextBox.Visible = False
-    End Sub
-    Public Sub OntxtClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim txt As TextBox = sender
-        Set_Active_Color()
+    '    CURRENT_CONTROL = dgv
+    '    If dgv.ColumnCount > 1 Then
+    '        Me.rbVektor.Visible = False
+    '        Load_Indexe_Vektor()
+    '        Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected)
+    '        If selectedColumnCount > 0 Then
+    '            COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name)
+    '        End If
+    '    Else
+    '        Load_indexe()
+    '        Me.rbVektor.Visible = True
+    '        COLUMN_GUID = Nothing
+    '    End If
 
 
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.VALIDATIONCheckBox.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
+    '    'Load_Control()
+    '    Me.lblBeschriftung.Visible = False
+    '    Me.CTRL_TEXTTextBox.Visible = False
+    '    Me.lblIndex.Visible = True
+    '    Me.cmbIndex.Visible = True
+    '    Me.rbIndex.Visible = True
 
-        gbxControl.Visible = True
-        ' Me.pnlAuswahlliste.Enabled = False
+    '    Me.CheckBoxAuswahlliste.Visible = False
+    '    Me.CHOICE_LISTTextBox.Visible = False
+    '    Me.lblAuswahlliste.Visible = False
 
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OnchkboxClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim chk As CheckBox = sender
-        Set_Active_Color()
-        CURRENT_CONTROL = chk
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = True
-        Me.CTRL_TEXTTextBox.Visible = True
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.VALIDATIONCheckBox.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
-        gbxControl.Visible = True
-        ' Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OncmbClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim cmb As ComboBox = sender
+    '    Me.VALIDATIONCheckBox.Visible = True
 
-        Set_Active_Color()
-        Load_indexe()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = True
-        Me.VALIDATIONCheckBox.Visible = True
-        gbxControl.Visible = True
-        If CHOICE_LISTTextBox.Text <> "" Then
-            CheckBoxAuswahlliste.Checked = True
-        Else
-            CheckBoxAuswahlliste.Checked = False
-        End If
-
-        '  Me.pnlAuswahlliste.Enabled = True
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-        Load_Control()
-
-    End Sub
-    Public Sub OndtpClick(sender As System.Object, e As System.EventArgs)
-
-        CURRENT_CONTROL = sender
-        Dim dtp As DateTimePicker = sender
-        CURRENT_CONTROL = dtp
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.VALIDATIONCheckBox.Visible = True
-        gbxControl.Visible = True
-        CHOICE_LISTTextBox.Visible = False
-        ' Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OndgvClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim dgv As DataGridView = sender
-
-        CURRENT_CONTROL = dgv
-        If dgv.ColumnCount > 1 Then
-            Me.rbVektor.Visible = False
-            Load_Indexe_Vektor()
-            Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected)
-            If selectedColumnCount > 0 Then
-                COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name)
-            End If
-        Else
-            Load_indexe()
-            Me.rbVektor.Visible = True
-            COLUMN_GUID = Nothing
-        End If
-
-
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
-
-        Me.VALIDATIONCheckBox.Visible = True
-
-        gbxControl.Visible = True
-        CHOICE_LISTTextBox.Visible = False
-        'Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
+    '    gbxControl.Visible = True
+    '    CHOICE_LISTTextBox.Visible = False
+    '    'Me.pnlAuswahlliste.Enabled = False
+    '    Me.READ_ONLYCheckBox.Visible = True
+    '    Me.LOAD_IDX_VALUECheckBox.Visible = True
+    'End Sub
     Public Sub table_ColumnHeaderMouseClick(sender As System.Object, e As DataGridViewCellMouseEventArgs)
         CURRENT_CONTROL = sender
         Dim dgv As DataGridView = sender
@@ -830,9 +725,7 @@
         frmTableColumn.FillData(COLUMN_GUID)
         frmTableColumn.Text = "Konfiguration von Spalte: " & dgvColumn.Name
 
-
-
-        Load_Control()
+        'Load_Control()
         Me.lblBeschriftung.Visible = True
         Me.CTRL_TEXTTextBox.Visible = True
         Me.lblIndex.Visible = True
@@ -892,117 +785,40 @@
 
         End Try
     End Sub
-    Private Sub MovableLabel_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            '  MsgBox(ex.Message)
 
-            Dim lbl As Label = DirectCast(sender, Label)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            lbl.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub MovableText_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
+    'Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
+    '    ' Check to see if the correct button has been pressed
+    '    If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then
+    '        Clear_control_Details()
+    '        Dim dgv As DataGridView = DirectCast(sender, DataGridView)
+    '        Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position)
+    '        Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y)
+    '        If hit.Type.ToString = "ColumnHeader" Then
+    '            Exit Sub
+    '        End If
 
-            Dim txt As TextBox = DirectCast(sender, TextBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            txt.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub MovableChk_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim txt As CheckBox = DirectCast(sender, CheckBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            txt.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub Movablecmb_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim cmb As ComboBox = DirectCast(sender, ComboBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
+    '        CURRENT_CONTROL = sender
 
-            cmb.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub Movabledtp_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim dtp As DateTimePicker = DirectCast(sender, DateTimePicker)
-            CURRENT_CONTROL = sender
+    '        BeginLocation = e.Location
+    '        CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location)
+    '        dgv.BringToFront()
+    '        ' Set the mode flag to signal the MouseMove event handler that it
+    '        ' needs to now calculate new positions for our control
+    '        MouseMoving = True
 
-            'Console.WriteLine("X: " & cursor.X & ";Y=" & cursor.Y)
-            BeginLocation = e.Location
-            'begin_location = New Point(cursor.X - Parent.Location.X,
-            '             cursor.Y - Parent.Location.Y)
-            dtp.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
+    '        CURRENT_CONTROL = sender
 
-            'Jetzt Controleigenschaften laden
-            Load_Control()
+    '        'Jetzt Controleigenschaften laden
+    '        SetActiveControlColor()
+    '        'Load_Control()
 
-        End If
-    End Sub
+    '        gbxControl.Visible = True
+    '    End If
+    'End Sub
 
-    Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then
-            Clear_control_Details()
-            Dim dgv As DataGridView = DirectCast(sender, DataGridView)
-            Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position)
-            Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y)
-            If hit.Type.ToString = "ColumnHeader" Then
-                Exit Sub
-            End If
-
-            CURRENT_CONTROL = sender
-
-            BeginLocation = e.Location
-            CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location)
-            dgv.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-
-            CURRENT_CONTROL = sender
-
-            'Jetzt Controleigenschaften laden
-            Set_Active_Color()
-            Load_Control()
-
-            gbxControl.Visible = True
-        End If
-    End Sub
-
-    Private Sub btnsave_Click(sender As System.Object, e As System.EventArgs) Handles btnsave.Click
-        Save_Control()
-    End Sub
+    'Private Sub btnsave_Click(sender As System.Object, e As System.EventArgs) Handles btnsave.Click
+    '    Save_Control()
+    'End Sub
     Sub Save_Control()
         Try
             If rbVektor.Checked Then
@@ -1047,64 +863,63 @@
 
     End Sub
 
-    Private Sub cmbIndex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbIndex.SelectedIndexChanged
-        If cmbIndex.SelectedIndex <> -1 Then
-            If cmbIndex.Text = "DD PM-ONLY FOR DISPLAY" Then
-                LOAD_IDX_VALUECheckBox.Checked = False
-                LOAD_IDX_VALUECheckBox.Enabled = False
-                READ_ONLYCheckBox.Checked = True
-                VALIDATIONCheckBox.Checked = False
-                VALIDATIONCheckBox.Enabled = False
-            Else
-                LOAD_IDX_VALUECheckBox.Enabled = True
-                VALIDATIONCheckBox.Enabled = True
-            End If
-            If _loading = False Then
-                Save_Control()
-            End If
-        End If
-    End Sub
-    Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove
-        If MouseIsDown Then
-            ' Initiate dragging. 
-            btncmb.DoDragDrop("cmb", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
+    'Private Sub cmbIndex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbIndex.SelectedIndexChanged
+    '    If cmbIndex.SelectedIndex <> -1 Then
+    '        If cmbIndex.Text = "DD PM-ONLY FOR DISPLAY" Then
+    '            LOAD_IDX_VALUECheckBox.Checked = False
+    '            LOAD_IDX_VALUECheckBox.Enabled = False
+    '            READ_ONLYCheckBox.Checked = True
+    '            VALIDATIONCheckBox.Checked = False
+    '            VALIDATIONCheckBox.Enabled = False
+    '        Else
+    '            LOAD_IDX_VALUECheckBox.Enabled = True
+    '            VALIDATIONCheckBox.Enabled = True
+    '        End If
+    '        If _loading = False Then
+    '            Save_Control()
+    '        End If
+    '    End If
+    'End Sub
+    'Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove
+    '    If MouseIsDown Then
+    '        ' Initiate dragging. 
+    '        btncmb.DoDragDrop("cmb", DragDropEffects.Copy)
+    '    End If
+    '    MouseIsDown = False
+    'End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CheckBoxAuswahlliste.CheckedChanged
-        If CheckBoxAuswahlliste.Checked Then
-            lblAuswahlliste.Visible = True
-            CHOICE_LISTTextBox.Visible = True
-        Else
-            lblAuswahlliste.Visible = False
-            CHOICE_LISTTextBox.Visible = False
-        End If
-    End Sub
+    'Private Sub CheckBox1_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CheckBoxAuswahlliste.CheckedChanged
+    '    If CheckBoxAuswahlliste.Checked Then
+    '        lblAuswahlliste.Visible = True
+    '        CHOICE_LISTTextBox.Visible = True
+    '    Else
+    '        lblAuswahlliste.Visible = False
+    '        CHOICE_LISTTextBox.Visible = False
+    '    End If
+    'End Sub
 
 
-    Private Sub btndelete_Click(sender As System.Object, e As System.EventArgs) Handles btndelete.Click
+    Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click
         If CURRENT_CONTROL Is Nothing = False Then
             delete_Control(CURRENT_CONTROL.Name)
         End If
     End Sub
 
-    Private Sub btnwidth_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_plus.Click
+    Private Sub btnwidth_plus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_plus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width + 5, CURRENT_CONTROL.Height)
             UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
         End If
-
     End Sub
 
-    Private Sub btnwidth_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_minus.Click
+    Private Sub btnwidth_minus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_minus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width - 5, CURRENT_CONTROL.Height)
             UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
         End If
     End Sub
 
-    Private Sub btnheight_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_plus.Click
+    Private Sub btnheight_plus_Click(sender As System.Object, e As EventArgs) Handles btnheight_plus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             Dim newHeight As Integer = CURRENT_CONTROL.Height + 5
 
@@ -1116,7 +931,7 @@
         End If
     End Sub
 
-    Private Sub btnheight_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_minus.Click
+    Private Sub btnheight_minus_Click(sender As System.Object, e As EventArgs) Handles btnheight_minus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             Dim newHeight As Integer = CURRENT_CONTROL.Height - 5
 
@@ -1128,7 +943,7 @@
         End If
     End Sub
 
-    Private Sub Button2_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btndtp.MouseMove
+    Private Sub Button2_MouseMove(sender As System.Object, e As MouseEventArgs) Handles btndtp.MouseMove
         If MouseIsDown Then
             'Initiate dragging. 
             btndtp.DoDragDrop("dtp", DragDropEffects.Copy)
@@ -1160,29 +975,29 @@
         MouseIsDown = False
     End Sub
 
-    Private Sub rbIndex_CheckedChanged(sender As Object, e As EventArgs) Handles rbIndex.CheckedChanged
-        If rbIndex.Checked Then
-            Me.cmbIndex.Visible = True
-            Me.INDEX_NAMETextBox.Visible = False
-            Me.lblIndex.Text = "Zugeordneter Index"
-        Else
-            Me.cmbIndex.Visible = False
-            Me.INDEX_NAMETextBox.Visible = True
-            Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-        End If
-    End Sub
+    'Private Sub rbIndex_CheckedChanged(sender As Object, e As EventArgs) Handles rbIndex.CheckedChanged
+    '    If rbIndex.Checked Then
+    '        cmbIndex.Visible = True
+    '        INDEX_NAMETextBox.Visible = False
+    '        lblIndex.Text = "Zugeordneter Index"
+    '    Else
+    '        cmbIndex.Visible = False
+    '        INDEX_NAMETextBox.Visible = True
+    '        lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
+    '    End If
+    'End Sub
 
-    Private Sub rbVektor_CheckedChanged(sender As Object, e As EventArgs) Handles rbVektor.CheckedChanged
-        If rbVektor.Checked Then
-            Me.INDEX_NAMETextBox.Visible = True
-            Me.cmbIndex.Visible = False
-            Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-        Else
-            Me.INDEX_NAMETextBox.Visible = False
-            Me.cmbIndex.Visible = True
-            Me.lblIndex.Text = "Zugeordneter Index"
-        End If
-    End Sub
+    'Private Sub rbVektor_CheckedChanged(sender As Object, e As EventArgs) Handles rbVektor.CheckedChanged
+    '    If rbVektor.Checked Then
+    '        Me.INDEX_NAMETextBox.Visible = True
+    '        Me.cmbIndex.Visible = False
+    '        Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
+    '    Else
+    '        Me.INDEX_NAMETextBox.Visible = False
+    '        Me.cmbIndex.Visible = True
+    '        Me.lblIndex.Text = "Zugeordneter Index"
+    '    End If
+    'End Sub
 
     Private Sub INDEX_NAMETextBox_Leave(sender As Object, e As EventArgs) Handles INDEX_NAMETextBox.Leave
         If INDEX_NAMETextBox.Text <> "" And CURRENT_CONTROL_ID <> 0 Then
@@ -1230,7 +1045,7 @@
             CURRENT_SQL_CON = CONID
             frmSQL_DESIGNER.ShowDialog()
 
-            Load_Control(CURRENT_CONTROL_ID)
+            'Load_Control(CURRENT_CONTROL_ID)
             TabControlEigenschaften.SelectedIndex = 2
         Else
             MsgBox("Please choose a control!", MsgBoxStyle.Information)
@@ -1250,8 +1065,6 @@
         AddHandler control.MouseMove, AddressOf OnControl_MouseMove
     End Sub
 
-
-
     Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs)
         If e.Button = MouseButtons.Left Then
             CURRENT_CONTROL = sender
@@ -1314,6 +1127,8 @@
         obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
         obj.Name = row.Item("NAME")
         obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing)
+        obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "")
 
         Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
         Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
@@ -1354,16 +1169,20 @@
                                               Return r.Item("GUID") = sender.Tag
                                           End Function).Single()
 
+        ' Globale Variablen setzen
         CURRENT_CONTROL = sender
         CURRENT_CONTROL_ID = sender.Tag
 
-        Set_Active_Color()
+        SetActiveControlColor()
 
         gbxControl.Visible = True
 
-        Dim indicies As List(Of String) = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
-        Dim choiceLists As List(Of String) = DD_LIB_Standards.clsWD_GET.GetChoiceLists()
+        'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
+        Dim indicies As List(Of String) = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+        Dim choiceLists As List(Of String) = clsWD_GET.GetChoiceLists()
 
+        ' Mithilfe von CreatePropsObject(WithIndicies) wird ein Basis Objekt mit grundlegenden
+        ' Eigenschaften angelegt. Danach können für jeden Control Typ spezifische Eigenschaften festgelegt werden.
         If TypeOf sender Is Label Then
             Dim label As Label = sender
             Dim labelProps As LabelProperties = CreatePropsObject(New LabelProperties, row)
@@ -1405,6 +1224,7 @@
             Exit Sub
         End If
 
+        ' Zum Schluss wird das Eigenschaften-Objekt ins PropertyGrid geladen
         pgControls.SelectedObject = props
     End Sub
 
@@ -1437,12 +1257,12 @@
                 CURRENT_CONTROL.Size = newValue
 
             Case "Width"
-                UpdateSingleValue("WIDTH", DirectCast(newValue, Size).Width)
+                UpdateSingleValue("WIDTH", CInt(newValue))
 
                 CURRENT_CONTROL.Size = New Size(newValue, CURRENT_CONTROL.Size.Height)
 
             Case "Height"
-                UpdateSingleValue("HEIGHT", DirectCast(newValue, Size).Height)
+                UpdateSingleValue("HEIGHT", CInt(newValue))
 
                 CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Size.Width, newValue)
 
@@ -1492,6 +1312,7 @@
         Dim guid As Integer = CURRENT_CONTROL_ID
         Dim escapedValue = value
 
+        ' Strings und SQL-Commands müssen vor dem speichern escaped und mit Anführungszeichen versehen werden
         If TypeOf value Is String Then
             escapedValue = $"'{value}'"
         ElseIf TypeOf value Is InputProperties.SQLValue Then
@@ -1499,10 +1320,16 @@
             escapedValue = $"'{v.Value.Replace("'", "''")}'"
         End If
 
-        ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue} WHERE GUID = {guid}")
+        Try
+            ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue} WHERE GUID = {guid}")
 
-        tslblAenderungen.Visible = True
-        tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+            tslblAenderungen.Visible = True
+            tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+        Catch ex As Exception
+            Dim msg = $"Fehler beim Speichern von Control (Id: {guid}): {vbCrLf}{ex.Message}"
+            MsgBox(msg)
+            ClassLogger.Add(msg)
+        End Try
     End Sub
 #End Region
 End Class
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index f0f14b2..7de7212 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -661,7 +661,6 @@ Public Class frmMain
 
     End Sub
 
-
     Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click
         Try
             frmKonfig.ShowDialog()
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 37ff265..fce8dce 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -290,11 +290,11 @@ Public Class frmValidator
         sumatra = False
         If My.Settings.frmValidatorPosition.IsEmpty = False Then
             If My.Settings.frmValidatorPosition.X > 0 And My.Settings.frmValidatorPosition.Y > 0 Then
-                Me.Location = My.Settings.frmValidatorPosition
+                Location = My.Settings.frmValidatorPosition
             End If
         End If
         If My.Settings.frmValidatorSize.IsEmpty = False Then
-            Me.Size = My.Settings.frmValidatorSize
+            Size = My.Settings.frmValidatorSize
         End If
         Try
             DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
@@ -304,14 +304,14 @@ Public Class frmValidator
             TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPM_CONTROL_INDEXTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.VWPM_PROFILE_USERTableAdapter.FillByName(Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName)
+            TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString
+            VWPM_PROFILE_USERTableAdapter.FillByName(DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName)
 
-            Me.VWPM_CONTROL_INDEXTableAdapter.Fill(Me.DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName)
-            Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION)
+            VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName)
+            TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_CONNECTION)
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False)
         Catch ex As Exception
             MsgBox("Error LOADING profile-data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
@@ -368,9 +368,9 @@ Public Class frmValidator
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString, False)
                     'Delete Button anzeigen ja/nein
                     If Right_Delete = True Then
-                        Me.ToolStripButtonDeleteFile.Enabled = True
+                        ToolStripButtonDeleteFile.Enabled = True
                     Else
-                        Me.ToolStripButtonDeleteFile.Enabled = False
+                        ToolStripButtonDeleteFile.Enabled = False
                     End If
 
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> Right_Delete: " & Right_Delete.ToString, False)
@@ -405,37 +405,291 @@ Public Class frmValidator
         End Try
     End Sub
 
+    Sub ComboBoxData(profileId As Integer, controlName As String)
+        ' Informationen über Profil und Control holen
+        Dim ControlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(profileId, controlName)
+        Dim ConnectionId As Integer
+        Dim SQLCommand As String
+
+        If ControlId = 0 Then
+            Exit Sub
+        End If
+
+        ConnectionId = TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlId)
+
+        If ConnectionId = 0 Then
+            Exit Sub
+        End If
+
+        SQLCommand = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlId)
+
+        If SQLCommand = String.Empty Then
+            Exit Sub
+        End If
+
+        TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConnectionId)
+
+        Dim connectionString As String
+
+        For Each row As DataRow In DD_DMSLiteDataSet.TBPM_CONNECTION.Rows
+            Select Case row.Item("SQL_PROVIDER").ToString().ToLower()
+                Case "ms-sql"
+                    If row.Item("USERNAME") = "WINAUTH" Then
+                        connectionString = $"Data Source={row.Item("SERVER")};Initial Catalog=${row.Item("DATENBANK")};Trusted_Connection=True;"
+                    Else
+                        connectionString = $"Data Source={row.Item("SERVER")};Initial Catalog=${row.Item("DATENBANK")};User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}"
+                    End If
+                Case "oracle"
+                    Dim csBuilder As New OracleConnectionStringBuilder()
+
+                    If row.Item("SERVER") <> String.Empty And Not IsDBNull(row.Item("SERVER")) Then
+                        connectionString = $"""
+                            Data Source=(
+                                DESCRIPTION=
+                                    ADDRESS_LIST=
+                                        (ADDRESS=
+                                            (PROTOCOL=TCP)
+                                            (HOST={row.Item("SERVER")})
+                                            (PORT=1521)
+                                        )
+                                    )
+                                    (CONNECT_DATA=
+                                        (SERVER=DEDICATED)
+                                        (SERVICE_NAME={row.Item("DATENBANK")})
+                                    )
+                               );User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
+                        """
+                    Else
+                        csBuilder.DataSource = row.Item("SERVER")
+                        csBuilder.UserID = row.Item("USERNAME")
+                        csBuilder.Password = row.Item("PASSWORD")
+                        csBuilder.PersistSecurityInfo = True
+                        csBuilder.ConnectionTimeout = 120
+
+                        connectionString = csBuilder.ConnectionString
+                    End If
+                Case Else
+                    Exit Sub
+            End Select
+        Next
+
+        Dim items As New List(Of String)
+
+        Using adapter As New SqlClient.SqlDataAdapter()
+            Using conn As New SqlClient.SqlConnection(connectionString)
+                conn.Open()
+
+                Using cmd As New SqlClient.SqlCommand(SQLCommand, conn)
+
+                    Dim dataSet As New DataSet()
+
+                    adapter.SelectCommand = cmd
+                    adapter.Fill(dataSet)
+
+                    Dim table = dataSet.Tables(0)
+
+                    For Each row As DataRow In table.Rows
+                        items.Add(row.Item(0))
+                    Next
+                End Using
+            End Using
+        End Using
+
+
+
+    End Sub
+
     Sub Load_Controls()
         Try
             pnldesigner.Controls.Clear()
-            Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
+            'Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
+
+            TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+            Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
+
             For Each dr As DataRow In dt.Rows
+                Dim ctrl As Control
+
                 Select Case dr.Item("CTRL_TYPE").ToString.ToUpper
                     Case "TXT"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch TXT zu laden", False)
-                        add_textbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+                        Dim txt As TextBox = ClassControlCreator.CreateExistingTextbox(dr, False)
+
+                        AddHandler txt.GotFocus, AddressOf OnTextBoxFocus
+                        AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus
+                        AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp
+
+                        ctrl = txt
+
+                        'add_textbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "LBL"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch LBL zu laden", False)
-                        add_label(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")))
+                        ctrl = ClassControlCreator.CreateExistingLabel(dr, False)
+
+                        'add_label(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")))
                     Case "CMB"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch CMB zu laden", False)
-                        add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+
+                        Dim cmb = ClassControlCreator.CreateExistingCombobox(dr, False)
+
+                        AddHandler cmb.SelectedValueChanged, AddressOf OnCmbselectedIndex
+
+#Region "CONTROL LIST"
+
+                        Dim ControlID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, cmb.Name)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - GUID: " & ControlID, False)
+                        If ControlID > 0 Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >>ControlID > 0", False)
+                            Dim ConID = Me.TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlID)
+                            If ConID Is Nothing = False Then
+                                Dim commandsql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> ConID Is Nothing = False", False)
+                                If ConID > 0 And commandsql <> "" Then
+                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False)
+                                    Dim connectionString As String
+                                    TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
+                                    Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION
+                                    Dim drConnection As DataRow
+                                    For Each drConnection In DTConnection.Rows
+                                        Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower
+                                            Case "ms-sql"
+                                                If drConnection.Item("USERNAME") = "WINAUTH" Then
+                                                    connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog=" & drConnection.Item("DATENBANK") & ";Trusted_Connection=True;"
+                                                Else
+                                                    connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog= " & drConnection.Item("DATENBANK") & ";User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";"
+                                                End If
+                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnString Sql-Server:  " & connectionString)
+                                            Case "oracle"
+                                                Dim conn As New OracleConnectionStringBuilder
+                                                Dim connstr As String
+                                                If drConnection.Item("SERVER") <> "" And drConnection.Item("DATENBANK").GetType.ToString <> "system.dbnull" Then
+                                                    connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & drConnection.Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
+                                        drConnection.Item("DATENBANK") & ")));User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";"
+                                                Else
+                                                    conn.DataSource = drConnection.Item("SERVER")
+                                                    conn.UserID = drConnection.Item("USERNAME")
+                                                    conn.Password = drConnection.Item("PASSWORD")
+                                                    conn.PersistSecurityInfo = True
+                                                    conn.ConnectionTimeout = 120
+                                                    connstr = conn.ConnectionString
+                                                End If
+
+                                                connectionString = connstr
+                                            Case Else
+                                                ClassLogger.Add(" - ConnectionType nicht integriert", False)
+                                                MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
+                                        End Select
+                                    Next
+                                    If connectionString Is Nothing = False Then
+                                        Try
+                                            Dim sqlCnn As SqlClient.SqlConnection
+                                            Dim sqlCmd As SqlClient.SqlCommand
+                                            Dim adapter As New SqlClient.SqlDataAdapter
+                                            Dim NewDataset As New DataSet
+                                            Dim i As Integer
+                                            Dim sql As String
+
+
+                                            sql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
+                                            sqlCnn = New SqlClient.SqlConnection(connectionString)
+                                            ' Try
+                                            sqlCnn.Open()
+                                            sqlCmd = New SqlClient.SqlCommand(sql, sqlCnn)
+                                            adapter.SelectCommand = sqlCmd
+                                            adapter.Fill(NewDataset)
+                                            Dim msg As String
+                                            For i = 0 To NewDataset.Tables(0).Rows.Count - 1
+                                                cmb.Items.Add(NewDataset.Tables(0).Rows(i).Item(0))
+                                            Next
+                                            adapter.Dispose()
+                                            sqlCmd.Dispose()
+                                            sqlCnn.Close()
+                                        Catch ex As Exception
+                                            ClassLogger.Add(" - Unvorhergesehener Fehler bei GetValues SQL - Fehler: " & vbNewLine & ex.Message)
+                                            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetValues SQL:")
+                                        End Try
+                                    End If
+                                Else
+                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Else Row 571", False)
+                                End If
+                            Else
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> AListe Handling", False)
+                                Dim AListe As String = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetChoiceListName(ControlID)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - AListe: " & AListe, False)
+                                If AListe Is Nothing = False Then
+                                    Dim liste = _windream.GetValuesfromAuswahlliste(AListe)
+                                    If liste IsNot Nothing Then
+                                        cmb.Items.Add("")
+                                        For Each index As String In liste
+                                            cmb.Items.Add(index)
+                                        Next
+                                        cmb.SelectedIndex = -1
+                                    Else
+                                        MsgBox("Resultliste windream is nothing!", MsgBoxStyle.Exclamation, AListe)
+                                    End If
+                                Else
+                                    MsgBox("AListe from database is nothing!", MsgBoxStyle.Exclamation, AListe)
+                                End If
+                            End If
+
+
+                        End If
+#End Region
+
+                        Dim maxWith As Integer = cmb.Width
+                        Using g As Graphics = Me.CreateGraphics
+                            For Each oItem As Object In cmb.Items 'Für alle Einträge...
+                                Dim g1 As Graphics = cmb.CreateGraphics
+                                If g1.MeasureString(Text, cmb.Font).Width + 30 > maxWith Then
+                                    maxWith = g1.MeasureString(Text, cmb.Font).Width + 30
+                                End If
+                                g1.Dispose()
+                            Next oItem
+                        End Using
+                        cmb.DropDownWidth = maxWith
+
+                        ctrl = cmb
+
+                        'add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DTP"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DTP zu laden", False)
+                        ctrl = ClassControlCreator.CreateExistingDatepicker(dr, False)
+
                         add_DTP(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DGV"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DGV zu laden", False)
-                        add_DGV(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("HEIGHT"), dr.Item("WIDTH"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+                        Dim dgv = ClassControlCreator.CreateExistingDataGridView(dr, False)
+
+                        AddHandler dgv.RowValidating, AddressOf onDGVRowValidating
+
+                        ctrl = dgv
+
+                        'add_DGV(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("HEIGHT"), dr.Item("WIDTH"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "CHK"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Checkbox zu laden", False)
-                        add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE"))
+
+                        ctrl = ClassControlCreator.CreateExisingCheckbox(dr, False)
+                        'add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE"))
                     Case "TABLE"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Tabelle zu laden", False)
-                        add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"))
+
+                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
+                                                                                           Where r.CONTROL_ID = dr.Item("GUID")
+                                                                                           Select r).ToList()
+
+                        ctrl = ClassControlCreator.CreateExistingTable(dr, columns, False)
+                        'add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"))
                 End Select
+
+                If first_control Is Nothing Then
+                    first_control = ctrl
+                End If
+                last_control = ctrl
+
+                pnldesigner.Controls.Add(ctrl)
+
             Next
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Controls geladen", False)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Controls geladen", False)
             ClassLogger.Add("", False)
 
         Catch ex As Exception
@@ -448,18 +702,18 @@ Public Class frmValidator
 
     End Sub
 
-    Function add_label(CONTROL_ID As Integer, lblname As String, text As String, x As Integer, y As Integer)
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_label - lblname: " & lblname & " x/y: " & x.ToString & "/" & y.ToString, False)
-        Dim lbl As New Label
-        lbl.Name = lblname
-        lbl.Text = text
-        lbl.AutoSize = True
-        lbl.Tag = CONTROL_ID
-        'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
-        lbl.Location = New Point(x, y)
-        pnldesigner.Controls.Add(lbl)
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> LBL: " & lblname & " hinzugefügt", False)
-    End Function
+    'Function add_label(CONTROL_ID As Integer, lblname As String, text As String, x As Integer, y As Integer)
+    '    If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_label - lblname: " & lblname & " x/y: " & x.ToString & "/" & y.ToString, False)
+    '    Dim lbl As New Label
+    '    lbl.Name = lblname
+    '    lbl.Text = text
+    '    lbl.AutoSize = True
+    '    lbl.Tag = CONTROL_ID
+    '    'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
+    '    lbl.Location = New Point(x, y)
+    '    pnldesigner.Controls.Add(lbl)
+    '    If LogErrorsOnly = False Then ClassLogger.Add(" >> LBL: " & lblname & " hinzugefügt", False)
+    'End Function
     Function add_textbox(CONTROL_ID As Integer, ByVal txtname As String, ByVal x As Integer, ByVal y As Integer, ByVal width As Integer, ByVal height As Integer, ByVal read_only As Boolean, loadindex As Boolean) 'idxName As String, 
         If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_textbox - txtname: " & txtname & " x/y: " & x.ToString & "/" & y.ToString, False)
         Dim txt As New TextBox
@@ -515,8 +769,8 @@ Public Class frmValidator
                 If ConID > 0 And commandsql <> "" Then
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False)
                     Dim connectionString As String
-                    Me.TBPM_CONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
-                    Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONNECTION
+                    TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
+                    Dim DT As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION
                     Dim drConnection As DataRow
                     For Each drConnection In DT.Rows
                         Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower
@@ -763,7 +1017,7 @@ Public Class frmValidator
 
     End Sub
 
-    Public Sub OnTextBoxFocus(sender As System.Object, e As System.EventArgs)
+    Public Sub OnTextBoxFocus(sender As Object, e As EventArgs)
         Dim box As TextBox = sender
         box.BackColor = Color.Lime
         box.SelectAll()
@@ -811,21 +1065,21 @@ Public Class frmValidator
                                     ' Regulären Ausdruck zum Auslesen der Indexe definieren
                                     Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
                                     ' einen Regulären Ausdruck laden
-                                    Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                                    Dim regulärerAusdruck As Text.RegularExpressions.Regex = New Text.RegularExpressions.Regex(preg)
                                     ' die Vorkommen im SQL-String auslesen
-                                    Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement)
+                                    Dim elemente As Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement)
                                     '####
                                     ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
-                                    For Each element As System.Text.RegularExpressions.Match In elemente
+                                    For Each element As Text.RegularExpressions.Match In elemente
                                         Try
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
                                             Dim MyPattern = element.Value.Substring(2, element.Value.Length - 3)
                                             Dim input_value
                                             If MyPattern.Contains("txt") Then
-                                                Dim txt As TextBox = CType(Me.pnldesigner.Controls(MyPattern), TextBox)
+                                                Dim txt As TextBox = CType(pnldesigner.Controls(MyPattern), TextBox)
                                                 input_value = txt.Text
                                             ElseIf MyPattern.Contains("cmb") Then
-                                                Dim cmb As ComboBox = CType(Me.pnldesigner.Controls(MyPattern), ComboBox)
+                                                Dim cmb As ComboBox = CType(pnldesigner.Controls(MyPattern), ComboBox)
                                                 input_value = cmb.Text
                                             End If
                                             sql_Statement = sql_Statement.ToString.Replace(element.Value, input_value)
@@ -1892,121 +2146,121 @@ Public Class frmValidator
             'lblerror.Visible = False
             'Try
             Dim _error As Boolean = False
-                Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
-                Dim dtfinal As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING
-                If dtfinal.Rows.Count > 0 Then
-                    'Jetzt finale Indexe setzen
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Finale(r) Index(e) für Dok: " & aktivesDokument.aName & " soll gesetzt werden", False)
-                    For Each dr As DataRow In dtfinal.Rows
-                        Dim value As String = dr.Item("VALUE").ToString
-                        If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit dynamischem SQL!", False)
-                            Dim SQL_COMMAND = dr.Item("SQL_COMMAND")
-                            ' Regulären Ausdruck zum Auslesen der Indexe definieren
-                            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
-                            ' einen Regulären Ausdruck laden
-                            Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
-                            ' die Vorkommen im SQL-String auslesen
-                            Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SQL_COMMAND)
-                            '####
-                            ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
-                            For Each element As System.Text.RegularExpressions.Match In elemente
-                                Try
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
-                                    Dim WDINDEXNAME = element.Value.Substring(2, element.Value.Length - 3)
-                                    Dim wertWD = aktivesDokument.GetVariableValue(WDINDEXNAME)
-                                    If Not IsNothing(wertWD) Then
-                                        SQL_COMMAND = SQL_COMMAND.ToString.Replace(element.Value, wertWD)
-                                    Else
-                                        ClassLogger.Add(">> Achtung Indexwert ist nothing!", False)
-                                    End If
-                                Catch ex As Exception
-                                    ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message)
-                                End Try
-                            Next
-                            Dim dynamic_value = ClassDatabase.Execute_Scalar(SQL_COMMAND, MyConnectionString, True)
-                            If Not IsNothing(dynamic_value) Then
-                                value = dynamic_value
-                            End If
-                        Else
-                            If value.StartsWith("v") Then
-                                Select Case dr.Item("VALUE").ToString
-                                    Case "vDate"
-                                        value = Now.ToShortDateString
-                                    Case "vUserName"
-                                        value = Environment.UserName
-                                    Case Else
-                                        value = dr.Item("VALUE")
-                                End Select
-                            End If
-                        End If
-
-                        Dim result() As String
-                        ReDim Preserve result(0)
-                        result(0) = value
-
-                        If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
-                            Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
-                            'Hier muss nun separat als Vektorfeld indexiert werden
-                            If Indexiere_VektorfeldPM(PM_String, PROFIL_VEKTORINDEX) = False Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME").ToString.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT", False)
-                            Else
-                                errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
-                                My.Settings.Save()
-                                frmError.ShowDialog()
-                                _error = True
-                            End If
-                        Else
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Jetzt das indexieren", False)
-                            If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), result) = True Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT", False)
-                                If LogErrorsOnly = False Then ClassLogger.Add("")
-                                'Nun das Logging
-                                If PROFIL_LOGINDEX <> "" Then
-                                    Dim logstr = Return_LOGString(value, "DDFINALINDEX", dr.Item("INDEXNAME"))
-                                    Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
+            Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
+            Dim dtfinal As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING
+            If dtfinal.Rows.Count > 0 Then
+                'Jetzt finale Indexe setzen
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Finale(r) Index(e) für Dok: " & aktivesDokument.aName & " soll gesetzt werden", False)
+                For Each dr As DataRow In dtfinal.Rows
+                    Dim value As String = dr.Item("VALUE").ToString
+                    If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit dynamischem SQL!", False)
+                        Dim SQL_COMMAND = dr.Item("SQL_COMMAND")
+                        ' Regulären Ausdruck zum Auslesen der Indexe definieren
+                        Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+                        ' einen Regulären Ausdruck laden
+                        Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                        ' die Vorkommen im SQL-String auslesen
+                        Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SQL_COMMAND)
+                        '####
+                        ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
+                        For Each element As System.Text.RegularExpressions.Match In elemente
+                            Try
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
+                                Dim WDINDEXNAME = element.Value.Substring(2, element.Value.Length - 3)
+                                Dim wertWD = aktivesDokument.GetVariableValue(WDINDEXNAME)
+                                If Not IsNothing(wertWD) Then
+                                    SQL_COMMAND = SQL_COMMAND.ToString.Replace(element.Value, wertWD)
+                                Else
+                                    ClassLogger.Add(">> Achtung Indexwert ist nothing!", False)
                                 End If
+                            Catch ex As Exception
+                                ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message)
+                            End Try
+                        Next
+                        Dim dynamic_value = ClassDatabase.Execute_Scalar(SQL_COMMAND, MyConnectionString, True)
+                        If Not IsNothing(dynamic_value) Then
+                            value = dynamic_value
+                        End If
+                    Else
+                        If value.StartsWith("v") Then
+                            Select Case dr.Item("VALUE").ToString
+                                Case "vDate"
+                                    value = Now.ToShortDateString
+                                Case "vUserName"
+                                    value = Environment.UserName
+                                Case Else
+                                    value = dr.Item("VALUE")
+                            End Select
+                        End If
+                    End If
 
-                            Else
-                                errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
-                                My.Settings.Save()
-                                frmError.ShowDialog()
-                                _error = True
+                    Dim result() As String
+                    ReDim Preserve result(0)
+                    result(0) = value
+
+                    If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
+                        Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
+                        'Hier muss nun separat als Vektorfeld indexiert werden
+                        If Indexiere_VektorfeldPM(PM_String, PROFIL_VEKTORINDEX) = False Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME").ToString.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT", False)
+                        Else
+                            errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
+                            My.Settings.Save()
+                            frmError.ShowDialog()
+                            _error = True
+                        End If
+                    Else
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Jetzt das indexieren", False)
+                        If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), result) = True Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT", False)
+                            If LogErrorsOnly = False Then ClassLogger.Add("")
+                            'Nun das Logging
+                            If PROFIL_LOGINDEX <> "" Then
+                                Dim logstr = Return_LOGString(value, "DDFINALINDEX", dr.Item("INDEXNAME"))
+                                Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
                             End If
-                        End If
-                        If _error = True Then
-                            Exit For
-                        End If
-                    Next
-                End If
-                'Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
-                If _error = False Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Tabelle updaten und co", False)
-                    'Das Dokument freigeben und als editiert markieren
-                    Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID)
-                    ClassDatabase.Execute_non_Query(sql)
-                    'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID)
-                    ''Das Dokument 
-                    'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID)
-                    Dim WORK_HISTORY_ENTRY = Nothing
 
-                    Try
-                        WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
-                        If IsDBNull(WORK_HISTORY_ENTRY) Then
-                            WORK_HISTORY_ENTRY = Nothing
+                        Else
+                            errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
+                            My.Settings.Save()
+                            frmError.ShowDialog()
+                            _error = True
                         End If
-                    Catch ex As Exception
+                    End If
+                    If _error = True Then
+                        Exit For
+                    End If
+                Next
+            End If
+            'Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
+            If _error = False Then
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Tabelle updaten und co", False)
+                'Das Dokument freigeben und als editiert markieren
+                Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID)
+                ClassDatabase.Execute_non_Query(sql)
+                'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID)
+                ''Das Dokument 
+                'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID)
+                Dim WORK_HISTORY_ENTRY = Nothing
+
+                Try
+                    WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
+                    If IsDBNull(WORK_HISTORY_ENTRY) Then
                         WORK_HISTORY_ENTRY = Nothing
-                    End Try
+                    End If
+                Catch ex As Exception
+                    WORK_HISTORY_ENTRY = Nothing
+                End Try
 
 
-                    If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                        If WORK_HISTORY_ENTRY <> String.Empty Then
-                            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
-                            ' einen Regulären Ausdruck laden
-                            Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
-                            ' die Vorkommen im SQL-String auslesen
-                            Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
+                If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                    If WORK_HISTORY_ENTRY <> String.Empty Then
+                        Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+                        ' einen Regulären Ausdruck laden
+                        Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                        ' die Vorkommen im SQL-String auslesen
+                        Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
                         '####
                         ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
                         For Each element As System.Text.RegularExpressions.Match In elemente
@@ -2070,15 +2324,15 @@ Public Class frmValidator
                             WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", Environment.UserName)
                         End If
                     Else
-                            WORK_HISTORY_ENTRY = ""
-                        End If
+                        WORK_HISTORY_ENTRY = ""
                     End If
-                    Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY)
-                    ClassDatabase.Execute_non_Query(ins)
+                End If
+                Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY)
+                ClassDatabase.Execute_non_Query(ins)
 
-                    Close_document_viewer()
-                    If Document_Path.ToLower.EndsWith(".pdf") Then
-                        If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                Close_document_viewer()
+                If Document_Path.ToLower.EndsWith(".pdf") Then
+                    If Not IsNothing(WORK_HISTORY_ENTRY) Then
                         If CBool(DTPROFIL.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
                             sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                             Dim DT_ENTRY As DataTable = ClassDatabase.Return_Datatable(sql, True)
@@ -2104,46 +2358,46 @@ Public Class frmValidator
                             End If
                         End If
                     End If
-                    End If
-
-                    'wenn Move2Folder aktiviert wurde
-                    If Move2Folder <> "" Then
-                        idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
-                        If idxerr_message <> "" Then
-                            errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
-                            My.Settings.Save()
-                            frmError.ShowDialog()
-                            _error = True
-                        End If
-                    End If
-                    'Validierungsfile löschen wenn vorhanden
-                    allgFunk.Delete_xffres(Document_Path)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
-                    Anzahl_validierte_Dok += 1
-                    'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
-                    ClassLogger.Add("", False)
-                    If CURRENT_JUMP_DOC_GUID <> 0 Then
-                        Me.Close()
-                    Else
-                        'Das nächste Dokument laden
-                        Load_Next_Document(False)
-
-                        set_foreground()
-                        If first_control Is Nothing = False Then first_control.Focus()
-                    End If
-
                 End If
 
-                'Catch ex As Exception
-                '    errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message
-                '    My.Settings.Save()
-                '    frmError.ShowDialog()
-                '    ClassLogger.Add(">> Unvorhergesehener Fehler bei Abschluss: " & ex.Message, True)
-                'End Try
+                'wenn Move2Folder aktiviert wurde
+                If Move2Folder <> "" Then
+                    idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
+                    If idxerr_message <> "" Then
+                        errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
+                        My.Settings.Save()
+                        frmError.ShowDialog()
+                        _error = True
+                    End If
+                End If
+                'Validierungsfile löschen wenn vorhanden
+                allgFunk.Delete_xffres(Document_Path)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
+                Anzahl_validierte_Dok += 1
+                'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
+                ClassLogger.Add("", False)
+                If CURRENT_JUMP_DOC_GUID <> 0 Then
+                    Me.Close()
                 Else
+                    'Das nächste Dokument laden
+                    Load_Next_Document(False)
+
+                    set_foreground()
+                    If first_control Is Nothing = False Then first_control.Focus()
+                End If
+
+            End If
+
+            'Catch ex As Exception
+            '    errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message
+            '    My.Settings.Save()
+            '    frmError.ShowDialog()
+            '    ClassLogger.Add(">> Unvorhergesehener Fehler bei Abschluss: " & ex.Message, True)
+            'End Try
+        Else
             'lblerror.Visible = True
             'lblerror.Text = errmessage
             errormessage = errmessage