ValidationController: Korrekturen

ValidationController: BulkInsert, XML-Schema etc für die Datenbank mitnehmen. Korrekturen
ZUGFeRdRESTService - Validation Controller: REFERENCES_Rejection-Messages auswerten und als WebMessage ausgeben
2026-02-04 15:09:46 +01:00 · 2026-02-04 14:13:11 +01:00 · 2026-02-02 14:40:55 +01:00 · 2025-12-23 13:02:31 +01:00 · 2025-12-23 13:02:14 +01:00 · 2025-12-23 13:01:06 +01:00
1033 changed files with 11404 additions and 83507 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -258,4 +258,13 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
 /GUIs.Test.ZUGFeRDTest/Form1.vb
 /GUIs.Test.ZUGFeRDTest/Form1.resx
 /GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
 /GUIs.Test.ZUGFeRDTest/Form1.vb
 /GUIs.Test.ZUGFeRDTest/Form1.resx
 /GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
 /GUIs.Test.ZUGFeRDTest/Form1.vb
 /GUIs.Test.ZUGFeRDTest/Form1.resx
 /GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
--- a/Automation/App.config
+++ b/Automation/App.config
@@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
    </startup>
 </configuration>
--- a/Automation/Automation.vbproj
+++ b/Automation/Automation.vbproj
@@ -1,139 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}</ProjectGuid>
    <OutputType>WinExe</OutputType>
    <StartupObject>Automation.My.MyApplication</StartupObject>
    <RootNamespace>Automation</RootNamespace>
    <AssemblyName>Automation</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>Automation.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>Automation.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <OptionExplicit>On</OptionExplicit>
  </PropertyGroup>
  <PropertyGroup>
    <OptionCompare>Binary</OptionCompare>
  </PropertyGroup>
  <PropertyGroup>
    <OptionStrict>Off</OptionStrict>
  </PropertyGroup>
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="GdPicture.NET.14">
      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c" />
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.Deployment" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Net.Http" />
    <Reference Include="UIAutomationClient" />
    <Reference Include="UIAutomationTypes" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
    <Import Include="System.Collections" />
    <Import Include="System.Collections.Generic" />
    <Import Include="System.Data" />
    <Import Include="System.Drawing" />
    <Import Include="System.Diagnostics" />
    <Import Include="System.Windows.Forms" />
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ClassClipboard.vb" />
    <Compile Include="Form1.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Form1.Designer.vb">
      <DependentUpon>Form1.vb</DependentUpon>
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Form1.resx">
      <DependentUpon>Form1.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
    <ProjectReference Include="..\Windows\Windows.vbproj">
      <Project>{5efaef9b-90b9-4f05-9f70-f79ad77fff86}</Project>
      <Name>Windows</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Automation/ClassClipboard.vb
+++ b/Automation/ClassClipboard.vb
@@ -1,68 +0,0 @@
 Imports System.Runtime.InteropServices
 Public Class ClassClipboardWatcher
    Inherits NativeWindow
    Implements IDisposable
    Private Class Win32
        <DllImport("user32", EntryPoint:="SetClipboardViewer")>
        Public Shared Function SetClipboardViewer(ByVal hWnd As IntPtr) As IntPtr
        End Function
    End Class
    Const WM_DRAWCLIPBOARD As Integer = &H308
    Public Event ClipboardChanged As EventHandler(Of IDataObject)
    Public Shared Singleton As New ClassClipboardWatcher
    Private _handle As IntPtr
    Private Sub New()
        MyBase.CreateHandle(New CreateParams)
        _handle = Win32.SetClipboardViewer(Handle)
    End Sub
    Protected Overrides Sub WndProc(ByRef m As Message)
        Select Case m.Msg
            Case WM_DRAWCLIPBOARD
                Dim oData As IDataObject = Clipboard.GetDataObject
                RaiseEvent ClipboardChanged(Me, oData)
        End Select
        MyBase.WndProc(m)
    End Sub
 #Region "IDisposable Support"
    ' Für diese Klasse ist korrekte Ressourcenbereinigung besonders wichtig, da 
    ' mit systemübergreifenden Ressourcen gearbeitet wird
    ' So ermitteln Sie überflüssige Aufrufe
    Private disposedValue As Boolean = False
    Protected Overridable Sub Dispose(ByVal disposing As Boolean)
        If Not disposedValue Then
            If disposing Then
                ' TODO: Verwaltete Ressourcen freigeben, wenn sie explizit 
                ' aufgerufen werden
            End If
            MyBase.DestroyHandle()
            Dim H As IntPtr = Win32.SetClipboardViewer(_handle)
        End If
        disposedValue = True
    End Sub
    ' Dieser Code wird von Visual Basic hinzugefügt, um das Dispose-Muster 
    ' richtig zu implementieren.
    Public Sub Dispose() Implements IDisposable.Dispose
        ' Sie sollten diesen Code nicht ändern, sondern stattdessen ihren
        ' Bereinigungscode oben in 
        ' Dispose(ByVal disposing As Boolean) einfügen.
        Dispose(True)
        GC.SuppressFinalize(Me)
    End Sub
    Protected Overrides Sub Finalize()
        MyBase.Finalize()
        Dispose(False)
    End Sub
 #End Region
 End Class
--- a/Automation/Form1.Designer.vb
+++ b/Automation/Form1.Designer.vb
@@ -1,235 +0,0 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class Form1
    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.components = New System.ComponentModel.Container()
        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
        Me.TextBox1 = New System.Windows.Forms.TextBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.TextBox9 = New System.Windows.Forms.TextBox()
        Me.TextBox10 = New System.Windows.Forms.TextBox()
        Me.TextBox11 = New System.Windows.Forms.TextBox()
        Me.TextBox12 = New System.Windows.Forms.TextBox()
        Me.Label21 = New System.Windows.Forms.Label()
        Me.TextBox6 = New System.Windows.Forms.TextBox()
        Me.TextBox7 = New System.Windows.Forms.TextBox()
        Me.TextBox8 = New System.Windows.Forms.TextBox()
        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.TextBox3 = New System.Windows.Forms.TextBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.SuspendLayout()
        '
        'TextBox1
        '
        Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
        Me.TextBox1.Location = New System.Drawing.Point(12, 12)
        Me.TextBox1.Name = "TextBox1"
        Me.TextBox1.Size = New System.Drawing.Size(100, 20)
        Me.TextBox1.TabIndex = 0
        Me.TextBox1.Text = "Top Left"
        '
        'Label4
        '
        Me.Label4.AutoSize = True
        Me.Label4.Location = New System.Drawing.Point(183, 105)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(25, 13)
        Me.Label4.TabIndex = 6
        Me.Label4.Text = "Left"
        '
        'Label5
        '
        Me.Label5.AutoSize = True
        Me.Label5.Location = New System.Drawing.Point(183, 183)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(40, 13)
        Me.Label5.TabIndex = 6
        Me.Label5.Text = "Bottom"
        '
        'Label6
        '
        Me.Label6.AutoSize = True
        Me.Label6.Location = New System.Drawing.Point(183, 157)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(26, 13)
        Me.Label6.TabIndex = 6
        Me.Label6.Text = "Top"
        '
        'Label7
        '
        Me.Label7.AutoSize = True
        Me.Label7.Location = New System.Drawing.Point(183, 131)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(32, 13)
        Me.Label7.TabIndex = 6
        Me.Label7.Text = "Right"
        '
        'TextBox9
        '
        Me.TextBox9.Location = New System.Drawing.Point(231, 102)
        Me.TextBox9.Name = "TextBox9"
        Me.TextBox9.Size = New System.Drawing.Size(100, 20)
        Me.TextBox9.TabIndex = 1
        '
        'TextBox10
        '
        Me.TextBox10.Location = New System.Drawing.Point(231, 180)
        Me.TextBox10.Name = "TextBox10"
        Me.TextBox10.Size = New System.Drawing.Size(100, 20)
        Me.TextBox10.TabIndex = 2
        '
        'TextBox11
        '
        Me.TextBox11.Location = New System.Drawing.Point(231, 154)
        Me.TextBox11.Name = "TextBox11"
        Me.TextBox11.Size = New System.Drawing.Size(100, 20)
        Me.TextBox11.TabIndex = 3
        '
        'TextBox12
        '
        Me.TextBox12.Location = New System.Drawing.Point(231, 128)
        Me.TextBox12.Name = "TextBox12"
        Me.TextBox12.Size = New System.Drawing.Size(100, 20)
        Me.TextBox12.TabIndex = 4
        '
        'Label21
        '
        Me.Label21.AutoSize = True
        Me.Label21.Location = New System.Drawing.Point(183, 77)
        Me.Label21.Name = "Label21"
        Me.Label21.Size = New System.Drawing.Size(115, 13)
        Me.Label21.TabIndex = 8
        Me.Label21.Text = "CURRENT CONTROL"
        '
        'TextBox6
        '
        Me.TextBox6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.TextBox6.Location = New System.Drawing.Point(12, 298)
        Me.TextBox6.Name = "TextBox6"
        Me.TextBox6.Size = New System.Drawing.Size(100, 20)
        Me.TextBox6.TabIndex = 0
        Me.TextBox6.Text = "Bottom Left"
        '
        'TextBox7
        '
        Me.TextBox7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.TextBox7.Location = New System.Drawing.Point(255, 12)
        Me.TextBox7.Name = "TextBox7"
        Me.TextBox7.Size = New System.Drawing.Size(100, 20)
        Me.TextBox7.TabIndex = 0
        Me.TextBox7.Text = "TopRight"
        '
        'TextBox8
        '
        Me.TextBox8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.TextBox8.Location = New System.Drawing.Point(255, 298)
        Me.TextBox8.Name = "TextBox8"
        Me.TextBox8.Size = New System.Drawing.Size(100, 20)
        Me.TextBox8.TabIndex = 0
        Me.TextBox8.Text = "BottomRight"
        '
        'ComboBox1
        '
        Me.ComboBox1.FormattingEnabled = True
        Me.ComboBox1.Items.AddRange(New Object() {"TopLeft", "TopRight", "BottomLeft", "BottomRight"})
        Me.ComboBox1.Location = New System.Drawing.Point(30, 102)
        Me.ComboBox1.Name = "ComboBox1"
        Me.ComboBox1.Size = New System.Drawing.Size(121, 21)
        Me.ComboBox1.TabIndex = 9
        '
        'Label1
        '
        Me.Label1.AutoSize = True
        Me.Label1.Location = New System.Drawing.Point(27, 86)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(41, 13)
        Me.Label1.TabIndex = 8
        Me.Label1.Text = "Anchor"
        '
        'TextBox3
        '
        Me.TextBox3.Location = New System.Drawing.Point(231, 206)
        Me.TextBox3.Name = "TextBox3"
        Me.TextBox3.Size = New System.Drawing.Size(100, 20)
        Me.TextBox3.TabIndex = 2
        '
        'Label3
        '
        Me.Label3.AutoSize = True
        Me.Label3.Location = New System.Drawing.Point(183, 209)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(41, 13)
        Me.Label3.TabIndex = 6
        Me.Label3.Text = "Anchor"
        '
        'Form1
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(367, 330)
        Me.Controls.Add(Me.ComboBox1)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.Label21)
        Me.Controls.Add(Me.Label7)
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.TextBox12)
        Me.Controls.Add(Me.TextBox3)
        Me.Controls.Add(Me.TextBox11)
        Me.Controls.Add(Me.TextBox10)
        Me.Controls.Add(Me.TextBox9)
        Me.Controls.Add(Me.TextBox6)
        Me.Controls.Add(Me.TextBox8)
        Me.Controls.Add(Me.TextBox7)
        Me.Controls.Add(Me.TextBox1)
        Me.Name = "Form1"
        Me.Text = "Form1"
        Me.ResumeLayout(False)
        Me.PerformLayout()
    End Sub
    Friend WithEvents Timer1 As Timer
    Friend WithEvents TextBox1 As TextBox
    Friend WithEvents Label4 As Label
    Friend WithEvents Label5 As Label
    Friend WithEvents Label6 As Label
    Friend WithEvents Label7 As Label
    Friend WithEvents TextBox9 As TextBox
    Friend WithEvents TextBox10 As TextBox
    Friend WithEvents TextBox11 As TextBox
    Friend WithEvents TextBox12 As TextBox
    Friend WithEvents Label21 As Label
    Friend WithEvents TextBox6 As TextBox
    Friend WithEvents TextBox7 As TextBox
    Friend WithEvents TextBox8 As TextBox
    Friend WithEvents ComboBox1 As ComboBox
    Friend WithEvents Label1 As Label
    Friend WithEvents TextBox3 As TextBox
    Friend WithEvents Label3 As Label
 End Class
--- a/Automation/Form1.resx
+++ b/Automation/Form1.resx
@@ -1,123 +0,0 @@
 <?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="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
 </root>
