diff --git a/app/DD-Record-Organizer/ClassProxy.vb b/app/DD-Record-Organizer/ClassProxy.vb
index bf56330..2ed0dec 100644
--- a/app/DD-Record-Organizer/ClassProxy.vb
+++ b/app/DD-Record-Organizer/ClassProxy.vb
@@ -177,5 +177,22 @@ Public Class ClassProxy
             Return BUSY
         End If
     End Function
-
+    Public Shared Function PRPROXY_DOC_VALUES(DocID As Integer)
+        If LICENSE_SITE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
+            Return False
+        End If
+        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & _
+      "EXEC @return_value = [dbo].[PRPROXY_DOC_VALUES] {0} " & vbNewLine & _
+      "SELECT	'Return Value' = @return_value", DocID)
+        Dim Result As DataTable = ClassDatabase.Return_Datatable(sel, True)
+        If Not IsNothing(Result) Then
+            If Result.Rows(0).Item(0) = 0 Then
+                Return True
+            Else
+                Return False
+            End If
+        Else
+            Return False
+        End If
+    End Function
 End Class
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx
index 56aba0a..43618d5 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -525,7 +525,7 @@
     <value>0, 25</value>
   </data>
   <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 212</value>
+    <value>1067, 212</value>
   </data>
   <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -665,7 +665,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 25</value>
+    <value>1067, 25</value>
   </data>
   <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -749,7 +749,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 343</value>
+    <value>786, 336</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -779,7 +779,7 @@
     <value>0, 26</value>
   </data>
   <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 293</value>
+    <value>554, 286</value>
   </data>
   <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -826,10 +826,10 @@
     <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
   </data>
   <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 319</value>
+    <value>0, 312</value>
   </data>
   <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 24</value>
+    <value>554, 24</value>
   </data>
   <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -856,7 +856,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 26</value>
+    <value>554, 26</value>
   </data>
   <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -877,7 +877,7 @@
     <value>Panel2</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1050,7 +1050,7 @@
     <value>1</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -1068,7 +1068,7 @@
     <value>0</value>
   </data>
   <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1362, 403</value>
+    <value>1362, 396</value>
   </data>
   <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1083,7 +1083,7 @@
     <value>Cyan</value>
   </data>
   <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1107,7 +1107,7 @@
     <value>0, 25</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1361,7 +1361,7 @@
 </value>
   </data>
   <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>Positionen</value>
@@ -1423,7 +1423,7 @@
     <value>Aqua</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1525,7 +1525,7 @@
     <value>1</value>
   </data>
   <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1956,7 +1956,7 @@
     <value>2</value>
   </data>
   <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Wiedervorlage</value>
@@ -2067,7 +2067,7 @@
     <value>5</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>90</value>
@@ -2139,7 +2139,7 @@
     <value>1</value>
   </data>
   <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabPageVariant.Text" xml:space="preserve">
     <value>Vorgängervarianten</value>
@@ -2636,7 +2636,7 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>140</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index efde1f8..47ad3ba 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -3637,6 +3637,7 @@ Public Class frmConstructor_Main
 
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user)
             ClassDatabase.Execute_non_Query(Sql)
+            ClassProxy.PRPROXY_DOC_VALUES(docId)
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCBSelectedValueChanged: ", ex.Message)
         End Try
@@ -3656,26 +3657,24 @@ Public Class frmConstructor_Main
 
             If oldValue = DatePicker.EditValue Then
                 Exit Sub
-                End If
+            End If
+            'Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
+            'Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
+            ' Config id über mainView -> detailView herausfinden
+            Dim mainView As GridView = GridControlDocSearch.MainView
+            Dim detailView As GridView = mainView.GetDetailView(mainView.FocusedRowHandle, mainView.GetRelationIndex(mainView.FocusedRowHandle, "docIdDetails"))
+            Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
+            Dim configid = detailRow.Item("CONFIG_ID")
 
-
-                'Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName
-                'Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle)
-                ' Config id über mainView -> detailView herausfinden
-                Dim mainView As GridView = GridControlDocSearch.MainView
-                Dim detailView As GridView = mainView.GetDetailView(mainView.FocusedRowHandle, mainView.GetRelationIndex(mainView.FocusedRowHandle, "docIdDetails"))
-                Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
-                Dim configid = detailRow.Item("CONFIG_ID")
-
-                Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
-                Dim user As String = USER_USERNAME
-
-                Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
-
-                Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, dateString, user)
-                If ClassDatabase.Execute_non_Query(Sql) = False Then
-                    ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!")
-                End If
+            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim user As String = USER_USERNAME
+            Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff
+            Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, dateString, user)
+            If ClassDatabase.Execute_non_Query(Sql) = False Then
+                ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
+            End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnDateSelectedValueChanged: ", ex.Message)
         End Try
@@ -3703,6 +3702,8 @@ Public Class frmConstructor_Main
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
             If ClassDatabase.Execute_non_Query(Sql) = False Then
                 ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (textbox): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
             End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnTextSelectedValueChanged: ", ex.Message)
@@ -3727,6 +3728,8 @@ Public Class frmConstructor_Main
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configid, value, user)
             If ClassDatabase.Execute_non_Query(Sql) = False Then
                 ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (checkbox): " & vbNewLine & "Check the log for further information!")
+            Else
+                ClassProxy.PRPROXY_DOC_VALUES(docId)
             End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message)
diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.vb b/app/DD-Record-Organizer/frmWD_IndexFile.vb
index f0eb35d..dae3f74 100644
--- a/app/DD-Record-Organizer/frmWD_IndexFile.vb
+++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb
@@ -378,10 +378,10 @@ Public Class frmWD_IndexFile
                 MsgBox("No Record chosen or the documenttype was not chosen!", MsgBoxStyle.Information)
                 Exit Sub
             End If
-            If lvwIndices.Items.Count = 0 Then
-                MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information)
-                Exit Sub
-            End If
+            'If lvwIndices.Items.Count = 0 Then
+            '    MsgBox("Please choose a documenttxpe!", MsgBoxStyle.Information)
+            '    Exit Sub
+            'End If
             If Not IsNothing(CURRENT_TBPMO_INDEX_MAN) Then
                 If CURRENT_TBPMO_INDEX_MAN.Rows.Count > 0 Then
                     If ClassFileResult.CheckWrite_IndexeMan(grbxControls) = False Then
diff --git a/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj b/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj
index 13550ba..65efb8a 100644
--- a/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj
+++ b/app/RecordOrganizer_RightManager/RecordOrganizer_RightManager.vbproj
@@ -90,6 +90,12 @@
   <ItemGroup>
     <Compile Include="ApplicationEvents.vb" />
     <Compile Include="ClassDatabase.vb" />
+    <Compile Include="frmCheckRightsRecords.Designer.vb">
+      <DependentUpon>frmCheckRightsRecords.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmCheckRightsRecords.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmUsersReworkRights.Designer.vb">
       <DependentUpon>frmUsersReworkRights.vb</DependentUpon>
     </Compile>
@@ -144,6 +150,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="frmCheckRightsRecords.resx">
+      <DependentUpon>frmCheckRightsRecords.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmUsersReworkRights.resx">
       <DependentUpon>frmUsersReworkRights.vb</DependentUpon>
     </EmbeddedResource>
diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
index 0263a01..130491e 100644
--- a/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb
@@ -7,6 +7,7 @@ Public Class frmCheckRightsEntity
     Private countfiles As Integer = 0
     Private WorkingFiles As Integer = 0
     Private CURR_DOCID As Integer
+    Private CURR_DOCPATH As String
     Private ENTITY_ID As Integer
     Dim righterrors As Boolean = False
     Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -35,7 +36,7 @@ Public Class frmCheckRightsEntity
                 BW_RightsEntity.WorkerSupportsCancellation = True
                 Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME,TRL.RECORD_ID,TR.FORM_ID AS [ENTITY_ID] FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL, TBPMO_RECORD TR where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = TR.GUID AND TR.FORM_ID = {0} ORDER BY DocID", ENTITY_ID)
                 DT_FILES = clsDatabase.Return_Datatable(sqlfiles)
-                If DD_Rights.ClassRights.Init(ENTITY_ID, chklogging.Checked, DT_FILES.Rows.Count) = False Then
+                If DD_Rights.ClassWDRights.Init(chklogging.Checked, ClassDatabase.ConnectionStringRM) = False Then
                     MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                     Exit Sub
                 End If
@@ -43,9 +44,7 @@ Public Class frmCheckRightsEntity
                     MsgBox("No files were found! Please check docsearch!", MsgBoxStyle.Critical)
                     Exit Sub
                 Else
-                    clsLogger.Add(String.Format(">> {0} files must be transferred!", DT_FILES.Rows.Count), False)
-                    Dim del = "DELETE FROM TBPMO_USER_RIGHTS_JOBS WHERE ENTITY_ID = " & ENTITY_ID
-                    clsDatabase.Execute_non_Query(del)
+                    clsLogger.Add(String.Format(">> {0} files must be Checked!", DT_FILES.Rows.Count), False)
                 End If
                 btncancel.Visible = True
                 lblstate.Visible = True
@@ -79,33 +78,47 @@ Public Class frmCheckRightsEntity
                 e.Cancel = True
                 Exit For
             Else
-                If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID"), row.Item("ENTITY_ID")) = True Then
-                    WorkingFiles += 1
-                    CURR_DOCID = row.Item("DocID")
-                    If DD_Rights.ClassRights.TransferRights2Service(row.Item("DocID"), row.Item("FULL_FILENAME"), 1) Then
-                        If DD_Rights.ClassRights.MSG_RESULT <> "" Then
-                            righterrors = True
-                        End If
-                    Else
-                        MsgBox("Unexpected Error in DD_Rights.ClassRights.TransferRights2Service - Check the log!", MsgBoxStyle.Exclamation)
-                        If DD_Rights.ClassRights.MSG_RESULT <> "" Then
-                            MsgBox(DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Information)
-                        End If
-                        _error = True
+                '###
+                WorkingFiles += 1
+                CURR_DOCID = row.Item("DocID")
+                CURR_DOCPATH = row.Item("FULL_FILENAME")
+                If DD_Rights.ClassWDRights.Doc_Renew_Rights(CURR_DOCID, CURR_DOCPATH, True) Then
+                    If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
+                        righterrors = True
                     End If
                 Else
-                    MsgBox("Unexpected Error in DD_Rights.ClassRights.Collect_Users - Check the log!", MsgBoxStyle.Exclamation)
-                    If DD_Rights.ClassRights.MSG_RESULT <> "" Then
-                        MsgBox(DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Information)
+                    MsgBox("Unexpected Error in DD_Rights.ClassWDRights.Doc_Renew_Rights - Check the log!", MsgBoxStyle.Exclamation)
+                    If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
+                        MsgBox(DD_Rights.ClassWDRights.MSG_RESULT, MsgBoxStyle.Information)
                     End If
                     _error = True
                 End If