--- a/Automation/Form1.vb
+++ b/Automation/Form1.vb
@@ -1,48 +0,0 @@
 Imports System.Runtime.InteropServices
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Windows
 Public Class Form1
    Private Logger As Logger
    Private LogConfig As LogConfig
    Private Watcher As ClassClipboardWatcher
    Private Window As Window
    Private CurrentAnchor As Window.Anchor = Window.Anchor.TopLeft
    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Timer1.Interval = 1000
        Timer1.Enabled = True
        LogConfig = New LogConfig(LogConfig.PathType.AppData)
        Logger = LogConfig.GetLogger()
        Window = New Window(LogConfig)
        Watcher = ClassClipboardWatcher.Singleton
        AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
    End Sub
    Private Sub Watcher_ClipboardChanged(sender As Object, e As IDataObject)
        Dim oControl As Window.RectangleInfo = Window.GetFocusedControlLocation(Handle, CurrentAnchor)
        TextBox9.Text = oControl.Left
        TextBox12.Text = oControl.Right
        TextBox11.Text = oControl.Top
        TextBox10.Text = oControl.Bottom
        TextBox3.Text = ComboBox1.Text.ToUpper
    End Sub
    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
        Select Case ComboBox1.Text
            Case "TopLeft"
                CurrentAnchor = Window.Anchor.TopLeft
            Case "TopRight"
                CurrentAnchor = Window.Anchor.TopRight
            Case "BottomLeft"
                CurrentAnchor = Window.Anchor.BottomLeft
            Case "BottomRight"
                CurrentAnchor = Window.Anchor.BottomRight
        End Select
    End Sub
 End Class
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -1,38 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Namespace My
    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
    ' or if you encounter build errors in this file, go to the Project Designer
    ' (go to Project Properties or double-click the My Project node in
    ' Solution Explorer), and make changes on the Application tab.
    '
    Partial Friend Class MyApplication
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
        Public Sub New()
            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
            Me.IsSingleInstance = false
            Me.EnableVisualStyles = true
            Me.SaveMySettingsOnExit = true
            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
        End Sub
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
        Protected Overrides Sub OnCreateMainForm()
            Me.MainForm = Global.Automation.Form1
        End Sub
    End Class
 End Namespace
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,35 +0,0 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 ' Allgemeine Informationen über eine Assembly werden über die folgenden
 ' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 ' die einer Assembly zugeordnet sind.
 ' Werte der Assemblyattribute überprüfen
 <Assembly: AssemblyTitle("Automation")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Automation")>
 <Assembly: AssemblyCopyright("Copyright ©  2019")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(False)>
 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("16c2bbbe-7473-425e-96db-3029055c432d")>
 ' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
 '
 '      Hauptversion
 '      Nebenversion
 '      Buildnummer
 '      Revision
 '
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 <Assembly: AssemblyVersion("1.0.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1,62 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Namespace My.Resources
    'This class was auto-generated by the StronglyTypedResourceBuilder
    'class via a tool like ResGen or Visual Studio.
    'To add or remove a member, edit your .ResX file then rerun ResGen
    'with the /str option, or rebuild your VS project.
    '''<summary>
    '''  A strongly-typed resource class, for looking up localized strings, etc.
    '''</summary>
    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
    Friend Module Resources
        Private resourceMan As Global.System.Resources.ResourceManager
        Private resourceCulture As Global.System.Globalization.CultureInfo
        '''<summary>
        '''  Returns the cached ResourceManager instance used by this class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Automation.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
            End Get
        End Property
        '''<summary>
        '''  Overrides the current thread's CurrentUICulture property for all
        '''  resource lookups using this strongly typed resource class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Friend Property Culture() As Global.System.Globalization.CultureInfo
            Get
                Return resourceCulture
            End Get
            Set(ByVal value As Global.System.Globalization.CultureInfo)
                resourceCulture = value
            End Set
        End Property
    End Module
 End Namespace
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -1,73 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
        Private Shared addedHandler As Boolean
        Private Shared addedHandlerLockObject As New Object
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
            If My.Application.SaveMySettingsOnExit Then
                My.Settings.Save()
            End If
        End Sub
 #End If
 #End Region
        Public Shared ReadOnly Property [Default]() As MySettings
            Get
 #If _MyType = "WindowsForms" Then
                   If Not addedHandler Then
                        SyncLock addedHandlerLockObject
                            If Not addedHandler Then
                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
                                addedHandler = True
                            End If
                        End SyncLock
                    End If
 #End If
                Return defaultInstance
            End Get
        End Property
    End Class
 End Namespace
 Namespace My
    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
    Friend Module MySettingsProperty
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
        Friend ReadOnly Property Settings() As Global.Automation.My.MySettings
            Get
                Return Global.Automation.My.MySettings.Default
            End Get
        End Property
    End Module
 End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -1,7 +0,0 @@
 <?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
  <Profiles>
    <Profile Name="(Default)" />
  </Profiles>
  <Settings />
 </SettingsFile>
--- a/ConfigCreator/App.config
+++ b/ConfigCreator/App.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <configSections>
    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
-      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    </sectionGroup>
  </configSections>
  <applicationSettings>
@@ -41,19 +41,19 @@
        <value></value>
      </setting>
      <setting name="CustomPaletteCollection" serializeAs="Xml">
-        <value />
+        <value/>
      </setting>
    </DevExpress.LookAndFeel.Design.AppSettings>
  </applicationSettings>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
  </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+</configuration>
--- a/ConfigCreator/MonoRepoUtils.vbproj
+++ b/ConfigCreator/MonoRepoUtils.vbproj
@@ -11,9 +11,10 @@
    <AssemblyName>DigitalData.GUIs.MonoRepoUtils</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +64,18 @@
    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Data" />
@@ -138,24 +151,6 @@
    </None>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Config\Config.vbproj">
      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
      <Name>Config</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Interfaces\Interfaces.vbproj">
      <Project>{ab6f09bf-e794-4f6a-94bb-c97c0ba84d64}</Project>
      <Name>Interfaces</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
      <Name>DDZUGFeRDService</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\defaultprinter.svg" />
  </ItemGroup>
@@ -166,5 +161,11 @@
    <Content Include="mail.ico" />
    <None Include="Resources\save as.svg" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
      <Name>DDZUGFeRDService</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Controls.ChatAddUser/ChatAddUser.vbproj
+++ b/Controls.ChatAddUser/ChatAddUser.vbproj
@@ -10,7 +10,7 @@
    <AssemblyName>DigitalData.Controls.ChatAddUser</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -59,9 +59,17 @@
    <Reference Include="DigitalData.Controls.LookupGrid">
      <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
@@ -100,6 +108,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="ChatAddUser.vb">
      <SubType>UserControl</SubType>
@@ -146,16 +155,6 @@
  <ItemGroup>
    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Database\Database.vbproj">
      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
      <Name>Database</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
    <None Include="Resources\crop.php.jpeg" />
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 <Assembly: ComVisible(False)>
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -13,17 +13,17 @@ Option Explicit On
 Namespace My
-    
+
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
+
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
-        
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
    Private Shared addedHandler As Boolean
    Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
    End Sub
 #End If
 #End Region
-        
+
        Public Shared ReadOnly Property [Default]() As MySettings
            Get
-                
+
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
               If Not addedHandler Then
                    SyncLock addedHandlerLockObject
                        If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 Namespace My
-    
+
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
    Friend Module MySettingsProperty
-        
+
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
        Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatAddUser.My.MySettings
            Get
                Return Global.DigitalData.Controls.ChatAddUser.My.MySettings.Default
--- a/Controls.ChatAddUser/My
+++ b/Controls.ChatAddUser/My
@@ -0,0 +1 @@
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/Controls.ChatAddUser/app.config
+++ b/Controls.ChatAddUser/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
--- a/Controls.ChatAddUser/packages.config
+++ b/Controls.ChatAddUser/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>
--- a/Controls.ChatControl/ChatControl.vbproj
+++ b/Controls.ChatControl/ChatControl.vbproj
@@ -10,7 +10,7 @@
    <AssemblyName>DigitalData.Controls.ChatControl</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -59,9 +59,17 @@
    <Reference Include="DigitalData.Controls.LookupGrid">
      <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
@@ -100,6 +108,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="ChatControl.vb">
      <SubType>UserControl</SubType>
@@ -122,6 +131,7 @@
  <ItemGroup>
    <EmbeddedResource Include="ChatControl.resx">
      <DependentUpon>ChatControl.vb</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\licenses.licx" />
    <EmbeddedResource Include="My Project\Resources.resx">
@@ -146,20 +156,6 @@
  <ItemGroup>
    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Controls.ChatAddUser\ChatAddUser.vbproj">
      <Project>{f0a807cc-be14-4b5b-9200-27c16156bd8a}</Project>
      <Name>ChatAddUser</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Database\Database.vbproj">
      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
      <Name>Database</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
    <None Include="Resources\crop.php.jpeg" />
@@ -182,5 +178,11 @@
  <ItemGroup>
    <None Include="Resources\action_add_16xLG.png" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Controls.ChatAddUser\ChatAddUser.vbproj">
      <Project>{f0a807cc-be14-4b5b-9200-27c16156bd8a}</Project>
      <Name>ChatAddUser</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 <Assembly: ComVisible(False)>
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -13,17 +13,17 @@ Option Explicit On
 Namespace My
-    
+
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
+
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
-        
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
    Private Shared addedHandler As Boolean
    Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
    End Sub
 #End If
 #End Region
-        
+
        Public Shared ReadOnly Property [Default]() As MySettings
            Get
-                
+
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
               If Not addedHandler Then
                    SyncLock addedHandlerLockObject
                        If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 Namespace My
-    
+
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
    Friend Module MySettingsProperty
-        
+
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
        Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatControl.My.MySettings
            Get
                Return Global.DigitalData.Controls.ChatControl.My.MySettings.Default
--- a/Controls.ChatControl/app.config
+++ b/Controls.ChatControl/app.config
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
--- a/Controls.ChatControl/packages.config
+++ b/Controls.ChatControl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>
--- a/Controls.ChatNewConv/ChatNewConv.vbproj
+++ b/Controls.ChatNewConv/ChatNewConv.vbproj
@@ -10,7 +10,7 @@
    <AssemblyName>DigitalData.Controls.ChatNewConv</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -59,9 +59,17 @@
    <Reference Include="DigitalData.Controls.LookupGrid">
      <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
@@ -100,6 +108,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="ChatNewConv.vb">
      <SubType>UserControl</SubType>
@@ -146,16 +155,6 @@
  <ItemGroup>
    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Database\Database.vbproj">
      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
      <Name>Database</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
    <None Include="Resources\crop.php.jpeg" />
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 <Assembly: ComVisible(False)>
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -13,17 +13,17 @@ Option Explicit On
 Namespace My
-    
+
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
+
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
-        
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
    Private Shared addedHandler As Boolean
    Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
    End Sub
 #End If
 #End Region
-        
+
        Public Shared ReadOnly Property [Default]() As MySettings
            Get
-                
+
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
               If Not addedHandler Then
                    SyncLock addedHandlerLockObject
                        If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 Namespace My
-    
+
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
    Friend Module MySettingsProperty
-        
+
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
        Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatNewConv.My.MySettings
            Get
                Return Global.DigitalData.Controls.ChatNewConv.My.MySettings.Default
--- a/Controls.ChatNewConv/app.config
+++ b/Controls.ChatNewConv/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
--- a/Controls.ChatNewConv/packages.config
+++ b/Controls.ChatNewConv/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>
--- a/Controls.DocumentViewer/App.config
+++ b/Controls.DocumentViewer/App.config
@@ -1,6 +1,46 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
    </startup>
-</configuration>
+  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/Controls.DocumentViewer/Classes/Annotations.vb
+++ b/Controls.DocumentViewer/Classes/Annotations.vb
@@ -45,6 +45,8 @@ Public Class Annotations
                            oAnnotation.Height = DEFAULT_HEIGHT
                            oAnnotation.Text = pText
                            'pGDViewer.ann
                            If oManager.SaveAnnotationsToPage() = GdPictureStatus.OK Then
                                oManager.BurnAnnotationsToPage(True)
                            End If
--- a/Controls.DocumentViewer/Classes/Search.vb
+++ b/Controls.DocumentViewer/Classes/Search.vb
@@ -0,0 +1,137 @@
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Public Class Search
    Inherits BaseClass
    Public Property SearchQuery As String = ""
    Public Property CaseSensitive As Boolean = False
    Public Property WholeWords As Boolean = False
    Private _Viewer As GdViewer = Nothing
    Private _AnnotationManager As New AnnotationManager()
    Private _CurrentPage As Integer = 0
    Private _CurrentQuery As String = ""
    Private _CurrentOccurrenceCount = 0
    Private _CurrentSelectedOccurrence = 0
    Public Sub New(pLogConfig As LogConfig, pGDViewer As GdViewer)
        MyBase.New(pLogConfig)
        _Viewer = pGDViewer
        _AnnotationManager.InitFromGdViewer(pGDViewer)
        AddHandler _Viewer.PageDisplayed, AddressOf Viewer_PageDisplayed
    End Sub
    Public Sub SearchAll(pQuery As String)
        ' Exit, if query has not changed
        If _CurrentQuery = pQuery Then
            Exit Sub
        End If
        ' Save query
        _CurrentQuery = pQuery
        ' Reset previous highlights, then search for the new query
        _Viewer.RemoveAllRegions()
        DoSearchText()
        ' Select the next occurrence
        NextHighlight()
    End Sub
    Public Sub NextHighlight()
        ' This also applies when the page has *NO* occurrences, so 0 = 0
        If _CurrentOccurrenceCount = _CurrentSelectedOccurrence Then
            Dim oCount = 0
            ' If there are no occurrences on the current page, got to the *next page*
            While _CurrentOccurrenceCount = _CurrentSelectedOccurrence And _CurrentPage <= _Viewer.PageCount
                oCount += 1
                If _CurrentPage = _Viewer.PageCount Then
                    _Viewer.DisplayFirstPage()
                Else
                    _Viewer.DisplayNextPage()
                End If
                If oCount > 333 Then
                    Exit While
                End If
            End While
            ' Safeguard against selecting a non-existing occurrence on the last page
            If _CurrentOccurrenceCount > 0 Then
                SelectHighlight(1)
            Else
                ' Disable next button
            End If
        Else
            ' Otherwise just select the next occurrence
            SelectHighlight(_CurrentSelectedOccurrence + 1)
        End If
    End Sub
    Public Sub PrevHighlight()
        If _CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1 Then
            Dim oCount = 0
            While (_CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1) And _CurrentPage >= 1
                oCount += 1
                If _CurrentPage = 1 Then
                    _Viewer.DisplayLastPage()
                Else
                    _Viewer.DisplayPreviousPage()
                End If
                If oCount > 333 Then
                    Exit While
                End If
            End While
            If _CurrentOccurrenceCount > 0 Then
                SelectHighlight(_CurrentOccurrenceCount)
            End If
        Else
            ' Otherwise just select the previous occurrence
            SelectHighlight(_CurrentSelectedOccurrence - 1)
        End If
    End Sub
    Private Sub SelectHighlight(pOccurrence As Integer)
        Dim oFound = _Viewer.SearchText(_CurrentQuery, pOccurrence, CaseSensitive, WholeWords)
        If _Viewer.GetStat() = GdPictureStatus.OK And _Viewer.IsRect() Then
            _Viewer.RectIsEditable = False
            _Viewer.CenterOnRect()
            _CurrentSelectedOccurrence = pOccurrence
        Else
            _CurrentSelectedOccurrence = 0
        End If
    End Sub
    Private Sub Viewer_PageDisplayed()
        If _CurrentPage <> _Viewer.CurrentPage Then
            _CurrentPage = _Viewer.CurrentPage
            If _CurrentQuery.Length > 0 Then
                DoSearchText()
            End If
        End If
    End Sub
    Private Sub DoSearchText()
        _Viewer.SearchText(_CurrentQuery, 0, CaseSensitive, WholeWords)
        Dim oRegionCount = _Viewer.RegionCount()
        For index = 1 To oRegionCount
            Dim oId = _Viewer.GetRegionID(index)
            _Viewer.SetRegionEditable(oId, False)
        Next
        _CurrentOccurrenceCount = _Viewer.GetTextOccurrenceCount(_CurrentPage, _CurrentQuery, CaseSensitive, WholeWords)
        _CurrentSelectedOccurrence = 0
    End Sub
 End Class
--- a/Controls.DocumentViewer/DocumentViewer.Designer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb
@@ -24,9 +24,7 @@ Partial Class DocumentViewer
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer))
        Me.GdViewer = New GdPicture14.GdViewer()
        Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
        Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
        Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
        Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem()
@@ -46,113 +44,39 @@ Partial Class DocumentViewer
        Me.buttonNextPage = New DevExpress.XtraBars.BarButtonItem()
        Me.buttonLastPage = New DevExpress.XtraBars.BarButtonItem()
        Me.buttonSettings = New DevExpress.XtraBars.BarButtonItem()
        Me.txtSearch = New DevExpress.XtraBars.BarEditItem()
        Me.RepositoryItemTextEdit3 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
        Me.btnSearch2 = New DevExpress.XtraBars.BarButtonItem()
        Me.btnPrevHighlight = New DevExpress.XtraBars.BarButtonItem()
        Me.btnNextHighlight = New DevExpress.XtraBars.BarButtonItem()
        Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
        Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
        Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
        Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
        Me.btnSearch = New DevExpress.XtraBars.BarButtonItem()
        Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
        Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit()
        Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
        Me.RepositoryItemSearchControl1 = New DevExpress.XtraEditors.Repository.RepositoryItemSearchControl()
        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
        Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
        Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
        Me.lblInfo = New System.Windows.Forms.Label()
        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'GdViewer
        '
        Me.GdViewer.AllowDropFile = False
        Me.GdViewer.AnimateGIF = True
        Me.GdViewer.AnnotationDropShadow = False
        Me.GdViewer.AnnotationEnableMultiSelect = True
        Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0!
        Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
        Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0)
        Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0)
        Me.GdViewer.BackColor = System.Drawing.SystemColors.AppWorkspace
        Me.GdViewer.BackgroundImage = Nothing
        Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
        Me.GdViewer.ClipAnnotsToPageBounds = True
        Me.GdViewer.ClipRegionsToPageBounds = True
        Me.GdViewer.ContinuousViewMode = True
        Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic
        Me.GdViewer.DisplayQualityAuto = True
        Me.GdViewer.Dock = System.Windows.Forms.DockStyle.Fill
        Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter
        Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter
        Me.GdViewer.DrawPageBorders = True
        Me.GdViewer.EnableDeferredPainting = True
        Me.GdViewer.EnabledProgressBar = True
        Me.GdViewer.EnableICM = False
        Me.GdViewer.EnableMenu = True
        Me.GdViewer.EnableMouseWheel = True
        Me.GdViewer.EnableTextSelection = True
        Me.GdViewer.ForceScrollBars = False
        Me.GdViewer.ForceTemporaryMode = False
        Me.GdViewer.ForeColor = System.Drawing.Color.Black
        Me.GdViewer.Gamma = 1.0!
        Me.GdViewer.HQAnnotationRendering = True
        Me.GdViewer.IgnoreDocumentResolution = False
        Me.GdViewer.KeepDocumentPosition = False
        Me.GdViewer.Location = New System.Drawing.Point(0, 33)
        Me.GdViewer.LockViewer = False
        Me.GdViewer.MagnifierHeight = 90
        Me.GdViewer.MagnifierWidth = 160
        Me.GdViewer.MagnifierZoomX = 2.0!
        Me.GdViewer.MagnifierZoomY = 2.0!
        Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
        Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeVerticalScroll
        Me.GdViewer.Name = "GdViewer"
        Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
        Me.GdViewer.PageBordersPenSize = 1
        Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView
        Me.GdViewer.PdfDisplayFormField = True
        Me.GdViewer.PdfEnableFileLinks = True
        Me.GdViewer.PdfEnableLinks = True
        Me.GdViewer.PdfIncreaseTextContrast = False
        Me.GdViewer.PdfShowDialogForPassword = True
        Me.GdViewer.PdfShowOpenFileDialogForDecryption = True
        Me.GdViewer.PdfVerifyDigitalCertificates = False
        Me.GdViewer.PreserveViewRotation = True
        Me.GdViewer.RectBorderColor = System.Drawing.Color.Black
        Me.GdViewer.RectBorderSize = 1
        Me.GdViewer.RectIsEditable = True
        Me.GdViewer.RegionsAreEditable = True
        Me.GdViewer.RenderGdPictureAnnots = True
        Me.GdViewer.ScrollBars = True
        Me.GdViewer.ScrollLargeChange = CType(50, Short)
        Me.GdViewer.ScrollSmallChange = CType(1, Short)
        Me.GdViewer.SilentMode = True
        Me.GdViewer.Size = New System.Drawing.Size(1079, 557)
        Me.GdViewer.TabIndex = 0
        Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
        Me.GdViewer.Zoom = 1.0R
        Me.GdViewer.ZoomCenterAtMousePosition = False
        Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100
        Me.GdViewer.ZoomStep = 25
        '
        'OpenFileDialog
        '
        Me.OpenFileDialog.FileName = "OpenFileDialog1"
        '
        'RichEditControl1
        '
        Me.RichEditControl1.Location = New System.Drawing.Point(735, 377)
        Me.RichEditControl1.MenuManager = Me.BarManager1
        Me.RichEditControl1.Name = "RichEditControl1"
        Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
        Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
        Me.RichEditControl1.ReadOnly = True
        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
        Me.RichEditControl1.TabIndex = 8
        Me.RichEditControl1.Visible = False
        '
        'BarManager1
        '
        Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.ToolbarDocumentViewer})
@@ -161,10 +85,10 @@ Partial Class DocumentViewer
        Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
        Me.BarManager1.DockControls.Add(Me.barDockControlRight)
        Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage, Me.BarStaticItem1, Me.labelPageCount})
+        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage, Me.BarStaticItem1, Me.labelPageCount, Me.txtSearch, Me.btnPrevHighlight, Me.btnNextHighlight, Me.btnSearch, Me.btnSearch2})
        Me.BarManager1.MainMenu = Me.ToolbarDocumentViewer
-        Me.BarManager1.MaxItemId = 26
+        Me.BarManager1.MaxItemId = 34
-        Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1})
+        Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1, Me.RepositoryItemSearchControl1, Me.RepositoryItemTextEdit3})
        '
        'ToolbarDocumentViewer
        '
@@ -172,7 +96,7 @@ Partial Class DocumentViewer
        Me.ToolbarDocumentViewer.DockCol = 0
        Me.ToolbarDocumentViewer.DockRow = 0
        Me.ToolbarDocumentViewer.DockStyle = DevExpress.XtraBars.BarDockStyle.Top
-        Me.ToolbarDocumentViewer.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrint), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitWidth), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomIn), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomOut), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateLeft), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateRight), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipX), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipY), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFirstPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrevPage), New DevExpress.XtraBars.LinkPersistInfo(Me.txtCurrentPage), New DevExpress.XtraBars.LinkPersistInfo(Me.labelPageCount), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonNextPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonLastPage), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.buttonSettings, DevExpress.XtraBars.BarItemPaintStyle.Standard)})
+        Me.ToolbarDocumentViewer.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrint), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitWidth), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomIn), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomOut), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateLeft), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateRight), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipX), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipY), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFirstPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrevPage), New DevExpress.XtraBars.LinkPersistInfo(Me.txtCurrentPage), New DevExpress.XtraBars.LinkPersistInfo(Me.labelPageCount), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonNextPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonLastPage), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.buttonSettings, DevExpress.XtraBars.BarItemPaintStyle.Standard), New DevExpress.XtraBars.LinkPersistInfo(Me.txtSearch), New DevExpress.XtraBars.LinkPersistInfo(Me.btnSearch2), New DevExpress.XtraBars.LinkPersistInfo(Me.btnPrevHighlight), New DevExpress.XtraBars.LinkPersistInfo(Me.btnNextHighlight)})
        Me.ToolbarDocumentViewer.OptionsBar.AllowCollapse = True
        Me.ToolbarDocumentViewer.OptionsBar.AllowQuickCustomization = False
        Me.ToolbarDocumentViewer.OptionsBar.DrawDragBorder = False
@@ -313,21 +237,56 @@ Partial Class DocumentViewer
        Me.buttonSettings.Name = "buttonSettings"
        Me.buttonSettings.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
        '
        'txtSearch
        '
        Me.txtSearch.Caption = "Suchtext"
        Me.txtSearch.Edit = Me.RepositoryItemTextEdit3
        Me.txtSearch.Id = 27
        Me.txtSearch.Name = "txtSearch"
        '
        'RepositoryItemTextEdit3
        '
        Me.RepositoryItemTextEdit3.AutoHeight = False
        Me.RepositoryItemTextEdit3.Name = "RepositoryItemTextEdit3"
        '
        'btnSearch2
        '
        Me.btnSearch2.Caption = "Text suchen"
        Me.btnSearch2.Id = 32
        Me.btnSearch2.ImageOptions.SvgImage = CType(resources.GetObject("btnSearch2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnSearch2.Name = "btnSearch2"
        '
        'btnPrevHighlight
        '
        Me.btnPrevHighlight.Caption = "Vorheriges Ergebnis"
        Me.btnPrevHighlight.Enabled = False
        Me.btnPrevHighlight.Id = 28
        Me.btnPrevHighlight.ImageOptions.SvgImage = CType(resources.GetObject("btnPrevHighlight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnPrevHighlight.Name = "btnPrevHighlight"
        '
        'btnNextHighlight
        '
        Me.btnNextHighlight.Caption = "Nächstes Ergebnis"
        Me.btnNextHighlight.Enabled = False
        Me.btnNextHighlight.Id = 29
        Me.btnNextHighlight.ImageOptions.SvgImage = CType(resources.GetObject("btnNextHighlight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnNextHighlight.Name = "btnNextHighlight"
        '
        'barDockControlTop
        '
        Me.barDockControlTop.CausesValidation = False
        Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
        Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(1079, 33)
+        Me.barDockControlTop.Size = New System.Drawing.Size(841, 33)
        '
        'barDockControlBottom
        '
        Me.barDockControlBottom.CausesValidation = False
        Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 590)
+        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 555)
        Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(1079, 0)
+        Me.barDockControlBottom.Size = New System.Drawing.Size(841, 0)
        '
        'barDockControlLeft
        '
@@ -335,15 +294,15 @@ Partial Class DocumentViewer
        Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
        Me.barDockControlLeft.Location = New System.Drawing.Point(0, 33)
        Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 557)
+        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 522)
        '
        'barDockControlRight
        '
        Me.barDockControlRight.CausesValidation = False
        Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(1079, 33)
+        Me.barDockControlRight.Location = New System.Drawing.Point(841, 33)
        Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 557)
+        Me.barDockControlRight.Size = New System.Drawing.Size(0, 522)
        '
        'BarStaticItem1
        '
@@ -351,6 +310,13 @@ Partial Class DocumentViewer
        Me.BarStaticItem1.Id = 17
        Me.BarStaticItem1.Name = "BarStaticItem1"
        '
        'btnSearch
        '
        Me.btnSearch.Caption = "Search"
        Me.btnSearch.Id = 31
        Me.btnSearch.ImageOptions.SvgImage = CType(resources.GetObject("btnSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnSearch.Name = "btnSearch"
        '
        'RepositoryItemTextEdit1
        '
        Me.RepositoryItemTextEdit1.AutoHeight = False
@@ -372,22 +338,58 @@ Partial Class DocumentViewer
        Me.RepositoryItemComboBox1.Items.AddRange(New Object() {"Arrow", "Text"})
        Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
        '
        'RepositoryItemSearchControl1
        '
        Me.RepositoryItemSearchControl1.AutoHeight = False
        Me.RepositoryItemSearchControl1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Repository.ClearButton(), New DevExpress.XtraEditors.Repository.SearchButton()})
        Me.RepositoryItemSearchControl1.Name = "RepositoryItemSearchControl1"
        '
        'SpreadsheetControl1
        '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177)
        Me.SpreadsheetControl1.MenuManager = Me.BarManager1
        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
        Me.SpreadsheetControl1.ReadOnly = True
        Me.SpreadsheetControl1.Size = New System.Drawing.Size(268, 161)
-        Me.SpreadsheetControl1.TabIndex = 9
+        Me.SpreadsheetControl1.TabIndex = 0
        Me.SpreadsheetControl1.TabStop = False
        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
        Me.SpreadsheetControl1.Visible = False
        '
        'lbFileNotLoaded
        '
        Me.lbFileNotLoaded.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lbFileNotLoaded.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lbFileNotLoaded.Appearance.Options.UseFont = True
        Me.lbFileNotLoaded.Appearance.Options.UseTextOptions = True
        Me.lbFileNotLoaded.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
        Me.lbFileNotLoaded.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center
        Me.lbFileNotLoaded.AutoEllipsis = True
        Me.lbFileNotLoaded.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
        Me.lbFileNotLoaded.Location = New System.Drawing.Point(3, 74)
        Me.lbFileNotLoaded.Name = "lbFileNotLoaded"
        Me.lbFileNotLoaded.Size = New System.Drawing.Size(835, 72)
        Me.lbFileNotLoaded.TabIndex = 0
        Me.lbFileNotLoaded.Tag = ""
        Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden"
        Me.lbFileNotLoaded.Visible = False
        '
        'RichEditControl1
        '
        Me.RichEditControl1.Location = New System.Drawing.Point(571, 238)
        Me.RichEditControl1.MenuManager = Me.BarManager1
        Me.RichEditControl1.Name = "RichEditControl1"
        Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
        Me.RichEditControl1.TabIndex = 5
        Me.RichEditControl1.Visible = False
        '
        'DocumentViewer
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.RichEditControl1)
        Me.Controls.Add(Me.lbFileNotLoaded)
        Me.Controls.Add(Me.SpreadsheetControl1)
        Me.Controls.Add(Me.GdViewer)
        Me.Controls.Add(Me.barDockControlLeft)
@@ -395,12 +397,14 @@ Partial Class DocumentViewer
        Me.Controls.Add(Me.barDockControlBottom)
        Me.Controls.Add(Me.barDockControlTop)
        Me.Name = "DocumentViewer"
-        Me.Size = New System.Drawing.Size(1079, 590)
+        Me.Size = New System.Drawing.Size(841, 555)
        CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
@@ -408,7 +412,6 @@ Partial Class DocumentViewer
    Friend WithEvents GdViewer As GdPicture14.GdViewer
    Friend WithEvents OpenFileDialog As OpenFileDialog
    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
    Friend WithEvents PrintDocument1 As Printing.PrintDocument
    Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