+                '###
+                'If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID"), row.Item("ENTITY_ID")) = True Then
+                '    WorkingFiles += 1
+                '    CURR_DOCID = row.Item("DocID")
+                '    If DD_Rights.ClassRights.TransferRights2Service(row.Item("DocID"), row.Item("FULL_FILENAME"), 1) Then
+                '        If DD_Rights.ClassRights.MSG_RESULT <> "" Then
+                '            righterrors = True
+                '        End If
+                '    Else
+                '        MsgBox("Unexpected Error in DD_Rights.ClassRights.TransferRights2Service - Check the log!", MsgBoxStyle.Exclamation)
+                '        If DD_Rights.ClassRights.MSG_RESULT <> "" Then
+                '            MsgBox(DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Information)
+                '        End If
+                '        _error = True
+                '    End If
+                'Else
+                '    MsgBox("Unexpected Error in DD_Rights.ClassRights.Collect_Users - Check the log!", MsgBoxStyle.Exclamation)
+                '    If DD_Rights.ClassRights.MSG_RESULT <> "" Then
+                '        MsgBox(DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Information)
+                '    End If
+                '    _error = True
+                'End If
                 BW_RightsEntity.ReportProgress(i)
                 i += 1
             End If
         Next
-        DD_Rights.ClassRights.Finalize_SettingRights()
-       
     End Sub
 
     Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click
@@ -118,15 +131,14 @@ Public Class frmCheckRightsEntity
             lblstate.Visible = False
             ProgressBar1.Visible = False
             If _error = False Then
-                clsDatabase.Execute_non_Query("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET RUN_SERVICE = 1 WHERE GUID = 1")
+                'clsDatabase.Execute_non_Query("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET RUN_SERVICE = 1 WHERE GUID = 1")
                 If righterrors = True Then
                     MsgBox("All rights of files belonging to entity were checked and refreshed, " & vbNewLine & "BUT some Userrights could not be set. Check the logfile!", MsgBoxStyle.Exclamation, "Attention")
                 Else
-                    MsgBox("All rights of files belonging to entity were queued for central rights service!" & vbNewLine & "Rights will be set within the next 5 minutes!", MsgBoxStyle.Information)
+                    MsgBox("All rights of files belonging to entity were checked and refreshed!", MsgBoxStyle.Information)
                 End If
             Else
-                MsgBox("Some errors occured while preparing and queuing rights...please check the log!" & vbNewLine & ">> " & ClassRights.COUNT_FILES.ToString & " files schould be worked." & _
-                       ">> " & ClassRights.WORKED_FILES.ToString & " were worked successfully.", MsgBoxStyle.Exclamation)
+                MsgBox("Some errors occured while preparing and queuing rights...please check the log!" , MsgBoxStyle.Exclamation)
             End If
         Catch ex As Exception
 
diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb
new file mode 100644
index 0000000..77919f8
--- /dev/null
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb
@@ -0,0 +1,188 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmCheckRightsRecords
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.cmbentity = New System.Windows.Forms.ComboBox()
+        Me.btnCheckRights = New System.Windows.Forms.Button()
+        Me.BW_RightsEntity = New System.ComponentModel.BackgroundWorker()
+        Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
+        Me.btncancel = New System.Windows.Forms.Button()
+        Me.chklogging = New System.Windows.Forms.CheckBox()
+        Me.lblstate = New System.Windows.Forms.Label()
+        Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
+        Me.GridViewMain = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.Label2 = New System.Windows.Forms.Label()
+        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(25, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(147, 16)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Please choose an entity:"
+        '
+        'cmbentity
+        '
+        Me.cmbentity.FormattingEnabled = True
+        Me.cmbentity.Location = New System.Drawing.Point(28, 29)
+        Me.cmbentity.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.cmbentity.Name = "cmbentity"
+        Me.cmbentity.Size = New System.Drawing.Size(335, 24)
+        Me.cmbentity.TabIndex = 1
+        '
+        'btnCheckRights
+        '
+        Me.btnCheckRights.Location = New System.Drawing.Point(520, 59)
+        Me.btnCheckRights.Name = "btnCheckRights"
+        Me.btnCheckRights.Size = New System.Drawing.Size(335, 39)
+        Me.btnCheckRights.TabIndex = 2
+        Me.btnCheckRights.Text = "Renew rights for all selected records"
+        Me.btnCheckRights.UseVisualStyleBackColor = True
+        '
+        'BW_RightsEntity
+        '
+        '
+        'ProgressBar1
+        '
+        Me.ProgressBar1.Location = New System.Drawing.Point(520, 31)
+        Me.ProgressBar1.Name = "ProgressBar1"
+        Me.ProgressBar1.Size = New System.Drawing.Size(335, 22)
+        Me.ProgressBar1.TabIndex = 3
+        Me.ProgressBar1.Visible = False
+        '
+        'btncancel
+        '
+        Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1
+        Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btncancel.Location = New System.Drawing.Point(881, 25)
+        Me.btncancel.Name = "btncancel"
+        Me.btncancel.Size = New System.Drawing.Size(75, 31)
+        Me.btncancel.TabIndex = 4
+        Me.btncancel.Text = "Cancel"
+        Me.btncancel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btncancel.UseVisualStyleBackColor = True
+        Me.btncancel.Visible = False
+        '
+        'chklogging
+        '
+        Me.chklogging.AutoSize = True
+        Me.chklogging.Checked = True
+        Me.chklogging.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.chklogging.Location = New System.Drawing.Point(379, 31)
+        Me.chklogging.Name = "chklogging"
+        Me.chklogging.Size = New System.Drawing.Size(113, 20)
+        Me.chklogging.TabIndex = 5
+        Me.chklogging.Text = "Log errors only"
+        Me.chklogging.UseVisualStyleBackColor = True
+        '
+        'lblstate
+        '
+        Me.lblstate.AutoSize = True
+        Me.lblstate.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblstate.Location = New System.Drawing.Point(517, 12)
+        Me.lblstate.Name = "lblstate"
+        Me.lblstate.Size = New System.Drawing.Size(38, 13)
+        Me.lblstate.TabIndex = 6
+        Me.lblstate.Text = "Label2"
+        '
+        'GridControlMain
+        '
+        Me.GridControlMain.AllowDrop = True
+        Me.GridControlMain.Location = New System.Drawing.Point(28, 105)
+        Me.GridControlMain.MainView = Me.GridViewMain
+        Me.GridControlMain.Name = "GridControlMain"
+        Me.GridControlMain.Size = New System.Drawing.Size(928, 196)
+        Me.GridControlMain.TabIndex = 9
+        Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewMain})
+        '
+        'GridViewMain
+        '
+        Me.GridViewMain.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus
+        Me.GridViewMain.GridControl = Me.GridControlMain
+        Me.GridViewMain.Name = "GridViewMain"
+        Me.GridViewMain.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewMain.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewMain.OptionsSelection.EnableAppearanceFocusedRow = False
+        Me.GridViewMain.OptionsSelection.EnableAppearanceHideSelection = False
+        Me.GridViewMain.OptionsSelection.MultiSelect = True
+        Me.GridViewMain.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
+        Me.GridViewMain.OptionsView.ColumnAutoWidth = False
+        Me.GridViewMain.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewMain.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewMain.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(25, 86)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(318, 16)
+        Me.Label2.TabIndex = 10
+        Me.Label2.Text = "Please select the records which files shall be checked:"
+        '
+        'frmCheckRightsRecords
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(970, 305)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.GridControlMain)
+        Me.Controls.Add(Me.lblstate)
+        Me.Controls.Add(Me.chklogging)
+        Me.Controls.Add(Me.btncancel)
+        Me.Controls.Add(Me.ProgressBar1)
+        Me.Controls.Add(Me.btnCheckRights)
+        Me.Controls.Add(Me.cmbentity)
+        Me.Controls.Add(Me.Label1)
+        Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmCheckRightsRecords"
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Check Rights for Records"
+        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents cmbentity As System.Windows.Forms.ComboBox
+    Friend WithEvents btnCheckRights As System.Windows.Forms.Button
+    Friend WithEvents BW_RightsEntity As System.ComponentModel.BackgroundWorker
+    Friend WithEvents ProgressBar1 As System.Windows.Forms.ProgressBar
+    Friend WithEvents btncancel As System.Windows.Forms.Button
+    Friend WithEvents chklogging As System.Windows.Forms.CheckBox
+    Friend WithEvents lblstate As System.Windows.Forms.Label
+    Friend WithEvents GridControlMain As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewMain As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+End Class
diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx
new file mode 100644
index 0000000..91c7d6d
--- /dev/null
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="BW_RightsEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb
new file mode 100644
index 0000000..69b0215
--- /dev/null
+++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb
@@ -0,0 +1,207 @@
+Imports DD_Rights
+Imports System.ComponentModel
+Imports DevExpress.XtraEditors.Repository
+Imports DevExpress.Utils
+
+Public Class frmCheckRightsRecords
+    Private _formloaded As Boolean = False
+    Private DT_FILES As DataTable
+    Private _error As Boolean = False
+    Private countfiles As Integer = 0
+    Private WorkingFiles As Integer = 0
+    Private CURR_DOCID As Integer
+    Private CURR_DOCPATH As String
+    Private ENTITY_ID As Integer
+    Dim righterrors As Boolean = False
+    Private DT_DATA As DataTable
+    Private Sub frmCheckRightsRecords_Load(sender As Object, e As EventArgs) Handles Me.Load
+        Try
+            Dim sql = String.Format("SELECT T.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.[FORM_VIEW_ID]), 1) AS FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS T WHERE DOCUMENT_VIEW = 1", USER_LANGUAGE)
+            Dim DT As DataTable = clsDatabase.Return_Datatable(sql)
+            cmbentity.DataSource = DT
+            cmbentity.ValueMember = DT.Columns(0).ColumnName
+            cmbentity.DisplayMember = DT.Columns(1).ColumnName
+            lblstate.Visible = False
+        Catch ex As Exception
+            MsgBox("Unexpected error in load form: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub btnCheckRights_Click(sender As Object, e As EventArgs) Handles btnCheckRights.Click
+        If cmbentity.SelectedIndex <> -1 And DT_DATA.Rows.Count > 0 Then
+            Try
+                DT_DATA.AcceptChanges()
+
+                righterrors = False
+                CURR_DOCID = 0
+                ENTITY_ID = cmbentity.SelectedValue
+                countfiles = 0
+                Me.ProgressBar1.Visible = True
+                'BackgroundWorker erstellen ...
+                BW_RightsEntity = New BackgroundWorker
+                BW_RightsEntity.WorkerReportsProgress = True
+                BW_RightsEntity.WorkerSupportsCancellation = True
+                Dim listRecords As New ArrayList
+
+                If DD_Rights.ClassWDRights.Init(chklogging.Checked, ClassDatabase.ConnectionStringRM) = False Then
+                    MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
+                    Exit Sub
+                End If
+                For Each row As DataRow In DT_DATA.Rows
+                    If row.Item("Selection") = True Then
+                        Dim recid = row.Item("Record-ID")
+                        If Not IsNothing(recid) Then
+                            listRecords.Add(recid)
+                        End If
+                    End If
+                Next
+
+                For Each Record As String In listRecords
+                    Dim sqlfiles = String.Format("SELECT TRL.DOC_ID FROM TBPMO_DOC_RECORD_LINK TRL WHERE TRL.RECORD_ID = {0} ORDER BY TRL.DOC_ID", Record)
+                    DT_FILES = clsDatabase.Return_Datatable(sqlfiles)
+                    If DT_FILES.Rows.Count > 0 Then
+                        countfiles += DT_FILES.Rows.Count
+                    End If
+                Next
+
+                If countfiles = 0 Then
+                    MsgBox("No files were found! Please check docsearch!", MsgBoxStyle.Critical)
+                    Exit Sub
+                Else
+                    clsLogger.Add(String.Format(">> {0} files must be Checked!", countfiles), False)
+                End If
+                btncancel.Visible = True
+                lblstate.Visible = True
+                lblstate.Text = "Starting Background Worker...."
+                WorkingFiles = 0
+                ProgressBar1.Maximum = countfiles
+                AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork
+                '.. und starten
+                BW_RightsEntity.RunWorkerAsync()
+            Catch ex As Exception
+                MsgBox("Unexpected error in starting backgroundworker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                Me.ProgressBar1.Visible = False
+            End Try
+        End If
+    End Sub
+
+    Private Sub BW_RightsEntity_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BW_RightsEntity.ProgressChanged
+        Dim state = "Working on file '" & WorkingFiles.ToString & "' of '" & countfiles.ToString & "'"
+        lblstate.Text = state
+        Me.ProgressBar1.Value = e.ProgressPercentage
+    End Sub
+    Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs)
+        Dim worker As BackgroundWorker = CType(sender, BackgroundWorker)
+        _error = False
+        Dim i As Integer = 1
+        'Jede Datei einzeln verarbeiten
+        Dim listRecords As New ArrayList
+        For Each row As DataRow In DT_DATA.Rows
+            If row.Item("Selection") = True Then
+                Dim recid = row.Item("Record-ID")
+                If Not IsNothing(recid) Then
+                    listRecords.Add(recid)
+                End If
+            End If
+        Next
+
+        For Each Record As String In listRecords
+            Dim sqlfiles = String.Format("SELECT T.DocID,T.FULL_FILENAME FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK TRL where T.DocID = TRL.DOC_ID AND TRL.RECORD_ID = {0} ORDER BY DocID", Record)
+            DT_FILES = clsDatabase.Return_Datatable(sqlfiles)
+            If DT_FILES.Rows.Count > 0 Then
+                For Each row As DataRow In DT_FILES.Rows
+                    If BW_RightsEntity.CancellationPending = True Then
+                        MsgBox("Backgroundworker aborting - check log!", MsgBoxStyle.Critical)
+                        e.Cancel = True
+                        Exit For
+                    Else
+                        '###
+                        WorkingFiles += 1
+                        CURR_DOCID = row.Item("DocID")
+                        CURR_DOCPATH = row.Item("FULL_FILENAME")
+                        If DD_Rights.ClassWDRights.Doc_Renew_Rights(CURR_DOCID, CURR_DOCPATH, True) Then
+                            If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
+                                righterrors = True
+                            End If
+                        Else
+                            MsgBox("Unexpected Error in DD_Rights.ClassWDRights.Doc_Renew_Rights - Check the log!", MsgBoxStyle.Exclamation)
+                            If DD_Rights.ClassWDRights.MSG_RESULT <> "" Then
+                                MsgBox(DD_Rights.ClassWDRights.MSG_RESULT, MsgBoxStyle.Information)
+                            End If
+                            _error = True
+                        End If
+                        BW_RightsEntity.ReportProgress(i)
+                        i += 1
+                    End If
+                Next
+            End If
+        Next
+    End Sub
+
+    Private Sub btncancel_Click(sender As Object, e As EventArgs) Handles btncancel.Click
+        ' Cancel the asynchronous operation.
+        Me.BW_RightsEntity.CancelAsync()
+    End Sub
+    Private Sub BW_RightsEntity_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BW_RightsEntity.RunWorkerCompleted
+        Try
+            btncancel.Visible = False
+            lblstate.Visible = False
+            ProgressBar1.Visible = False
+            If _error = False Then
+                'clsDatabase.Execute_non_Query("UPDATE TBPMO_SERVICE_RIGHT_CONFIG SET RUN_SERVICE = 1 WHERE GUID = 1")
+                If righterrors = True Then
+                    MsgBox("All rights of files belonging to selected records were checked and refreshed, " & vbNewLine & "BUT some Userrights could not be set. Check the logfile!", MsgBoxStyle.Exclamation, "Attention")
+                Else
+                    MsgBox("All rights of files belonging to selected records were checked and refreshed!", MsgBoxStyle.Information)
+                End If
+            Else
+                MsgBox("Some errors occured while preparing and queuing rights...please check the log!", MsgBoxStyle.Exclamation)
+            End If
+        Catch ex As Exception
+
+        End Try
+    End Sub
+
+    Private Sub cmbentity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbentity.SelectedIndexChanged
+        Try
+            If _formloaded = False Then Exit Sub
+
+            If cmbentity.SelectedIndex <> -1 Then
+                ENTITY_ID = cmbentity.SelectedValue
+                Dim ViewName As String = "VWTEMP_PMO_FORM" & cmbentity.SelectedValue.ToString
+                Dim EntitySQL As String = "SELECT CONVERT(BIT,0) as Selection, T.* FROM " & ViewName & " T where [file count] > 0"
+                Me.Cursor = Cursors.WaitCursor
+                DT_DATA = clsDatabase.Return_Datatable(EntitySQL)
+                GridControlMain.DataSource = Nothing
+                If GridViewMain.Columns.Count > 0 Then
+                    GridViewMain.Columns.Clear()
+                End If
+                If Not IsNothing(DT_DATA) Then
+                    GridControlMain.DataSource = DT_DATA
+                    Dim checkboxEdit = New RepositoryItemCheckEdit()
+                    Dim dateEdit As New RepositoryItemTimeEdit()
+                    ' checkboxEdit vor-formatieren
+                    checkboxEdit.ValueChecked = True
+                    checkboxEdit.ValueUnchecked = False
+                    ' dateEdit vor-formatieren
+                    dateEdit.DisplayFormat.FormatType = FormatType.DateTime
+                    dateEdit.Mask.UseMaskAsDisplayFormat = True
+                    ' Editoren zum Grid hinzufügen
+                    GridViewMain.GridControl.RepositoryItems.AddRange({checkboxEdit, dateEdit})
+                End If
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        Finally
+            Me.Cursor = Cursors.Default
+        End Try
+
+
+
+
+    End Sub
+
+    Private Sub frmCheckRightsRecords_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        _formloaded = True
+    End Sub
+End Class
\ No newline at end of file
diff --git a/app/RecordOrganizer_RightManager/frmStart.Designer.vb b/app/RecordOrganizer_RightManager/frmStart.Designer.vb
index f5e01d8..6d0d7f4 100644
--- a/app/RecordOrganizer_RightManager/frmStart.Designer.vb
+++ b/app/RecordOrganizer_RightManager/frmStart.Designer.vb
@@ -25,10 +25,11 @@ Partial Class frmStart
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart))
         Me.Button1 = New System.Windows.Forms.Button()
         Me.btnWorkUserRights = New System.Windows.Forms.Button()