@@ -438,4 +441,14 @@ Partial Class DocumentViewer
    Friend WithEvents RepositoryItemColorEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemColorEdit
    Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
    Friend WithEvents labelPageCount As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents txtSearch As DevExpress.XtraBars.BarEditItem
    Friend WithEvents RepositoryItemTextEdit3 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
    Friend WithEvents btnPrevHighlight As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents btnNextHighlight As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RepositoryItemSearchControl1 As DevExpress.XtraEditors.Repository.RepositoryItemSearchControl
    Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl
    Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
    Friend WithEvents lblInfo As Label
 End Class
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@@ -123,6 +123,9 @@
  <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>285, 22</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>25</value>
  </metadata>
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -161,6 +164,88 @@
        NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
        OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
        LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
        Cjwvc3ZnPgs=
 </value>
  </data>
  <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iQmFja3dhcmQiPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZz
        Ni4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTI0LDE4aC04djZsLTgtOGw4LTh2
        Nmg4VjE4eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
  <data name="btnNextHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iRm9yd2FyZF8xXyI+DQogICAgPHBhdGggZD0iTTE2LDJDOC4zLDIsMiw4LjMsMiwx
        NnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwyeiBNMTYsMjR2LTZIOHYtNGg4Vjhs
        OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
  <data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
        cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
        LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
        NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
        MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
        MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
        MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
        IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
        NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
  <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -22,8 +22,8 @@ Public Class DocumentViewer
    Private Enum ViewerMode
        GDPicture
        RichText
        Excel
        Richtext
    End Enum
    Private Enum FileLoadMode
@@ -31,34 +31,59 @@ Public Class DocumentViewer
        Stream
    End Enum
-    Private _ViewerMode As ViewerMode
+    Public ReadOnly Property PdfViewer As GdViewer
-    Private _currentSearchOccurence As Integer = 0
+        Get
-    Private _toggleGamma As Boolean = True
+            Return GdViewer
-    Private _licenseKey As String = String.Empty
+        End Get
-    Private _licenseManager As New GdPicture14.LicenseManager()
+    End Property
    Private _logConfig As LogConfig
    Private _logger As Logger
    Private _email As Email2
    Private _Config As ConfigManager(Of Config)
    Private _email As Email2
    Private _ViewerMode As ViewerMode
    Private _licenseKey As String = String.Empty
    Private _licenseManager As New GdPicture14.LicenseManager()
    Private _Search As Search
    Private _Annotations As Annotations
    Private _AnnotationsPending As Boolean = False
    Private _ToolbarSettings As New ToolbarSettings
    Private _hide_file_info_from_user As Boolean = False
    Private _FileStream As Stream
    Private _FilePath As String
-    Private _Fileinfo As FileInfo
+    Private _FileInfo As FileInfo
    Private _FileLoadMode As FileLoadMode = FileLoadMode.File
    Private _ViewOverride As String = ""
    ' List of all created temp files when converting msg files
    Private _TempFiles As New List(Of String)
    Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load
        ' Ensure search is initialized once the control (and GdViewer) exists
        EnsureSearchInitialized()
        UpdateMainUi()
    End Sub
-
+    'hallo
    Public Class ToolbarSettings
        Public Property ShowPrintButton As Boolean = True
        Public Property ShowFitWidthButton As Boolean = True
        Public Property ShowFitPageButton As Boolean = True
        Public Property ShowZoomButton As Boolean = True
        Public Property ShowRotateButton As Boolean = True
        Public Property ShowFlipButton As Boolean = True
        Public Property ShowSearchButton As Boolean = True
        Public Property ShowSettingButton As Boolean = True
    End Class
    Public Property FileLoaded As Boolean = False
    Public Property Viewer_ForceTemporaryMode As Boolean = False
    Public ReadOnly Property AnnotationsSaved As Boolean
        Get
            Return Not _AnnotationsPending
@@ -70,16 +95,45 @@ Public Class DocumentViewer
    ''' </summary>
    ''' <param name="pLogConfig">A LogConfig object</param>
    ''' <param name="pLicenseKey">The GDPicture.NET License Key</param>
-    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String)
+    Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, Optional pToolbarSettings As ToolbarSettings = Nothing) As Boolean
        _logConfig = pLogConfig
        _logger = pLogConfig.GetLogger()
        _email = New Email2(pLogConfig)
        _licenseKey = pLicenseKey
        _licenseManager.RegisterKEY(_licenseKey)
        _Annotations = New Annotations(pLogConfig)
-        Dim oConfigPath = ConfigPath()
+        If pToolbarSettings Is Nothing Then
-        _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
+            pToolbarSettings = New ToolbarSettings
        End If
        Try
            _email = New Email2(pLogConfig)
            If pLicenseKey = String.Empty Then
                _logger.Warn("License key was not provided during init-process!")
                Return False
            End If
            _licenseKey = pLicenseKey
            _licenseManager.RegisterKEY(_licenseKey)
            _Annotations = New Annotations(pLogConfig)
            ' Defer creating Search until GdViewer is ready
            EnsureSearchInitialized()
            _ToolbarSettings = pToolbarSettings
            Dim oConfigPath = ConfigPath()
            _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
            Return True
        Catch ex As Exception
            _logger.Error(ex)
            Return False
        End Try
    End Function
    ' Create the Search helper only when both the log config and the GdViewer control exist
    Private Sub EnsureSearchInitialized()
        Try
            If _Search Is Nothing AndAlso _logConfig IsNot Nothing AndAlso GdViewer IsNot Nothing Then
                _Search = New Search(_logConfig, GdViewer)
            End If
        Catch ex As Exception
            _logger?.Error(ex)
        End Try
    End Sub
    ''' <summary>
@@ -87,7 +141,6 @@ Public Class DocumentViewer
    ''' </summary>
    Public Sub LoadFile(FilePath As String)
        FileLoaded = False
        If _licenseKey = String.Empty Then
            _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
            Exit Sub
@@ -100,12 +153,11 @@ Public Class DocumentViewer
        _FilePath = FilePath
        _FileLoadMode = FileLoadMode.File
-        _Fileinfo = New FileInfo(FilePath)
+        _FileInfo = New FileInfo(FilePath)
-        _logger.Info("Loading File [{0}] from Filesystem", FilePath)
+        _logger.Info("Loading file [{0}] from Filesystem", FilePath)
        SetViewerMode(_FileInfo.Extension)
        FileLoaded = DoLoadFile(FilePath)
        SetViewerMode(_Fileinfo.Extension)
        UpdateMainUi()
    End Sub
@@ -115,10 +167,7 @@ Public Class DocumentViewer
    Public Sub LoadFile(FileName As String, Stream As Stream)
        FileLoaded = False
-        If _licenseKey = String.Empty Then
+
            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
            Exit Sub
        End If
        Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
@@ -167,8 +216,6 @@ Public Class DocumentViewer
        Return True
    End Function
    Public Function Save() As Boolean
        Dim oSaveResult As GdPictureStatus = GdPictureStatus.OK
@@ -190,7 +237,22 @@ Public Class DocumentViewer
    Public Sub CloseDocument()
        Try
-            GdViewer.CloseDocument()
+            ' Null-sicher schließen
            If GdViewer IsNot Nothing Then
                Try
                    GdViewer.CloseDocument()
                Catch exInner As Exception
                    _logger?.Warn("Fehler beim Schließen von GdViewer")
                    _logger?.Error(exInner)
                End Try
            Else
                _logger?.Debug("CloseDocument: GdViewer ist Nothing – nichts zu schließen")
            End If
            _FileInfo = Nothing
            _FilePath = Nothing
            _FileStream = Nothing
            UpdateMainUi()
        Catch ex As Exception
            _logger.Error(ex)
@@ -250,12 +312,6 @@ Public Class DocumentViewer
        _Config.Save()
    End Sub
    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
        Dim oControlWidth = RichEditControl1.Width - 100
        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
    End Sub
    Private Sub btnOpen_Click(sender As Object, e As EventArgs)
        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
@@ -267,33 +323,23 @@ Public Class DocumentViewer
        GdViewer.Focus()
        UpdateMainUi()
    End Sub
-    Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick
+    Private Sub BtnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick
        GdViewer.DisplayFirstPage()
    End Sub
-    Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
+    Private Sub BtnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.DisplayPreviousPage()
            GdViewer.DisplayPreviousPage()
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New PreviousPageCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
-    Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
+    Private Sub BtnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.DisplayNextPage()
            GdViewer.DisplayNextPage()
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New NextPageCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
-    Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
+    Private Sub BtnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
        GdViewer.DisplayLastPage()
    End Sub
-    Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.EditValueChanged
+    Private Sub TbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.EditValueChanged
        Dim page As Integer = 0
        If Integer.TryParse(txtCurrentPage.EditValue, page) Then
            If page > 0 And page <= GdViewer.PageCount Then
@@ -315,21 +361,11 @@ Public Class DocumentViewer
    End Sub
    Private Sub btnZoomOut_Click(sender As Object, e As EventArgs) Handles buttonZoomOut.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomOUT()
            GdViewer.ZoomOUT()
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New ZoomOutCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
    Private Sub btnZoomIn_Click(sender As Object, e As EventArgs) Handles buttonZoomIn.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomIN()
            GdViewer.ZoomIN()
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New ZoomInCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
    Private Sub btnPrint_Click(sender As Object, e As EventArgs) Handles buttonPrint.ItemClick
@@ -340,11 +376,11 @@ Public Class DocumentViewer
        GdViewer.PrintDialog()
    End Sub
-    Private Sub btnRotateLeft_Click(sender As Object, e As EventArgs) Handles buttonRotateLeft.ItemClick
+    Private Sub BtnRotateLeft_Click(sender As Object, e As EventArgs) Handles buttonRotateLeft.ItemClick
        GdViewer.Rotate(RotateFlipType.Rotate270FlipNone)
    End Sub
-    Private Sub btnRotateRight_Click(sender As Object, e As EventArgs) Handles buttonRotateRight.ItemClick
+    Private Sub BtnRotateRight_Click(sender As Object, e As EventArgs) Handles buttonRotateRight.ItemClick
        GdViewer.Rotate(RotateFlipType.Rotate90FlipNone)
    End Sub
@@ -369,7 +405,7 @@ Public Class DocumentViewer
        End If
    End Sub
-    Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonSettings.ItemClick
+    Private Sub BtnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonSettings.ItemClick
        Using frmSettings As New frmViewerSettings(GdViewer)
            frmSettings.ShowDialog(Me)
        End Using
@@ -423,67 +459,297 @@ Public Class DocumentViewer
    End Sub
    Private Sub SetViewerMode(Extension As String)
-        Select Case Extension.ToUpper
+        If _ViewOverride = "Richtext" Then
-            Case ".MSG"
+            _ViewerMode = ViewerMode.Richtext
-                _ViewerMode = ViewerMode.RichText
+        Else
-            Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+            Select Case Extension.ToUpper
-                _ViewerMode = ViewerMode.RichText
+                Case "CSV"
-            Case ".XLSX", ".XLS", "CSV"
+                    _ViewerMode = ViewerMode.Excel
-                _ViewerMode = ViewerMode.Excel
+                    'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-            Case Else
+                    '   _ViewerMode = ViewerMode.RichText
-                _ViewerMode = ViewerMode.GDPicture
+                Case Else
-        End Select
+                    _ViewerMode = ViewerMode.GDPicture
            End Select
        End If
    End Sub
    Private Sub FreeFile()
        Try
-            If Len(_FilePath) = 0 OrElse _Fileinfo Is Nothing Then
+            If Len(_FilePath) = 0 OrElse _FileInfo Is Nothing Then
                Exit Sub
            End If
-            Dim oExtension As String = _Fileinfo.Extension.ToUpper
+            Dim oExtension As String = _FileInfo.Extension.ToUpper
            Select Case _ViewerMode
                Case ViewerMode.RichText
                    _logger.Debug("Closing RichText Editor")
                    RichEditControl1.CreateNewDocument()
                Case ViewerMode.Excel
                    _logger.Debug("Closing Excel Editor")
                    SpreadsheetControl1.CreateNewDocument()
                Case Else
                    _logger.Debug("Closing GDPicture Viewer")
                    GdViewer.CloseDocument()
            End Select
        Catch ex As Exception
            _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
        End Try
    End Sub
-    Private Function DoLoadFile(FilePath As String) As Boolean
+    Private Function DoLoadFile(FilePath As String, Optional ViewOverride As String = "") As Boolean
        Try
            lblInfo.Visible = False
            Dim oFileInfo = New FileInfo(FilePath)
            Dim oExtension As String = oFileInfo.Extension.ToUpper
            lbFileNotLoaded.Visible = False
            SpreadsheetControl1.Visible = False
            RichEditControl1.Visible = False
            SpreadsheetControl1.Dock = DockStyle.None
            RichEditControl1.Dock = DockStyle.None
            Dim override_Spreadsheet As Boolean = False
            If oExtension.ToLower = ".xlsx" Then
                If oFileInfo.Length > 15000 Then
                    _logger.Info("Override")
                    override_Spreadsheet = True
                End If
            End If
            If ViewOverride = "Richtext" Then
                RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
                RichEditControl1.Visible = True
                GdViewer.Visible = False
                RichEditControl1.Dock = DockStyle.Fill
                _ViewOverride = "Richtext"
                _ViewerMode = ViewerMode.Richtext
                lblInfo.Visible = True
                lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD"
            ElseIf override_Spreadsheet = True Then
                Dim oFormat = GetSpreadsheetFormat(oExtension)
                SpreadsheetControl1.LoadDocument(FilePath, oFormat)
                Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                oRange.AutoFitColumns()
                SpreadsheetControl1.Visible = True
                GdViewer.Visible = False
                SpreadsheetControl1.Dock = DockStyle.Fill
            Else
                _ViewOverride = ""
                Select Case oExtension.ToUpper
                    Case ".CSV"
                        Dim oFormat = GetSpreadsheetFormat(oExtension)
                        SpreadsheetControl1.LoadDocument(FilePath, oFormat)
                        Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                        oRange.AutoFitColumns()
                        SpreadsheetControl1.Visible = True
                        GdViewer.Visible = False
                        SpreadsheetControl1.Dock = DockStyle.Fill
                        'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
                        '    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
                        '    RichEditControl1.Visible = True
                        '    GdViewer.Visible = False
                        '    RichEditControl1.Dock = DockStyle.Fill
                    Case Else
                        Select Case oExtension.ToUpper
                            Case ".EML", ".DOC", ".DOCX", ".XLS", ".XLSX", ".ODT", ".RTF", ".TXT"
                                GdViewer.ForceTemporaryMode = False
                        End Select
                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
                        If Viewer_ForceTemporaryMode = True Then
                            GdViewer.ForceTemporaryMode = True
                        End If
                        GdViewer.AnnotationDropShadow = True
                        GdViewer.BackColor = Color.White
                        Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
                        If oGDPState <> GdPictureStatus.OK Then
                            _logger.Warn($"GdPictureStatus is [{oGDPState}]")
                            If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
                                DoLoadFile(FilePath, "Richtext")
                            Else
                                Dim oFileName = IO.Path.GetFileName(FilePath)
                                lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
                                lbFileNotLoaded.Visible = True
                            End If
                        Else
                            If GdViewer.Visible = False Then
                                GdViewer.Visible = True
                            End If
                        End If
                End Select
            End If
            If _ViewOverride = "Richtext" Then
                _ViewerMode = ViewerMode.Richtext
            End If
            Return True
        Catch ex As Exception
            _logger.Error(ex)
            Return False
        End Try
    End Function
    Private Function DoLoadFile(FilePath As String) As Boolean
        Try
            ' Ensure the embedded GdViewer control exists before using it
            If Not EnsureViewerReady() Then
                _logger?.Warn("GdViewer control is not initialized yet. Delaying load.")
                Return False
            End If
            lblInfo.Visible = False
            Dim oFileInfo = New FileInfo(FilePath)
            Dim oExtension As String = oFileInfo.Extension.ToUpper
            lbFileNotLoaded.Visible = False
            SpreadsheetControl1.Visible = False
            RichEditControl1.Visible = False
            SpreadsheetControl1.Dock = DockStyle.None
            RichEditControl1.Dock = DockStyle.None
            Dim Override_SSheet_Filesize As Boolean = False
            If oExtension.ToLower = ".xlsx" Then
                If oFileInfo.Length > 100000 Then
                    _logger.Info("Override Spreadsheet as xlsx is too big")
                    Override_SSheet_Filesize = True
                End If
            End If
            If Override_SSheet_Filesize Then
                Dim oFormat = GetSpreadsheetFormat(oExtension)
                SpreadsheetControl1.LoadDocument(FilePath, oFormat)
                Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                oRange.AutoFitColumns()
                If ViewOverride = "Richtext" Then
                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
                    RichEditControl1.Visible = True
                    GdViewer.Visible = False
                    RichEditControl1.Dock = DockStyle.Fill
                    _ViewOverride = "Richtext"
                    _ViewerMode = ViewerMode.Richtext
                    lblInfo.Visible = True
                    lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD"
                Else
                    _ViewOverride = ""
                    Select Case oExtension.ToUpper
                        Case ".CSV"
                            Dim oFormat = GetSpreadsheetFormat(oExtension)
                            SpreadsheetControl1.LoadDocument(FilePath, oFormat)
                            Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                        oRange.AutoFitColumns()
                        SpreadsheetControl1.Visible = True
                        GdViewer.Visible = False
                        SpreadsheetControl1.Dock = DockStyle.Fill
                        Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
                            RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
                            RichEditControl1.Visible = True
                            GdViewer.Visible = False
                            RichEditControl1.Dock = DockStyle.Fill
                        Case Else
                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
                        GdViewer.ForceTemporaryMode = True
                            GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
                            If Viewer_ForceTemporaryMode = True Then
                                GdViewer.ForceTemporaryMode = True
                            End If
                            GdViewer.AnnotationDropShadow = True
                            GdViewer.BackColor = Color.White
                            Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
                            If oGDPState <> GdPictureStatus.OK Then
                                _logger.Warn($"GdPictureStatus is [{oGDPState}]")
                                If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
                                    DoLoadFile(FilePath, "Richtext")
                                Else
                                    Dim oFileName = IO.Path.GetFileName(FilePath)
                                    lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
                                lbFileNotLoaded.Visible = True
                            End If
                        Else
                            If GdViewer.Visible = False Then
                                GdViewer.Visible = True
                            End If
                        End If
                End Select
                Return True
        Catch ex As Exception
            _logger.Error(ex)
            Return False
        End Try
    End Function
    ' Ensures the embedded GdViewer control exists and is added to the visual tree
    Private Function EnsureViewerReady() As Boolean
        Try
            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
            If GdViewer Is Nothing Then
    Private Function EnsureViewerReady() As Boolean
        Try
            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
            If GdViewer Is Nothing Then
                ' Attempt to find an existing instance by name in Controls collection
                Dim existing = Me.Controls.OfType(Of GdPicture14.GdViewer)().FirstOrDefault()
                If existing IsNot Nothing Then
                    ' Assign the designer field via reflection if needed, otherwise use it directly
                    GdViewer = existing
                Else
                    ' Last resort: create a new viewer and add it
                    Dim viewer = New GdPicture14.GdViewer()
                    viewer.Dock = DockStyle.Fill
                    Me.Controls.Add(viewer)
                    GdViewer = viewer
                End If
            End If
            Return GdViewer IsNot Nothing
        Catch ex As Exception
            _logger?.Error(ex)
            Return False
        End Try
    End Function
    Private Sub FitToPage()
        If Not GdViewer Is Nothing Then
            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
        End If
    End Sub
    Private Sub FitToWidth()
        If Not GdViewer Is Nothing Then
            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
        End If
    End Sub
    Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
        Try
            SpreadsheetControl1.Visible = False
            SpreadsheetControl1.Dock = DockStyle.None
-            Select Case oExtension.ToUpper
+            Select Case Extension.ToUpper
                Case ".MSG"
                    Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
                    _TempFiles.Add(oEmlPath)
                    DoLoadFile(oEmlPath)
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                Case ".CSV"
-                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
                    RichEditControl1.Visible = True
                    RichEditControl1.Dock = DockStyle.Fill
                Case ".XLSX", ".XLS", ".CSV"
                    Dim oFormat = GetSpreadsheetFormat(oExtension)
                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                    oRange.AutoFitColumns()
@@ -492,12 +758,17 @@ Public Class DocumentViewer
                    SpreadsheetControl1.Dock = DockStyle.Fill
                Case Else
-                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                    If Not GdViewer Is Nothing Then
-                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-                    GdViewer.ForceTemporaryMode = True
+                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    GdViewer.AnnotationDropShadow = True
+                        If Viewer_ForceTemporaryMode = True Then
                            GdViewer.ForceTemporaryMode = True
                        End If
                        GdViewer.AnnotationDropShadow = True
                        GdViewer.DisplayFromStream(Stream)
                    End If
                    GdViewer.DisplayFromFile(FilePath)
            End Select
@@ -509,54 +780,15 @@ Public Class DocumentViewer
            Return False
        End Try
    End Function
-
+    Private Function StreamFile(Stream As Stream, Extension As String) As Boolean
    Private Sub FitToPage()
        If _ViewerMode = ViewerMode.GDPicture Then
            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New FitToPageCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
    Private Sub FitToWidth()
        If _ViewerMode = ViewerMode.GDPicture Then
            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
        ElseIf _ViewerMode = ViewerMode.RichText Then
            Dim oCmd As New FitWidthCommand(RichEditControl1)
            oCmd.Execute()
        End If
    End Sub
    Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
        Try
            RichEditControl1.Visible = False
            RichEditControl1.Dock = DockStyle.None
            SpreadsheetControl1.Visible = False
            SpreadsheetControl1.Dock = DockStyle.None
            Select Case Extension.ToUpper
                Case ".MSG"
-                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
+                Case ".CSV"
                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
                        Stream.Seek(0, SeekOrigin.Begin)
                        Stream.CopyTo(oFileStream)
                        Stream.Flush()
                    End Using
                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
                    DoLoadFile(oEmlPath)
                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
                    RichEditControl1.Visible = True
                    RichEditControl1.Dock = DockStyle.Fill
                Case ".XLSX", ".XLS", ".CSV"
                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@@ -611,6 +843,14 @@ Public Class DocumentViewer
        Return oFormat
    End Function
    Private Function ToVisibility(pBoolean As Boolean) As XtraBars.BarItemVisibility
        If (pBoolean = True) Then
            Return XtraBars.BarItemVisibility.Always
        Else
            Return XtraBars.BarItemVisibility.Never
        End If
    End Function
    Private Sub UpdateMainUi()
        Select Case _Config?.Config?.PageFit
@@ -622,61 +862,88 @@ Public Class DocumentViewer
        End Select
        If _FileStream Is Nothing And _FilePath Is Nothing Then
            lbFileNotLoaded.Visible = False
        End If
        Select Case _ViewerMode
            Case ViewerMode.GDPicture
-                buttonPrint.Enabled = True
+                ToolbarDocumentViewer.Visible = True
                buttonFitWidth.Enabled = True
                buttonFitPage.Enabled = True
                buttonZoomIn.Enabled = True
                buttonZoomOut.Enabled = True
                buttonRotateLeft.Enabled = True
                buttonRotateRight.Enabled = True
                buttonFlipX.Enabled = True
                buttonFlipY.Enabled = True
                buttonFirstPage.Enabled = True
                buttonPrevPage.Enabled = True
                buttonNextPage.Enabled = True
                buttonLastPage.Enabled = True
                buttonSettings.Enabled = True
                txtCurrentPage.Enabled = True
-            Case ViewerMode.RichText
+                buttonPrint.Visibility = ToVisibility(_ToolbarSettings.ShowPrintButton)
-                buttonFitPage.Enabled = True
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
-                buttonZoomIn.Enabled = True
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
-                buttonZoomOut.Enabled = True
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonFitWidth.Enabled = True
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonNextPage.Enabled = True
+                buttonRotateLeft.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
-                buttonPrevPage.Enabled = True
+                buttonRotateRight.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
-
+                buttonFlipX.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
-                buttonPrint.Enabled = False
+                buttonFlipY.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
-                buttonRotateLeft.Enabled = False
+                buttonSettings.Visibility = ToVisibility(_ToolbarSettings.ShowSettingButton)
-                buttonRotateRight.Enabled = False
+                txtSearch.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
-                buttonFlipX.Enabled = False
+                btnSearch2.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
-                buttonFlipY.Enabled = False
+                btnNextHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
-                buttonFirstPage.Enabled = False
+                btnPrevHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
-                buttonLastPage.Enabled = False
+                buttonFirstPage.Visibility = ToVisibility(True)
-                buttonSettings.Enabled = False
+                buttonPrevPage.Visibility = ToVisibility(True)
-                txtCurrentPage.Enabled = False
+                buttonNextPage.Visibility = ToVisibility(True)
                buttonLastPage.Visibility = ToVisibility(True)
                txtCurrentPage.Visibility = ToVisibility(True)
            Case ViewerMode.Excel
-                buttonPrint.Enabled = False
+                ToolbarDocumentViewer.Visible = False
                buttonFitWidth.Enabled = False
                buttonFitPage.Enabled = False
                buttonZoomIn.Enabled = False
                buttonZoomOut.Enabled = False
                buttonRotateLeft.Enabled = False
                buttonRotateRight.Enabled = False
                buttonFlipX.Enabled = False
                buttonFlipY.Enabled = False
                buttonFirstPage.Enabled = False
                buttonPrevPage.Enabled = False
                buttonNextPage.Enabled = False
                buttonLastPage.Enabled = False
                buttonSettings.Enabled = False
                txtCurrentPage.Enabled = False
                buttonPrint.Visibility = ToVisibility(False)
                buttonFitWidth.Visibility = ToVisibility(False)
                buttonFitPage.Visibility = ToVisibility(False)
                buttonZoomIn.Visibility = ToVisibility(False)
                buttonZoomOut.Visibility = ToVisibility(False)
                buttonRotateLeft.Visibility = ToVisibility(False)
                buttonRotateRight.Visibility = ToVisibility(False)
                buttonFlipX.Visibility = ToVisibility(False)
                buttonFlipY.Visibility = ToVisibility(False)
                buttonFirstPage.Visibility = ToVisibility(False)
                buttonPrevPage.Visibility = ToVisibility(False)
                buttonNextPage.Visibility = ToVisibility(False)
                buttonLastPage.Visibility = ToVisibility(False)
                buttonSettings.Visibility = ToVisibility(False)
                txtCurrentPage.Visibility = ToVisibility(False)
                txtSearch.Visibility = ToVisibility(False)
                btnSearch2.Visibility = ToVisibility(False)
                btnNextHighlight.Visibility = ToVisibility(False)
                btnPrevHighlight.Visibility = ToVisibility(False)
            Case Else
                ToolbarDocumentViewer.Visible = False
        End Select
    End Sub
    Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
        EnsureSearchInitialized()
        If _Search IsNot Nothing AndAlso Not String.IsNullOrEmpty(txtSearch.EditValue) Then
            _Search.SearchAll(txtSearch.EditValue?.ToString)
        End If
    End Sub
    Private Sub btnPrevHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnPrevHighlight.ItemClick
        EnsureSearchInitialized()
        _Search?.PrevHighlight()
    End Sub
    Private Sub btnNextHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnNextHighlight.ItemClick
        EnsureSearchInitialized()
        _Search?.NextHighlight()
    End Sub
    Private Sub txtSearch_EditValueChanged(sender As Object, e As EventArgs) Handles txtSearch.EditValueChanged
        If String.IsNullOrEmpty(txtSearch.EditValue) Then
            btnPrevHighlight.Enabled = False
            btnNextHighlight.Enabled = False
        Else
            btnPrevHighlight.Enabled = True
            btnNextHighlight.Enabled = True
        End If
    End Sub
 #End Region
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -12,8 +12,11 @@
    <AssemblyName>DigitalData.Controls.DocumentViewer</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,6 +51,9 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
    </Reference>
    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -72,26 +78,166 @@
    <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="GdPicture.NET.14">
+    <Reference Include="DigitalData.Modules.Base">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config">
      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Messaging">
      <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
    </Reference>
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
    </Reference>
    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
    </Reference>
    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.Deployment" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
    </Reference>
    <Reference Include="System.Management" />
    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Security" />
    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
    </Reference>
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
    </Reference>
    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Transactions" />
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
@@ -114,7 +260,7 @@
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Annotations.vb" />
+    <Compile Include="Classes\Annotations.vb" />
    <Compile Include="Config.vb" />
    <Compile Include="DocumentViewer.Designer.vb">
      <DependentUpon>DocumentViewer.vb</DependentUpon>
@@ -144,6 +290,7 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
    <Compile Include="Classes\Search.vb" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="DocumentViewer.resx">
@@ -172,24 +319,6 @@
    </None>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Base\Base\Base.vbproj">
      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
      <Name>Base</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Config\Config.vbproj">
      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
      <Name>Config</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Messaging\Messaging.vbproj">
      <Project>{af664d85-0a4b-4bab-a2f8-83110c06553a}</Project>
      <Name>Messaging</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
    <None Include="Resources\ZooFlow-10.svg" />
@@ -204,24 +333,6 @@
    <None Include="Resources\tooltips1.svg" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="GdPicture.NET.14.filters.64.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="GdPicture.NET.14.filters.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="GdPicture.NET.14.image.gdimgplug.64.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="GdPicture.NET.14.image.gdimgplug.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <None Include="Resources\viewsettings.svg" />
    <None Include="Resources\next.svg" />
    <None Include="Resources\prev.svg" />
@@ -236,4 +347,11 @@
    <None Include="Resources\rotatecounterclockwise.svg" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
 </Project>
--- a/Controls.DocumentViewer/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll
--- a/Controls.DocumentViewer/GdPicture.NET.14.Imaging.Rendering.Skia.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.Imaging.Rendering.Skia.dll
--- a/Controls.DocumentViewer/GdPicture.NET.14.filters.64.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.filters.64.dll
--- a/Controls.DocumentViewer/GdPicture.NET.14.filters.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.filters.dll
--- a/Controls.DocumentViewer/GdPicture.NET.14.image.gdimgplug.64.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.image.gdimgplug.64.dll
--- a/Controls.DocumentViewer/GdPicture.NET.14.image.gdimgplug.dll
+++ b/Controls.DocumentViewer/GdPicture.NET.14.image.gdimgplug.dll
--- a/Controls.DocumentViewer/MailLicense.xml
+++ b/Controls.DocumentViewer/MailLicense.xml
--- a/Controls.DocumentViewer/My
+++ b/Controls.DocumentViewer/My
@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
-<Assembly: AssemblyTitle("DocumentViewer")>
+<Assembly: AssemblyTitle("DigitalData.DocumentViewer")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Stellt den Digital Data DocumentViewer für Applikationen zur Verfügung")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digutal Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("DocumentViewer")>
+<Assembly: AssemblyProduct("DigitalData.DocumentViewer")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("1.8.0.0")>
+<Assembly: AssemblyVersion("2.6.0.0")>
-<Assembly: AssemblyFileVersion("1.8.0.0")>
+<Assembly: AssemblyFileVersion("2.6.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Controls.DocumentViewer/README.txt
+++ b/Controls.DocumentViewer/README.txt
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -1,4 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
  <package id="System.Management" version="8.0.0" targetFramework="net462" />
  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>
--- a/Controls.LookupGrid/LookupControl.vbproj
+++ b/Controls.LookupGrid/LookupControl.vbproj
@@ -10,7 +10,8 @@
    <AssemblyName>DigitalData.Controls.LookupGrid</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -104,6 +105,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -133,11 +135,18 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="frmLookupGrid.aa.resx">
      <DependentUpon>frmLookupGrid.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmLookupGrid.en.resx">
      <DependentUpon>frmLookupGrid.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmLookupGrid.fr.resx">
      <DependentUpon>frmLookupGrid.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="frmLookupGrid.resx">
      <DependentUpon>frmLookupGrid.vb</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="LookupControl3.resx">
      <DependentUpon>LookupControl3.vb</DependentUpon>
@@ -154,6 +163,7 @@
      <LastGenOutput>Strings.en.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
    </EmbeddedResource>
    <EmbeddedResource Include="Resources\Strings.fr.resx" />
    <EmbeddedResource Include="Resources\Strings.resx">
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <Generator>ResXFileCodeGenerator</Generator>
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -15,6 +15,8 @@ Imports DevExpress.XtraGrid.Columns
 Public Class LookupControl3
    Inherits GridLookUpEdit
    Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
    <DesignerSerializationVisibility(DesignerSerializationVisibility.Content)>
    Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3
        Get
@@ -36,33 +38,21 @@ Public Class LookupControl3
        e.Cancel = True
    End Sub
-    Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
+    Private Sub LookupControl3_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
-    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
+        If e.KeyCode = Keys.F2 Then
-
+            Dim oLookup As LookupControl3 = sender
-    Private Sub InitializeComponent()
+            Dim oButton As EditorButton = oLookup.Properties.Buttons.
-        Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
+                Where(Function(b) b.Tag = TAG_BUTTON_LOOKUP_FORM).
-        Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView()
+                SingleOrDefault()
        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'fProperties
        '
        Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
        Me.fProperties.Name = "fProperties"
        Me.fProperties.PopupView = Me.fPropertiesView
        '
        'fPropertiesView
        '
        Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
        Me.fPropertiesView.Name = "fPropertiesView"
        Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False
        Me.fPropertiesView.OptionsView.ShowGroupPanel = False
        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
            If oButton IsNot Nothing Then
                oLookup.PerformClick(oButton)
            End If
        End If
    End Sub
    Shadows WithEvents fProperties As RepositoryItemGridLookUpEdit
    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
 End Class
 <UserRepositoryItem("RegisterLookupControl3")>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("LookupGrid")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("3.3.0.0")>
+<Assembly: AssemblyTrademark("3.4.3.0")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("3.3.0.0")>
+<Assembly: AssemblyVersion("3.4.3.0")>
-<Assembly: AssemblyFileVersion("3.3.0.0")>
+<Assembly: AssemblyFileVersion("3.4.3.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Controls.LookupGrid/My
+++ b/Controls.LookupGrid/My
@@ -0,0 +1,3 @@
 DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/Controls.LookupGrid/Resources/Strings.Designer.vb
+++ b/Controls.LookupGrid/Resources/Strings.Designer.vb
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
+'     This code was generated by a tool.
-'     Laufzeitversion:4.0.30319.42000
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     Changes to this file may cause incorrect behavior and will be lost if
-'     der Code erneut generiert wird.
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
@@ -15,14 +15,14 @@ Imports System
 Namespace My.Resources
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    'This class was auto-generated by the StronglyTypedResourceBuilder
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'class via a tool like ResGen or Visual Studio.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    'with the /str option, or rebuild your VS project.
    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
    Friend Class Strings
@@ -37,7 +37,7 @@ Namespace My.Resources
        End Sub
        '''<summary>