-        Me.btnWorkUserRightsSV_ADD = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
+        Me.btnCheckRenewRecordRights = New System.Windows.Forms.Button()
+        Me.btnCheckRenewUserRights = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.chkLogerrorsonly = New System.Windows.Forms.CheckBox()
         Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
@@ -48,7 +49,6 @@ Partial Class frmStart
         Me.Label1 = New System.Windows.Forms.Label()
         Me.VWPMO_RIGHTS_2B_WORKEDTableAdapter = New RecordOrganizer_RightManager.MyDatasetTableAdapters.VWPMO_RIGHTS_2B_WORKEDTableAdapter()
         Me.TableAdapterManager = New RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager()
-        Me.btnCheckRenewUserRights = New System.Windows.Forms.Button()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
         Me.XtraTabPage1.SuspendLayout()
@@ -67,31 +67,20 @@ Partial Class frmStart
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(312, 45)
         Me.Button1.TabIndex = 0
-        Me.Button1.Text = "Check Rights for documents belonging to entity"
+        Me.Button1.Text = "Check Rights for all documents " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "belonging to entity"
         Me.Button1.UseVisualStyleBackColor = True
         '
         'btnWorkUserRights
         '
         Me.btnWorkUserRights.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnWorkUserRights.ForeColor = System.Drawing.Color.DarkRed