-        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''  Returns the cached ResourceManager instance used by this class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -51,8 +51,8 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''  resource lookups using this strongly typed resource class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend Shared Property Culture() As Global.System.Globalization.CultureInfo
@@ -65,7 +65,7 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Keine Datensätze ausgewählt ähnelt.
+        '''  Looks up a localized string similar to Keine Datensätze ausgewählt.
        '''</summary>
        Friend Shared ReadOnly Property LookupControl_NoRecords() As String
            Get
@@ -74,7 +74,7 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die {0} Datensätze ausgewählt ähnelt.
+        '''  Looks up a localized string similar to {0} Datensätze ausgewählt.
        '''</summary>
        Friend Shared ReadOnly Property LookupControl_NRecords() As String
            Get
@@ -83,7 +83,7 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Wert aus: ähnelt.
+        '''  Looks up a localized string similar to Bitte wählen Sie einen Wert aus:.
        '''</summary>
        Friend Shared ReadOnly Property PopupForm_Text() As String
            Get
@@ -92,7 +92,7 @@ Namespace My.Resources
        End Property
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
+        '''  Looks up a localized string similar to Bitte wählen Sie einen oder mehrere Werte aus:.
        '''</summary>
        Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
            Get
--- a/Controls.LookupGrid/Resources/Strings.fr.resx
+++ b/Controls.LookupGrid/Resources/Strings.fr.resx
@@ -117,8 +117,16 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="LookupControl_NoRecords" xml:space="preserve">
-  <data name="database_link" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Aucun record sélectionné</value>
-    <value>..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="LookupControl_NRecords" xml:space="preserve">
    <value>{0} records sélectionnés</value>
  </data>
  <data name="PopupForm_Text" xml:space="preserve">
    <value>Veuillez sélectionner une valeur :</value>
  </data>
  <data name="PopupForm_TextMultiselect" xml:space="preserve">
    <value>Veuillez sélectionner une ou plusieurs valeurs :</value>
  </data>
 </root>
--- a/Controls.LookupGrid/frmLookupGrid.Designer.vb
+++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmLookupGrid
    Inherits DevExpress.XtraEditors.XtraForm
    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmLookupGrid
    '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()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookupGrid))
        Me.gridLookup = New DevExpress.XtraGrid.GridControl()