-        Me.btnWorkUserRights.Location = New System.Drawing.Point(3, 114)
+        Me.btnWorkUserRights.Location = New System.Drawing.Point(-1, 158)
         Me.btnWorkUserRights.Name = "btnWorkUserRights"
         Me.btnWorkUserRights.Size = New System.Drawing.Size(312, 45)
         Me.btnWorkUserRights.TabIndex = 2
         Me.btnWorkUserRights.Text = "Work User"
         Me.btnWorkUserRights.UseVisualStyleBackColor = True
         '
-        'btnWorkUserRightsSV_ADD
-        '
-        Me.btnWorkUserRightsSV_ADD.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnWorkUserRightsSV_ADD.ForeColor = System.Drawing.Color.DarkRed
-        Me.btnWorkUserRightsSV_ADD.Location = New System.Drawing.Point(0, 164)
-        Me.btnWorkUserRightsSV_ADD.Name = "btnWorkUserRightsSV_ADD"
-        Me.btnWorkUserRightsSV_ADD.Size = New System.Drawing.Size(312, 45)
-        Me.btnWorkUserRightsSV_ADD.TabIndex = 3
-        Me.btnWorkUserRightsSV_ADD.Text = "Work User"
-        Me.btnWorkUserRightsSV_ADD.UseVisualStyleBackColor = True
-        '
         'Button2
         '
         Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -117,16 +106,36 @@ Partial Class frmStart
         '
         'XtraTabPage1
         '
+        Me.XtraTabPage1.Controls.Add(Me.btnCheckRenewRecordRights)
         Me.XtraTabPage1.Controls.Add(Me.btnCheckRenewUserRights)
         Me.XtraTabPage1.Controls.Add(Me.GroupBox1)
         Me.XtraTabPage1.Controls.Add(Me.Button1)
         Me.XtraTabPage1.Controls.Add(Me.Button2)
-        Me.XtraTabPage1.Controls.Add(Me.btnWorkUserRightsSV_ADD)
         Me.XtraTabPage1.Controls.Add(Me.btnWorkUserRights)
         Me.XtraTabPage1.Name = "XtraTabPage1"
         Me.XtraTabPage1.Size = New System.Drawing.Size(825, 222)
         Me.XtraTabPage1.Text = "Jobs and Tools"
         '
+        'btnCheckRenewRecordRights
+        '
+        Me.btnCheckRenewRecordRights.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCheckRenewRecordRights.Location = New System.Drawing.Point(3, 114)
+        Me.btnCheckRenewRecordRights.Name = "btnCheckRenewRecordRights"
+        Me.btnCheckRenewRecordRights.Size = New System.Drawing.Size(312, 45)
+        Me.btnCheckRenewRecordRights.TabIndex = 8
+        Me.btnCheckRenewRecordRights.Text = "Check or Renew Rights for explicit records"
+        Me.btnCheckRenewRecordRights.UseVisualStyleBackColor = True
+        '
+        'btnCheckRenewUserRights
+        '
+        Me.btnCheckRenewUserRights.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCheckRenewUserRights.Location = New System.Drawing.Point(3, 63)
+        Me.btnCheckRenewUserRights.Name = "btnCheckRenewUserRights"
+        Me.btnCheckRenewUserRights.Size = New System.Drawing.Size(312, 45)
+        Me.btnCheckRenewUserRights.TabIndex = 7
+        Me.btnCheckRenewUserRights.Text = "Check or Renew Rights for Users"
+        Me.btnCheckRenewUserRights.UseVisualStyleBackColor = True
+        '
         'GroupBox1
         '
         Me.GroupBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -155,7 +164,7 @@ Partial Class frmStart
         Me.XtraTabPage2.Controls.Add(Me.GridControl1)
         Me.XtraTabPage2.Controls.Add(Me.Label1)
         Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(825, 307)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(825, 222)
         Me.XtraTabPage2.Text = "Rights 2b worked"
         '
         'btnrefreshJobs
@@ -303,16 +312,6 @@ Partial Class frmStart
         Me.TableAdapterManager.Connection = Nothing
         Me.TableAdapterManager.UpdateOrder = RecordOrganizer_RightManager.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
-        'btnCheckRenewUserRights
-        '
-        Me.btnCheckRenewUserRights.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnCheckRenewUserRights.Location = New System.Drawing.Point(3, 63)
-        Me.btnCheckRenewUserRights.Name = "btnCheckRenewUserRights"
-        Me.btnCheckRenewUserRights.Size = New System.Drawing.Size(312, 45)
-        Me.btnCheckRenewUserRights.TabIndex = 7
-        Me.btnCheckRenewUserRights.Text = "Check or Renew Rights for Users"
-        Me.btnCheckRenewUserRights.UseVisualStyleBackColor = True
-        '
         'frmStart
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -341,7 +340,6 @@ Partial Class frmStart
     Friend WithEvents Button1 As System.Windows.Forms.Button
     Friend WithEvents Button2 As System.Windows.Forms.Button
     Friend WithEvents btnWorkUserRights As System.Windows.Forms.Button
-    Friend WithEvents btnWorkUserRightsSV_ADD As System.Windows.Forms.Button
     Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
     Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
@@ -364,5 +362,6 @@ Partial Class frmStart
     Friend WithEvents chkLogerrorsonly As System.Windows.Forms.CheckBox
     Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
     Friend WithEvents btnCheckRenewUserRights As System.Windows.Forms.Button
+    Friend WithEvents btnCheckRenewRecordRights As System.Windows.Forms.Button
 
 End Class
diff --git a/app/RecordOrganizer_RightManager/frmStart.vb b/app/RecordOrganizer_RightManager/frmStart.vb
index 6d147a3..58079ca 100644
--- a/app/RecordOrganizer_RightManager/frmStart.vb
+++ b/app/RecordOrganizer_RightManager/frmStart.vb
@@ -1,7 +1,6 @@
 Imports DD_Rights
 Public Class frmStart
     Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles Me.Load
-       
         Try
             DD_Rights.clsLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName)
             If DD_Rights.clsDatabase.Init(My.Settings.MyConnectionString) = False Then
@@ -22,7 +21,7 @@ Public Class frmStart
 
 
             If USER_DT.Rows.Count = 0 Then
-                clsLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradminsitration!", False)
+                clsLogger.Add(" - User '" & Environment.UserName & "' not listed in Useradministration!", False)
                 'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                 'Me.Close()
                 Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
@@ -89,13 +88,13 @@ Public Class frmStart
         Else
             btnWorkUserRights.Visible = False
         End If
-        DT_WORK_USER_CONTROL_SUPERVISOR = clsDatabase.Return_Datatable(SQL_USER_RIGHTS_SUPERVISOR_ADDED)
-        If DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count > 0 And (Environment.UserName.ToLower = "windream" Or Environment.UserName.ToLower = "schreiberm") Then
-            btnWorkUserRightsSV_ADD.Text = "New Supervisor for Record/Entity added." & vbNewLine & "Amount: " & DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count.ToString
-            btnWorkUserRightsSV_ADD.Visible = True
-        Else
-            btnWorkUserRightsSV_ADD.Visible = False
-        End If
+        'DT_WORK_USER_CONTROL_SUPERVISOR = clsDatabase.Return_Datatable(SQL_USER_RIGHTS_SUPERVISOR_ADDED)
+        'If DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count > 0 And (Environment.UserName.ToLower = "windream" Or Environment.UserName.ToLower = "schreiberm") Then
+        '    btnWorkUserRightsSV_ADD.Text = "New Supervisor for Record/Entity added." & vbNewLine & "Amount: " & DT_WORK_USER_CONTROL_SUPERVISOR.Rows.Count.ToString
+        '    btnWorkUserRightsSV_ADD.Visible = True
+        'Else
+        '    btnWorkUserRightsSV_ADD.Visible = False
+        'End If
     End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         ' Me.Visible = False