@@ -36,6 +36,12 @@ Partial Class frmLookupGrid
        'gridLookup
        '
        resources.ApplyResources(Me.gridLookup, "gridLookup")
        Me.gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
        Me.gridLookup.EmbeddedNavigator.Anchor = CType(resources.GetObject("gridLookup.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
        Me.gridLookup.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("gridLookup.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
        Me.gridLookup.EmbeddedNavigator.ImeMode = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
        Me.gridLookup.EmbeddedNavigator.TextLocation = CType(resources.GetObject("gridLookup.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
        Me.gridLookup.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
        Me.gridLookup.MainView = Me.viewLookup
        Me.gridLookup.Name = "gridLookup"
        Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup})
@@ -44,6 +50,7 @@ Partial Class frmLookupGrid
        '
        Me.viewLookup.GridControl = Me.gridLookup
        Me.viewLookup.Name = "viewLookup"
        Me.viewLookup.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
        Me.viewLookup.OptionsView.ShowGroupPanel = False
        '
        'Panel1
--- a/Controls.LookupGrid/frmLookupGrid.aa.resx
+++ b/Controls.LookupGrid/frmLookupGrid.aa.resx
@@ -118,31 +118,44 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TextBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value>..\Resources\TextBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value />
  </data>
-  <data name="iconfinder_Gowalla_324477" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value>..\Resources\iconfinder_Gowalla_324477.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value />
  </data>
-  <data name="DatePicker" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <value>..\Resources\DatePicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
-  <data name="ComboBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>..\Resources\ComboBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Top, Left</value>
  </data>
-  <data name="user_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value>..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value />
  </data>
-  <data name="CheckBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>..\Resources\CheckBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Tile</value>
  </data>
-  <data name="ampel_gelb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>..\Resources\ampel-gelb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Inherit</value>
  </data>
-  <data name="ampel_gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <value>..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
    <value>0, 0</value>
  </data>
-  <data name="ampel_rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <value>..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
    <value />
  </data>
  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
    <value />
  </data>
 </root>
--- a/Controls.LookupGrid/frmLookupGrid.en.resx
+++ b/Controls.LookupGrid/frmLookupGrid.en.resx
@@ -117,12 +117,49 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="btnClear.Text" xml:space="preserve">
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <value>Clear</value>
+  <data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
  <data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>Default</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
    <value>Tile</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>Inherit</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+  <data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>390, 293</value>
+    <value>0, 0</value>
  </data>
  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>Center</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
    <value />
  </data>
  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>None</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
    <value />
  </data>
  <data name="btnClear.Text" xml:space="preserve">
    <value>Clear</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>Choose a value:</value>
--- a/Controls.LookupGrid/frmLookupGrid.fr.resx
+++ b/Controls.LookupGrid/frmLookupGrid.fr.resx
@@ -117,10 +117,10 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="TileGroupDocuments.Text" xml:space="preserve">
+  <data name="btnClear.Text" xml:space="preserve">
-    <value>Documents</value>
+    <value>Vider</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
-    <value>Clipboard Watcher - {0} Profile gefunden</value>
+    <value>Choisissez une valeur :</value>
  </data>
 </root>
--- a/Controls.LookupGrid/frmLookupGrid.resx
+++ b/Controls.LookupGrid/frmLookupGrid.resx
@@ -118,15 +118,36 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="gridLookup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="gridLookup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Fill</value>
+    <value>Top, Bottom, Left, Right</value>
  </data>
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
    <value>True</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>None</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
    <value>None</value>
  </data>
  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
    <value>None</value>
  </data>
  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>Application</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="gridLookup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+    <value>12, 2</value>
  </data>
  <data name="gridLookup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>388, 221</value>
+    <value>364, 225</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="gridLookup.TabIndex" type="System.Int32, mscorlib">
@@ -145,7 +166,7 @@
    <value>0</value>
  </data>
  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 6</value>
+    <value>12, 10</value>
  </data>
  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
    <value>117, 23</value>
@@ -172,7 +193,7 @@
    <value>Top, Right</value>
  </data>
  <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
-    <value>240, 6</value>
+    <value>240, 10</value>
  </data>
  <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
    <value>136, 23</value>
@@ -199,10 +220,13 @@
    <value>Bottom</value>
  </data>
  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 221</value>
+    <value>0, 236</value>
  </data>
  <data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>6, 6, 6, 6</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>388, 40</value>
+    <value>388, 45</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -226,7 +250,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>388, 261</value>
+    <value>388, 281</value>
  </data>
  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
    <value>390, 293</value>
--- a/Controls.LookupGrid/frmLookupGrid.vb
+++ b/Controls.LookupGrid/frmLookupGrid.vb
@@ -22,6 +22,8 @@ Public Class frmLookupGrid
    Private _Grid As GridControl
    Private ReadOnly _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager
    Private colCheckbox As GridColumn
 #Region "Form Events"
    Private Sub frmLookupGrid_Load(sender As Object, e As EventArgs) Handles Me.Load
        _View = viewLookup
@@ -57,12 +59,12 @@ Public Class frmLookupGrid
        If MultiSelect Then
            ' Selected Spalte anpassen
-            Dim oCheckboxColumn = _View.Columns.Item(0)
+            colCheckbox = _View.Columns.Item(0)
            'oCheckboxColumn.Visible = False
-            oCheckboxColumn.Caption = " "
+            colCheckbox.Caption = " "
-            oCheckboxColumn.MaxWidth = 30
+            colCheckbox.MaxWidth = 30
-            oCheckboxColumn.MinWidth = 30
+            colCheckbox.MinWidth = 30
-            oCheckboxColumn.OptionsColumn.AllowFocus = False
+            colCheckbox.OptionsColumn.AllowFocus = False
            Text = _R.GetString("PopupForm_TextMultiselect")
@@ -96,8 +98,16 @@ Public Class frmLookupGrid
        _View.BestFitColumns()
        ' Datenspalte zusätzlich in der Breite anpassen
-        Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
+        Try
-        oDataColumn.BestFit()
+            If _View.Columns.Count = 0 Then
                Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
                oDataColumn.BestFit()
            End If
        Catch ex As ArgumentOutOfRangeException
        Catch ex As Exception
        End Try
    End Sub
    Private Sub frmLookupGrid_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        BringToFront()
@@ -105,14 +115,24 @@ Public Class frmLookupGrid
 #End Region
 #Region "Button Events"
    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        SaveSelectedValues()
+        SaveAndClose()
    End Sub
    Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click
        ClearAndClose()
    End Sub
    Private Sub ClearAndClose()
        SelectedValues = New List(Of String)
        DialogResult = DialogResult.OK
        Close()
    End Sub
-    Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click
+    Private Sub SaveAndClose()
-        SelectedValues = New List(Of String)
+        ' Make sure the currently focused row's state is saved
        viewLookup.PostEditor()
        SaveSelectedValues()
        DialogResult = DialogResult.OK
        Close()
@@ -128,17 +148,29 @@ Public Class frmLookupGrid
    End Sub
    Private Sub HandleCustomKeys(e As KeyEventArgs)
-        If e.KeyCode = Keys.Escape Then
+        Select Case e.KeyCode
-            Close()
+            Case Keys.Escape
                Close()
-        ElseIf e.KeyCode = Keys.F2 Then
+            Case Keys.F2
-            ' Make sure the currently focused row's state is saved
+                SaveAndClose()
            viewLookup.PostEditor()
            SaveSelectedValues()
-            DialogResult = DialogResult.OK
+            Case Keys.Back
-            Close()
+                ClearAndClose()
-        End If
+
            Case Keys.Space
                If MultiSelect Then
                    Dim oHandle = viewLookup.FocusedRowHandle
                    If oHandle >= 0 Then
                        Dim oIsChecked = viewLookup.GetRowCellValue(oHandle, colCheckbox)
                        If oIsChecked Then
                            viewLookup.SetRowCellValue(oHandle, colCheckbox, False)
                        Else
                            viewLookup.SetRowCellValue(oHandle, colCheckbox, True)
                        End If
                    End If
                End If
        End Select
    End Sub
 #End Region
 #Region "View Events"
--- a/Controls.RegexEditor/App.config
+++ b/Controls.RegexEditor/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
-</configuration>
+</configuration>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Controls.RegexEditor/My
+++ b/Controls.RegexEditor/My
@@ -0,0 +1 @@
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/Controls.RegexEditor/RegexEditor.vbproj
+++ b/Controls.RegexEditor/RegexEditor.vbproj
@@ -12,8 +12,9 @@
    <AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -55,11 +56,16 @@
    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      
+    </Reference>
    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="PresentationCore" />
    <Reference Include="System" />
@@ -95,6 +101,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -138,12 +145,6 @@
    </None>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Language\Language.vbproj">
      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
      <Name>Language</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\actions_check.svg" />
  </ItemGroup>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 ' Werte der Assemblyattribute überprüfen
-<Assembly: AssemblyTitle("SnapPanel")>
+<Assembly: AssemblyTitle("DigitalData.SnapPanel")>
-<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyDescription("Integriert ein SnapPanel für das Design von Forms")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
-<Assembly: AssemblyProduct("SnapPanel")>
+<Assembly: AssemblyProduct("DigitalData.SnapPanel")>
-<Assembly: AssemblyCopyright("Copyright ©  2021")>
+<Assembly: AssemblyCopyright("")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("1.0.1.0")>
+<Assembly: AssemblyVersion("2.1.0.0")>
-<Assembly: AssemblyFileVersion("1.0.1.0")>
+<Assembly: AssemblyFileVersion("2.1.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/Controls.SnapPanel/SnapPanel.vb
+++ b/Controls.SnapPanel/SnapPanel.vb
@@ -1,18 +1,28 @@
 Imports System.Drawing
 Imports System.Windows.Forms
 Public Class ClassSnapPanel
    Inherits Panel
    Private _ShowGrid As Boolean = True
    Private _GridSize As Integer = 16
    Private _NeedsScrollUpdate As Boolean = False
    Public Sub New()
        Me.AutoScroll = True
        Me.DoubleBuffered = True ' Flackern reduzieren
    End Sub
    Public Property GridSize As Integer
        Get
            Return _GridSize
        End Get
        Set(value As Integer)
-            _GridSize = value
+            If value > 0 AndAlso value <> _GridSize Then
-            Refresh()
+                _GridSize = value
                Invalidate()
            End If
        End Set
    End Property
@@ -21,36 +31,146 @@ Public Class ClassSnapPanel
            Return _ShowGrid
        End Get
        Set(value As Boolean)
-            _ShowGrid = value
+            If value <> _ShowGrid Then
-            Refresh()
+                _ShowGrid = value
                Invalidate()
            End If
        End Set
    End Property
    Protected Overrides Sub OnControlAdded(e As ControlEventArgs)
        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
        AddHandler e.Control.DragDrop, AddressOf AlignToGrid
        MyBase.OnControlAdded(e)
        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
        AddHandler e.Control.MouseUp, AddressOf AlignToGrid
        ScheduleScrollUpdate()
    End Sub
    Protected Overrides Sub OnControlRemoved(e As ControlEventArgs)
        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
        RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
        MyBase.OnControlRemoved(e)
        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
        RemoveHandler e.Control.MouseUp, AddressOf AlignToGrid
        ScheduleScrollUpdate()
    End Sub
-    Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
+    Protected Overrides Sub OnLayout(levent As LayoutEventArgs)
-        If _ShowGrid Then
+        MyBase.OnLayout(levent)
-            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
+        ScheduleScrollUpdate()
-        End If
+    End Sub
    Protected Overrides Sub OnPaint(e As PaintEventArgs)
        MyBase.OnPaint(e)
        If Not Me.DesignMode AndAlso _ShowGrid Then
            Dim scrollOffset As Point = Me.AutoScrollPosition
            Dim gridRect As New Rectangle(-scrollOffset.X, -scrollOffset.Y, Me.ClientSize.Width, Me.ClientSize.Height)
            ControlPaint.DrawGrid(e.Graphics, gridRect, New Size(_GridSize, _GridSize), Me.BackColor)
        End If
    End Sub
    Private Sub AlignToGrid(sender As Object, e As EventArgs)
-        If _ShowGrid Then
+        If Not _ShowGrid OrElse Me.DesignMode Then Return
-            Dim item As Control = CType(sender, Control)
+
-            Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
+        Dim ctrl As Control = CType(sender, Control)
-            Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
+        Dim x As Integer = Math.Floor(ctrl.Left / _GridSize) * _GridSize
-            item.Location = New Point(x, y)
+        Dim y As Integer = Math.Floor(ctrl.Top / _GridSize) * _GridSize
        ctrl.Location = New Point(x, y)
        ScheduleScrollUpdate()
    End Sub
    Private Sub ScheduleScrollUpdate()
        If Not _NeedsScrollUpdate Then
            _NeedsScrollUpdate = True
            BeginInvoke(New MethodInvoker(Sub()
                                              UpdateScrollArea()
                                              _NeedsScrollUpdate = False
                                          End Sub))
        End If
    End Sub
    Private Sub UpdateScrollArea()
        Dim maxWidth As Integer = 0
        Dim maxHeight As Integer = 0
        For Each ctrl As Control In Me.Controls
            maxWidth = Math.Max(maxWidth, ctrl.Right)
            maxHeight = Math.Max(maxHeight, ctrl.Bottom)
        Next
        Me.AutoScrollMinSize = New Size(maxWidth, maxHeight)
    End Sub
 End Class
 'Public Class ClassSnapPanel
 '    Inherits Panel
 '    Private _ShowGrid As Boolean = True
 '    Private _GridSize As Integer = 16
 '    Public Sub New()
 '        Me.AutoScroll = True ' Scrollbars aktivieren
 '    End Sub
 '    Public Property GridSize As Integer
 '        Get
 '            Return _GridSize
 '        End Get
 '        Set(value As Integer)
 '            _GridSize = value
 '            Refresh()
 '        End Set
 '    End Property
 '    Public Property ShowGrid As Boolean
 '        Get
 '            Return _ShowGrid
 '        End Get
 '        Set(value As Boolean)
 '            _ShowGrid = value
 '            Refresh()
 '        End Set
 '    End Property
 '    Protected Overrides Sub OnControlAdded(e As ControlEventArgs)
 '        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
 '        AddHandler e.Control.DragDrop, AddressOf AlignToGrid
 '        MyBase.OnControlAdded(e)
 '        UpdateScrollArea()
 '    End Sub
 '    Protected Overrides Sub OnControlRemoved(e As ControlEventArgs)
 '        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
 '        RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
 '        MyBase.OnControlRemoved(e)
 '        UpdateScrollArea()
 '    End Sub
 '    Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
 '        If _ShowGrid Then
 '            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
 '        End If
 '        MyBase.OnPaint(e)
 '    End Sub
 '    Private Sub AlignToGrid(sender As Object, e As EventArgs)
 '        If _ShowGrid Then
 '            Dim item As Control = CType(sender, Control)
 '            Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
 '            Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
 '            item.Location = New Point(x, y)
 '            UpdateScrollArea()
 '        End If
 '    End Sub
 '    Private Sub UpdateScrollArea()
 '        Dim maxWidth As Integer = 0
 '        Dim maxHeight As Integer = 0
 '        ' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen
 '        For Each ctrl As Control In Controls
 '            Dim right As Integer = ctrl.Right
 '            Dim bottom As Integer = ctrl.Bottom
 '            If right > maxWidth Then maxWidth = right
 '            If bottom > maxHeight Then maxHeight = bottom
 '        Next
 '        ' Scrollbereich setzen
 '        Me.AutoScrollMinSize = New Size(maxWidth, maxHeight)
 '    End Sub
 'End Class
--- a/Controls.SnapPanel/SnapPanel.vbproj
+++ b/Controls.SnapPanel/SnapPanel.vbproj
@@ -10,7 +10,7 @@
    <AssemblyName>DigitalData.Controls.SnapPanel</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
--- a/DBCleaner/App.config
+++ b/DBCleaner/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="DBCleaner.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="DBCleaner.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
    </startup>
    <userSettings>
        <DBCleaner.My.MySettings>
@@ -27,4 +27,4 @@
            </setting>
        </DBCleaner.My.MySettings>
    </userSettings>
-</configuration>
+</configuration>
--- a/DBCleaner/DBCleaner.vbproj
+++ b/DBCleaner/DBCleaner.vbproj
@@ -11,9 +11,10 @@
    <AssemblyName>DBCleaner</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,14 +50,14 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
@@ -99,6 +100,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
+'     Dieser Code wurde von einem Tool generiert.
-'     Runtime Version:4.0.30319.42000
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     the code is regenerated.
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
@@ -13,15 +13,15 @@ Option Explicit On
 Namespace My
-
+    
-    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
-    ' or if you encounter build errors in this file, go to the Project Designer
+    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
-    ' (go to Project Properties or double-click the My Project node in
+    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
-    ' Solution Explorer), and make changes on the Application tab.
+    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
    '
    Partial Friend Class MyApplication
-
+        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Public Sub New()
            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
            Me.IsSingleInstance = false
@@ -29,8 +29,8 @@ Namespace My
            Me.SaveMySettingsOnExit = true
            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
        End Sub
-
+        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Protected Overrides Sub OnCreateMainForm()
            Me.MainForm = Global.DBCleaner.Form1
        End Sub
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1,40 +1,41 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
+'     Dieser Code wurde von einem Tool generiert.
-'     Runtime Version:4.0.30319.42000
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     the code is regenerated.
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Imports System
 Namespace My.Resources
-
+    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    'class via a tool like ResGen or Visual Studio.
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'with the /str option, or rebuild your VS project.
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
    Friend Module Resources
-
+        
        Private resourceMan As Global.System.Resources.ResourceManager
-
+        
        Private resourceCulture As Global.System.Globalization.CultureInfo
-
+        
        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -44,17 +45,17 @@ Namespace My.Resources
                Return resourceMan
            End Get
        End Property
-
+        
        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        '''  resource lookups using this strongly typed resource class.
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend Property Culture() As Global.System.Globalization.CultureInfo
            Get
                Return resourceCulture
            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
+            Set
                resourceCulture = value
            End Set
        End Property
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/DBCleaner/packages.config
+++ b/DBCleaner/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net48" />
 </packages>
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -1,30 +1,16 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.29728.190
+VisualStudioVersion = 17.4.33103.184
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GUIs", "GUIs", "{8FFE925E-8B84-45F1-93CB-32B1C96F41EB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setups", "Setups", "{D887B4BE-E457-4E45-8E22-D086E92DD2B7}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMDesigner", "GUIs.Test.EDMDesigner\EDMDesigner.vbproj", "{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging", "Modules.Logging\Logging.vbproj", "{903B2D7D-3B80-4BE9-8713-7447B704E1B0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windream", "Modules.Windream\Windream.vbproj", "{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7AF3F9C2-C939-4A08-95C1-0453207E298A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestGUI", "GUIs.Test.TestGUI\TestGUI.vbproj", "{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Database", "Modules.Database\Database.vbproj", "{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDTestService", "DDTestService\DDTestService.vbproj", "{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Config", "Modules.Config\Config.vbproj", "{44982F9B-6116-44E2-85D0-F39650B1EF99}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{F98C0329-C004-417F-B2AB-7466E88D8220}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControl", "Controls.LookupGrid\LookupControl.vbproj", "{3DCD6D1A-C830-4241-B7E4-27430E7EA483}"
@@ -38,72 +24,38 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{59
 		QUARTZ-LICENSE.txt = QUARTZ-LICENSE.txt
 	EndProjectSection
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging.Test", "Modules.Logging.Test\Logging.Test.vbproj", "{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Interfaces", "Modules.Interfaces\Interfaces.vbproj", "{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZUGFeRDTest", "GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj", "{16156434-E471-43F1-8030-76A0DA17CD5A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUIs.Test.GUI_EDMI\GUI_EDMI.vbproj", "{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "GUIs.ClientSuite\ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ADSyncTest", "GUIs.Test.ADSyncTest\ADSyncTest.vbproj", "{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GUIs.Test", "GUIs.Test", "{CC368D6A-6AC4-4EB9-A092-14700FABEF7A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JobRunner", "Service.JobRunner\JobRunner.vbproj", "{926E6474-5613-4373-BB99-B101158B91EF}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Language", "Modules.Language\Language.vbproj", "{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RegexEditor", "Controls.RegexEditor\RegexEditor.vbproj", "{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windows", "Windows\Windows.vbproj", "{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Automation", "Automation\Automation.vbproj", "{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Common", "GUIs.Common\Common.vbproj", "{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "Modules.ZooFlow\ZooFlow.vbproj", "{81CAC44F-3711-4C8F-AE98-E02A7448782A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Patterns", "Modules.Patterns\Patterns.vbproj", "{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Modules.Messaging\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClipboardWatcher", "GUIs.ClipboardWatcher\ClipboardWatcher.vbproj", "{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Modules.Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Modules.Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem.Test", "Modules\Filesystem.Test\Filesystem.Test.vbproj", "{B29ED6D4-839B-413A-A485-B10F4A4788EA}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.GraphQLTest", "GUIs.Test.GraphQLTest\GUIs.Test.GraphQLTest.vbproj", "{609B09B4-AD1E-40F7-8899-A6685924621C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "Modules.EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService", "Service.EDMIService\EDMIService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "Services.EmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "Services.CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDZUGFeRDService", "Services.ZUGFeRDService\DDZUGFeRDService.vbproj", "{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "Services.LicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.EDMIBenchmark", "GUIs.Test.EDMIBenchmark\GUIs.Test.EDMIBenchmark.vbproj", "{5FDEC007-7AE0-4829-B1AE-6165E29375DA}"
 EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ChatServer", "ChatServer\ChatServer.vbproj", "{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatClient", "ChatClient\ChatClient.vbproj", "{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatControl", "Controls.ChatControl\ChatControl.vbproj", "{1F278760-4F6B-42E8-B82D-01D4C8618340}"
@@ -112,35 +64,17 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatNewConv", "Controls.Cha
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatAddUser", "Controls.ChatAddUser\ChatAddUser.vbproj", "{F0A807CC-BE14-4B5B-9200-27C16156BD8A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualDrive", "VirtualDrive\VirtualDrive.csproj", "{83795524-2512-4C04-BD57-4847230943A7}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SnapPanel", "Controls.SnapPanel\SnapPanel.vbproj", "{3E19C413-3197-4635-944E-558FC04C3475}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File", "Modules.EDMI.File\EDMI.File.vbproj", "{1477032D-7A02-4C5F-B026-A7117DA4BC6B}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File.Test", "Modules.EDMI.File.Test\EDMI.File.Test.vbproj", "{16857A4E-2609-47E6-9C35-7669D64DD040}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GlobalIndexer", "GUIs.GlobalIndexer\GlobalIndexer.vbproj", "{40384B94-1F94-4249-9A5A-D02E0B346738}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SQLConfig", "SQLConfig\SQLConfig.vbproj", "{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Monitor", "GUIs.Monitor\Monitor.vbproj", "{E24E8D40-0361-4C07-8FAE-3621DE316E70}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MonoRepoUtils", "ConfigCreator\MonoRepoUtils.vbproj", "{9D4AC920-C78E-41C3-994E-91690FF79380}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Encryption", "Encryption\Encryption.vbproj", "{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Config.Test", "Config.Test\Config.Test.vbproj", "{B9A63193-1391-4E20-B578-0867F330396C}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DBCleaner", "DBCleaner\DBCleaner.vbproj", "{5A7913CE-7D3D-4E84-B23D-4747C178CD71}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Mailfunctions", "Mailfunctions\Mailfunctions.vbproj", "{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMIService.Tests\EDMIService.Tests.vbproj", "{E3DA65CA-964D-4896-991A-B5426884E215}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Base", "Modules.Base\Base\Base.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "..\DDModules\Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterReader", "FilterReader\FilterReader.csproj", "{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -148,62 +82,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}.Release|Any CPU.Build.0 = Release|Any CPU
 		{903B2D7D-3B80-4BE9-8713-7447B704E1B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{903B2D7D-3B80-4BE9-8713-7447B704E1B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{903B2D7D-3B80-4BE9-8713-7447B704E1B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{903B2D7D-3B80-4BE9-8713-7447B704E1B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Release|Any CPU.Build.0 = Release|Any CPU
 		{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44982F9B-6116-44E2-85D0-F39650B1EF99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44982F9B-6116-44E2-85D0-F39650B1EF99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44982F9B-6116-44E2-85D0-F39650B1EF99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44982F9B-6116-44E2-85D0-F39650B1EF99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -212,58 +102,22 @@ Global
 		{926E6474-5613-4373-BB99-B101158B91EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{926E6474-5613-4373-BB99-B101158B91EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{926E6474-5613-4373-BB99-B101158B91EF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Release|Any CPU.Build.0 = Release|Any CPU
 		{81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{609B09B4-AD1E-40F7-8899-A6685924621C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{609B09B4-AD1E-40F7-8899-A6685924621C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{609B09B4-AD1E-40F7-8899-A6685924621C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -272,10 +126,6 @@ Global
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -284,10 +134,6 @@ Global
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -300,10 +146,6 @@ Global
 		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -320,129 +162,61 @@ Global
 		{F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83795524-2512-4C04-BD57-4847230943A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83795524-2512-4C04-BD57-4847230943A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83795524-2512-4C04-BD57-4847230943A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83795524-2512-4C04-BD57-4847230943A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E19C413-3197-4635-944E-558FC04C3475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E19C413-3197-4635-944E-558FC04C3475}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E19C413-3197-4635-944E-558FC04C3475}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E19C413-3197-4635-944E-558FC04C3475}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40384B94-1F94-4249-9A5A-D02E0B346738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40384B94-1F94-4249-9A5A-D02E0B346738}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40384B94-1F94-4249-9A5A-D02E0B346738}.Release|Any CPU.Build.0 = Release|Any CPU
 		{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65EFB268-C0E0-40C1-8981-9F70DEE5C74A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E24E8D40-0361-4C07-8FAE-3621DE316E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E24E8D40-0361-4C07-8FAE-3621DE316E70}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E24E8D40-0361-4C07-8FAE-3621DE316E70}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E24E8D40-0361-4C07-8FAE-3621DE316E70}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D4AC920-C78E-41C3-994E-91690FF79380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D4AC920-C78E-41C3-994E-91690FF79380}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D4AC920-C78E-41C3-994E-91690FF79380}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D4AC920-C78E-41C3-994E-91690FF79380}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9A63193-1391-4E20-B578-0867F330396C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9A63193-1391-4E20-B578-0867F330396C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9A63193-1391-4E20-B578-0867F330396C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9A63193-1391-4E20-B578-0867F330396C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3DA65CA-964D-4896-991A-B5426884E215}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{5284F4E5-A6C1-4BCF-896F-3ABEA985B741} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{903B2D7D-3B80-4BE9-8713-7447B704E1B0} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{4C86DF8F-A280-40D4-85B0-10B1BF66C15C} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{EAF0EA75-5FA7-485D-89C7-B2D843B03A96} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{44982F9B-6116-44E2-85D0-F39650B1EF99} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{16156434-E471-43F1-8030-76A0DA17CD5A} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{D3C8CFED-D6F6-43A8-9BDF-454145D0352F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{81CAC44F-3711-4C8F-AE98-E02A7448782A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{0958CDDF-4A16-41F6-8837-8335F71D599C} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{991D0231-4623-496D-8BD0-9CA906029CBC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}
 		{25017513-0D97-49D3-98D7-BA76D9B251B0} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{5FDEC007-7AE0-4829-B1AE-6165E29375DA} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{1F278760-4F6B-42E8-B82D-01D4C8618340} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{86D27FFA-480F-481D-8D23-26DEAE92FE6C} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{F0A807CC-BE14-4B5B-9200-27C16156BD8A} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{83795524-2512-4C04-BD57-4847230943A7} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{3E19C413-3197-4635-944E-558FC04C3475} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{40384B94-1F94-4249-9A5A-D02E0B346738} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{65EFB268-C0E0-40C1-8981-9F70DEE5C74A} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{E24E8D40-0361-4C07-8FAE-3621DE316E70} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{8A8F20FC-C46E-41AC-BEE7-218366CFFF99} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B9A63193-1391-4E20-B578-0867F330396C} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
-		{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{10C922FB-DD8D-4E0B-A50C-30EE658FBDDC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}
--- a/Database.Cached/Database.Cached.vbproj
+++ b/Database.Cached/Database.Cached.vbproj
@@ -1,129 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{E0DC883D-FAE1-4103-B2BA-043EBE697B09}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>Database.Cached</RootNamespace>
    <AssemblyName>Database.Cached</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <Deterministic>true</Deterministic>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>Database.Cached.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>Database.Cached.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <OptionExplicit>On</OptionExplicit>
  </PropertyGroup>
  <PropertyGroup>
    <OptionCompare>Binary</OptionCompare>
  </PropertyGroup>
  <PropertyGroup>
    <OptionStrict>Off</OptionStrict>
  </PropertyGroup>
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Transactions" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
    <Import Include="System.Collections" />
    <Import Include="System.Collections.Generic" />
    <Import Include="System.Data" />
    <Import Include="System.Diagnostics" />
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MSSQLServerCached.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Modules.Database\Database.vbproj">
      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
      <Name>Database</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
      <Project>{25017513-0d97-49d3-98d7-ba76d9b251b0}</Project>
      <Name>EDMI.API</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Database.Cached/MSSQLServerCached.vb
+++ b/Database.Cached/MSSQLServerCached.vb
@@ -1,63 +0,0 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.Logging
 Public Class MSSQLServerCached
    Private _Logger As Logger
    Private _Client As Client
    Private _DatabaseEDM As MSSQLServer
    Private _DatabaseIDB As MSSQLServer
    Private _Type As DatabaseType
    Public Enum DatabaseType
        ECM
        IDB
    End Enum
    Public Sub New(LogConfig As LogConfig, Client As Client, DatabaseECM As MSSQLServer, DatabaseIDB As MSSQLServer)
        _Logger = LogConfig.GetLogger()
        _Client = Client
        _DatabaseEDM = DatabaseECM
        _DatabaseIDB = DatabaseIDB
    End Sub
    Public Function GetDatatable(DataTable As String, FilterExpression As String, SortByColumn As String, FallbackSQL As String, FallbackType As DatabaseType, Optional ForceFallback As Boolean = False) As DataTable
        Try
            Dim oResult As DataTable = Nothing
            If ForceFallback = False Then
                Dim oTableResult As TableResult = _Client.GetDatatableByName(DataTable, FilterExpression, SortByColumn)
                If oTableResult Is Nothing OrElse oTableResult.OK = False Then
                    _Logger.Warn("Datatable [{0}] could not be fetched from AppServer Cache. Falling back to direct Database Access.")
                End If
            Else
                Return GetDatatableFromDatabase(FallbackSQL, FallbackType)
            End If
        Catch ex As Exception
            _Logger.Error(ex)
            Return Nothing
        End Try
    End Function
    Private Function GetDatatableFromDatabase(SQLCommand As String, DatabaseType As DatabaseType)
        Try
            Select Case DatabaseType
                Case DatabaseType.ECM
                    Return _DatabaseEDM.GetDatatable(SQLCommand)
                Case DatabaseType.IDB
                    Return _DatabaseIDB.GetDatatable(SQLCommand)
                Case Else
                    Return Nothing
            End Select
        Catch ex As Exception
            _Logger.Error(ex)
            Return Nothing
        End Try
    End Function
 End Class
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -1,13 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <MySubMain>false</MySubMain>
  <SingleInstance>false</SingleInstance>
  <ShutdownMode>0</ShutdownMode>
  <EnableVisualStyles>true</EnableVisualStyles>
  <AuthenticationMode>0</AuthenticationMode>
  <ApplicationType>1</ApplicationType>
  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
 </MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,35 +0,0 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 ' Allgemeine Informationen über eine Assembly werden über die folgenden
 ' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 ' die einer Assembly zugeordnet sind.
 ' Werte der Assemblyattribute überprüfen
 <Assembly: AssemblyTitle("Database.Cached")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Database.Cached")>
 <Assembly: AssemblyCopyright("Copyright ©  2021")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(False)>
 'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("3187e779-93ae-46cd-bf38-b123a7bf1f92")>
 ' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
 '
 '      Hauptversion
 '      Nebenversion
 '      Buildnummer
 '      Revision
 '
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 <Assembly: AssemblyVersion("1.0.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1,62 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Namespace My.Resources
    'This class was auto-generated by the StronglyTypedResourceBuilder
    'class via a tool like ResGen or Visual Studio.
    'To add or remove a member, edit your .ResX file then rerun ResGen
    'with the /str option, or rebuild your VS project.
    '''<summary>
    '''  A strongly-typed resource class, for looking up localized strings, etc.
    '''</summary>
    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
    Friend Module Resources
        Private resourceMan As Global.System.Resources.ResourceManager
        Private resourceCulture As Global.System.Globalization.CultureInfo
        '''<summary>
        '''  Returns the cached ResourceManager instance used by this class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Database.Cached.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
            End Get
        End Property
        '''<summary>
        '''  Overrides the current thread's CurrentUICulture property for all
        '''  resource lookups using this strongly typed resource class.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Friend Property Culture() As Global.System.Globalization.CultureInfo
            Get
                Return resourceCulture
            End Get
            Set(ByVal value As Global.System.Globalization.CultureInfo)
                resourceCulture = value
            End Set
        End Property
    End Module
 End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -1,117 +0,0 @@
 <?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.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: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" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
            </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" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
            </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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -1,73 +0,0 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 Option Strict On
 Option Explicit On
 Namespace My
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
        Private Shared addedHandler As Boolean
        Private Shared addedHandlerLockObject As New Object
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
            If My.Application.SaveMySettingsOnExit Then
                My.Settings.Save()
            End If
        End Sub
 #End If
 #End Region
        Public Shared ReadOnly Property [Default]() As MySettings
            Get
 #If _MyType = "WindowsForms" Then
                   If Not addedHandler Then
                        SyncLock addedHandlerLockObject
                            If Not addedHandler Then
                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
                                addedHandler = True
                            End If
                        End SyncLock
                    End If
 #End If
                Return defaultInstance
            End Get
        End Property
    End Class
 End Namespace
 Namespace My
    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
    Friend Module MySettingsProperty
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
        Friend ReadOnly Property Settings() As Global.Database.Cached.My.MySettings
            Get
                Return Global.Database.Cached.My.MySettings.Default
            End Get
        End Property
    End Module
 End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -1,7 +0,0 @@
 <?xml version='1.0' encoding='utf-8'?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
  <Profiles>
    <Profile Name="(Default)" />
  </Profiles>
  <Settings />
 </SettingsFile>
--- a/Database.Cached/app.config
+++ b/Database.Cached/app.config
@@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/Database.Cached/packages.config
+++ b/Database.Cached/packages.config
@@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="NLog" version="4.7.5" targetFramework="net461" />
 </packages>
--- a/EDMIService.Tests/EDMIService.Tests.vbproj
+++ b/EDMIService.Tests/EDMIService.Tests.vbproj
@@ -52,14 +52,38 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
      <HintPath>..\packages\Quartz.3.5.0\lib\net472\Quartz.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Remoting" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
@@ -104,6 +128,7 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
--- a/EDMIService.Tests/UnitTest1.vb
+++ b/EDMIService.Tests/UnitTest1.vb
@@ -1,9 +1,18 @@
-Imports System.Text
+Imports System.Security.Principal
 Imports System.Text
 Imports Microsoft.VisualStudio.TestTools.UnitTesting
 Imports Quartz
 <TestClass()> Public Class UnitTest1
    <TestMethod()> Public Sub TestMethod1()
        Dim oCronTrigger As ITrigger
        Dim oInitTrigger As ITrigger
        oCronTrigger = TriggerBuilder.Create().
                       WithIdentity("Identity1").
                       WithCronSchedule("0 0 0/1 * * ?").
                       Build()
    End Sub
 End Class
--- a/Modules.Interfaces/app.config
+++ b/Modules.Interfaces/app.config
@@ -3,8 +3,8 @@
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/EDMIService.Tests/packages.config
+++ b/EDMIService.Tests/packages.config
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />
  <package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net472" />
  <package id="MSTest.TestFramework" version="2.1.1" targetFramework="net472" />
  <package id="Quartz" version="3.5.0" targetFramework="net472" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net472" />
 </packages>
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							`DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`
		`@@ -0,0 +1 @@`
							`DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`