@@ -112,7 +111,7 @@ Public Class frmStart
         Check_USER_REWORK()
     End Sub
 
-    Private Sub btnWorkUserRightsSV_ADD_Click(sender As Object, e As EventArgs) Handles btnWorkUserRightsSV_ADD.Click
+    Private Sub btnWorkUserRightsSV_ADD_Click(sender As Object, e As EventArgs)
         frmSupervisorEntity.ShowDialog()
         Check_USER_REWORK()
     End Sub
@@ -159,4 +158,8 @@ Public Class frmStart
     Private Sub btnCheckRenewUserRights_Click(sender As Object, e As EventArgs) Handles btnCheckRenewUserRights.Click
         frmUsersReworkRights.ShowDialog()
     End Sub
+
+    Private Sub btnCheckRenewRecordRights_Click(sender As Object, e As EventArgs) Handles btnCheckRenewRecordRights.Click
+        frmCheckRightsRecords.ShowDialog()
+    End Sub
 End Class
diff --git a/app/VERSION_CHECKER/ModuleMySettings.vb b/app/VERSION_CHECKER/ModuleMySettings.vb
index afa1cab..0176995 100644
--- a/app/VERSION_CHECKER/ModuleMySettings.vb
+++ b/app/VERSION_CHECKER/ModuleMySettings.vb
@@ -12,8 +12,8 @@ Module ModuleMySettings
 
     Public MyConnectionString As String = ""
     Public MyServer_UpdatePath As String = ""
-    Public VERSION_SERVER
-    Public VERSION_USER
+    Public VERSION_SERVER = "1.0.0.0"
+    Public VERSION_USER = "1.0.0.0"
     Public FORCE_UPDATE As Boolean = False
     Public VERSIONS_FOR_FORCE_UPDATE As String = ""
     Public FOLDER_TEMP As String
diff --git a/app/VERSION_CHECKER/frmVersionCheck.Designer.vb b/app/VERSION_CHECKER/frmVersionCheck.Designer.vb
index db96a31..c6ea4a5 100644
--- a/app/VERSION_CHECKER/frmVersionCheck.Designer.vb
+++ b/app/VERSION_CHECKER/frmVersionCheck.Designer.vb
@@ -35,9 +35,9 @@ Partial Class frmVersionCheck
         '
         Me.lblStatus.AutoSize = True
         Me.lblStatus.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblStatus.ForeColor = System.Drawing.SystemColors.Info
+        Me.lblStatus.ForeColor = System.Drawing.SystemColors.ControlText
         Me.lblStatus.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblStatus.Location = New System.Drawing.Point(213, 94)
+        Me.lblStatus.Location = New System.Drawing.Point(213, 70)
         Me.lblStatus.Name = "lblStatus"
         Me.lblStatus.Size = New System.Drawing.Size(173, 15)
         Me.lblStatus.TabIndex = 3
@@ -47,18 +47,18 @@ Partial Class frmVersionCheck
         'pbStatus
         '
         Me.pbStatus.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.pbStatus.Location = New System.Drawing.Point(216, 112)
+        Me.pbStatus.Location = New System.Drawing.Point(216, 88)
         Me.pbStatus.Name = "pbStatus"
-        Me.pbStatus.Size = New System.Drawing.Size(320, 23)
+        Me.pbStatus.Size = New System.Drawing.Size(253, 23)
         Me.pbStatus.TabIndex = 2
         '
         'Label1
         '
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.ForeColor = System.Drawing.SystemColors.Info
+        Me.Label1.ForeColor = System.Drawing.SystemColors.ControlText
         Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label1.Location = New System.Drawing.Point(23, 12)
+        Me.Label1.Location = New System.Drawing.Point(212, 12)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(208, 21)
         Me.Label1.TabIndex = 6
@@ -70,7 +70,7 @@ Partial Class frmVersionCheck
         Me.PictureBox2.BackColor = System.Drawing.Color.Transparent
         Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image)
         Me.PictureBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.PictureBox2.Location = New System.Drawing.Point(27, 36)
+        Me.PictureBox2.Location = New System.Drawing.Point(12, 12)
         Me.PictureBox2.Name = "PictureBox2"
         Me.PictureBox2.Size = New System.Drawing.Size(183, 185)
         Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -82,8 +82,8 @@ Partial Class frmVersionCheck
         Me.Label2.AutoSize = True
         Me.Label2.BackColor = System.Drawing.Color.Transparent
         Me.Label2.Font = New System.Drawing.Font("Impact", 26.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.ForeColor = System.Drawing.Color.Yellow
-        Me.Label2.Location = New System.Drawing.Point(97, 153)
+        Me.Label2.ForeColor = System.Drawing.Color.DarkMagenta
+        Me.Label2.Location = New System.Drawing.Point(95, 128)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(134, 43)
         Me.Label2.TabIndex = 7
@@ -93,8 +93,8 @@ Partial Class frmVersionCheck
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.Color.DodgerBlue
-        Me.ClientSize = New System.Drawing.Size(551, 229)
+        Me.BackColor = System.Drawing.Color.LightSteelBlue
+        Me.ClientSize = New System.Drawing.Size(481, 207)
         Me.ControlBox = False
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.PictureBox2)