Upgrade .NET8 ZugferdTest

Vor Update .net8
Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo
2025-12-30 12:03:59 +01:00 · 2025-12-29 12:36:19 +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 · 2025-12-23 12:51:12 +01:00
51 changed files with 3557 additions and 603 deletions
--- a/.github/upgrades/dotnet-upgrade-plan.md
+++ b/.github/upgrades/dotnet-upgrade-plan.md
@@ -0,0 +1,29 @@
+# .NET 8.0 Upgrade Plan
+
+## Execution Steps
+
+Execute steps below sequentially one by one in the order they are listed.
+
+1. Validate that an .NET 8.0 SDK required for this upgrade is installed on the machine and if not, help to get it installed.
+2. Ensure that the SDK version specified in global.json files is compatible with the .NET 8.0 upgrade.
+3. Upgrade GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj
+
+## Settings
+
+This section contains settings and data used by execution steps.
+
+### Excluded projects
+
+Table below contains projects that do belong to the dependency graph for selected projects and should not be included in the upgrade.
+
+| Project name | Description |
+|:-------------|:-----------:|
+| –            | Keine Projekte ausgeschlossen |
+
+### Project upgrade details
+This section contains details about each project upgrade and modifications that need to be done in the project.
+
+#### GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj modifications
+
+Project properties changes:
+  - Keine Änderungen erforderlich. Das Projekt zielt bereits auf `net8.0-windows` und verwendet kompatible Pakete.
--- a/Controls.DocumentViewer/App.config
+++ b/Controls.DocumentViewer/App.config
@@ -23,7 +23,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <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" />
@@ -39,7 +39,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Controls.DocumentViewer/Classes/Annotations.vb
+++ b/Controls.DocumentViewer/Classes/Annotations.vb
@@ -1,5 +1,4 @@
-Imports System.Drawing
-Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Imports GdPicture14.Annotations
--- a/Controls.DocumentViewer/DocumentViewer.Designer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb
@@ -1,7 +1,4 @@
-Imports System.Windows.Controls
-Imports System.Windows.Forms
-
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class DocumentViewer
    Inherits System.Windows.Forms.UserControl

@@ -27,7 +24,6 @@ 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.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
        Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
@@ -77,82 +73,6 @@ Partial Class DocumentViewer
        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.EnableFuzzySearch = False
-        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(841, 522)
-        Me.GdViewer.TabIndex = 0
-        Me.GdViewer.TabStop = False
-        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"
@@ -426,7 +346,7 @@ Partial Class DocumentViewer
        '
        'SpreadsheetControl1
        '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(31, 152)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177)
        Me.SpreadsheetControl1.MenuManager = Me.BarManager1
        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
        Me.SpreadsheetControl1.ReadOnly = True
@@ -457,31 +377,17 @@ Partial Class DocumentViewer
        '
        'RichEditControl1
        '
-        Me.RichEditControl1.Location = New System.Drawing.Point(395, 238)
+        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
        '
-        'lblInfo
-        '
-        Me.lblInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.lblInfo.AutoSize = True
-        Me.lblInfo.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblInfo.ForeColor = System.Drawing.Color.Red
-        Me.lblInfo.Location = New System.Drawing.Point(3, 533)
-        Me.lblInfo.Name = "lblInfo"
-        Me.lblInfo.Size = New System.Drawing.Size(47, 15)
-        Me.lblInfo.TabIndex = 10
-        Me.lblInfo.Text = "Infotext"
-        '
        'DocumentViewer
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.SystemColors.ControlLightLight
-        Me.Controls.Add(Me.lblInfo)
        Me.Controls.Add(Me.RichEditControl1)
        Me.Controls.Add(Me.lbFileNotLoaded)
        Me.Controls.Add(Me.SpreadsheetControl1)
@@ -507,7 +413,7 @@ Partial Class DocumentViewer
    Friend WithEvents GdViewer As GdPicture14.GdViewer
    Friend WithEvents OpenFileDialog As OpenFileDialog
    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
-    Friend WithEvents PrintDocument1 As Drawing.Printing.PrintDocument
+    Friend WithEvents PrintDocument1 As Printing.PrintDocument
    Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
    Friend WithEvents ToolbarDocumentViewer As DevExpress.XtraBars.Bar
    Friend WithEvents buttonPrint As DevExpress.XtraBars.BarButtonItem
@@ -544,5 +450,5 @@ Partial Class DocumentViewer
    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 System.Windows.Forms.Label
+    Friend WithEvents lblInfo As Label
 End Class
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@@ -164,6 +164,26 @@
        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">
@@ -226,26 +246,6 @@
        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</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>
  <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
@@ -7,8 +7,6 @@ Imports GdPicture14
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
 Imports DigitalData.Modules.Config
-Imports System.Windows.Forms
-Imports System.Drawing

 Public Class DocumentViewer
    Private Enum ZoomMode
@@ -68,6 +66,8 @@ Public Class DocumentViewer
    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
@@ -112,7 +112,8 @@ Public Class DocumentViewer
            _licenseKey = pLicenseKey
            _licenseManager.RegisterKEY(_licenseKey)
            _Annotations = New Annotations(pLogConfig)
-            _Search = New Search(pLogConfig, GdViewer)
+            ' Defer creating Search until GdViewer is ready
+            EnsureSearchInitialized()
            _ToolbarSettings = pToolbarSettings

            Dim oConfigPath = ConfigPath()
@@ -124,6 +125,17 @@ Public Class DocumentViewer
        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>
    ''' Load a file from a path and display it
    ''' </summary>
@@ -225,7 +237,17 @@ 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
@@ -301,23 +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
        GdViewer.DisplayPreviousPage()
    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
        GdViewer.DisplayNextPage()
    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
@@ -354,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

@@ -383,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
@@ -482,6 +504,14 @@ Public Class DocumentViewer
            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
@@ -491,6 +521,16 @@ Public Class DocumentViewer
                _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
@@ -556,16 +596,191 @@ Public Class DocumentViewer
            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()
-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
+        If Not GdViewer Is Nothing Then
+            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
+        End If
    End Sub

    Private Sub FitToWidth()
-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        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 Extension.ToUpper
+
+                Case ".CSV"
+                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    If Not GdViewer Is Nothing Then
+                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                        If Viewer_ForceTemporaryMode = True Then
+                            GdViewer.ForceTemporaryMode = True
+                        End If
+                        GdViewer.AnnotationDropShadow = True
+
+                        GdViewer.DisplayFromStream(Stream)
+                    End If
+
+
+            End Select
+
+            UpdateMainUi()
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+    Private Function StreamFile(Stream As Stream, Extension As String) As Boolean
        Try

            SpreadsheetControl1.Visible = False
@@ -585,9 +800,7 @@ Public Class DocumentViewer
                Case Else
                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    If Viewer_ForceTemporaryMode = True Then
-                        GdViewer.ForceTemporaryMode = True
-                    End If
+                    GdViewer.ForceTemporaryMode = True
                    GdViewer.AnnotationDropShadow = True

                    GdViewer.DisplayFromStream(Stream)
@@ -705,18 +918,21 @@ Public Class DocumentViewer
    End Sub

    Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
-        If Not String.IsNullOrEmpty(txtSearch.EditValue) Then
+        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
-        _Search.PrevHighlight()
+        EnsureSearchInitialized()
+        _Search?.PrevHighlight()
    End Sub

    Private Sub btnNextHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnNextHighlight.ItemClick
-        _Search.NextHighlight()
+        EnsureSearchInitialized()
+        _Search?.NextHighlight()
    End Sub

    Private Sub txtSearch_EditValueChanged(sender As Object, e As EventArgs) Handles txtSearch.EditValueChanged
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -1,133 +1,357 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?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>
-    <RootNamespace>DigitalData.Controls.DocumentViewer</RootNamespace>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <MyType>Windows</MyType>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0958CDDF-4A16-41F6-8837-8335F71D599C}</ProjectGuid>
    <OutputType>Library</OutputType>
+    <StartupObject>
+    </StartupObject>
+    <RootNamespace>DigitalData.Controls.DocumentViewer</RootNamespace>
    <AssemblyName>DigitalData.Controls.DocumentViewer</AssemblyName>
-    <AssemblyTitle>Provides the documentviewer for Digital Data products</AssemblyTitle>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Product>$(AssemblyName)</Product>
-    <Title>$(AssemblyName)</Title>
-    <AssemblyVersion>2.5.0</AssemblyVersion>
-    <FileVersion>2.5.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </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>DigitalData.Controls.DocumentViewer.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>DigitalData.Controls.DocumentViewer.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="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" />
+    <Reference Include="DevExpress.DataAccess.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Images.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataVisualization.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Spreadsheet.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <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" />
+    <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <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="DigitalData.Modules.Base">
-      <HintPath>..\..\DDModules\Base\bin\Debug\net8.0-windows\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Messaging">
-      <HintPath>..\..\DDModules\Messaging\bin\Debug\net8.0-windows\DigitalData.Modules.Messaging.dll</HintPath>
+      <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="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <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" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="DevExpress.Charts.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Data.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.DataAccess.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataAccess.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Images.v21.2">
-     <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Images.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Office.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Office.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Pdf.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Pdf.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Printing.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Printing.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.RichEdit.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.RichEdit.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.DataVisualization.v21.2.Core">
-     <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.DataVisualization.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Spreadsheet.v21.2.Core">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.Spreadsheet.v21.2.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Data.Desktop.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Data.Desktop.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Utils.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Utils.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraBars.v21.2">
-     <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraBars.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraCharts.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Standard\DevExpress.XtraCharts.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraEditors.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraGrid.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraGrid.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraLayout.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraLayout.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraNavBar.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraNavBar.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraPrinting.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraRichEdit.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraRichEdit.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraSpreadsheet.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraSpreadsheet.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraTreeList.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraTreeList.v21.2.dll</HintPath>
-    </Reference>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
-    <PackageReference Include="DocumentFormat.OpenXml.Framework" Version="3.2.0" />
-    <PackageReference Include="GdPicture" Version="14.3.3" />
-    <PackageReference Include="GdPicture.runtimes.windows" Version="14.3.3" />
-    <PackageReference Include="IndexRange" Version="1.0.3" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
-    <PackageReference Include="NLog" Version="6.0.4" />
-    <PackageReference Include="OpenMcdf" Version="3.0.0" />
-    <PackageReference Include="protobuf-net" Version="3.2.46" />
-    <PackageReference Include="protobuf-net.Core" Version="3.2.46" />
-    <PackageReference Include="RtfPipe" Version="2.0.7677.4303" />
-    <PackageReference Include="System.Buffers" Version="4.6.0" />
-    <PackageReference Include="System.CodeDom" Version="8.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.IO.Packaging" Version="8.0.1" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="System.Management" Version="9.0.9" />
-    <PackageReference Include="System.Memory" Version="4.6.0" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <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="Classes\Annotations.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="DocumentViewer.Designer.vb">
+      <DependentUpon>DocumentViewer.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DocumentViewer.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="frmViewerSettings.Designer.vb">
+      <DependentUpon>frmViewerSettings.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmViewerSettings.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <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>
+      <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>
+    <Compile Include="Classes\Search.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DocumentViewer.resx">
+      <DependentUpon>DocumentViewer.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmViewerSettings.resx">
+      <DependentUpon>frmViewerSettings.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <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>
+    <None Include="packages.config" />
+    <None Include="Resources\ZooFlow-10.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\floatingobjectoutlinecolor.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\tooltips.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\tooltips1.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\viewsettings.svg" />
+    <None Include="Resources\next.svg" />
+    <None Include="Resources\prev.svg" />
+    <None Include="Resources\doublelast.svg" />
+    <None Include="Resources\doublefirst.svg" />
+    <None Include="Resources\flipimage_vertical.svg" />
+    <None Include="Resources\flipimage_horizontal.svg" />
+    <None Include="Resources\zoomin.svg" />
+    <None Include="Resources\fittopage.svg" />
+    <None Include="Resources\fittowidth.svg" />
+    <None Include="Resources\rotateclockwise.svg" />
+    <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/My
+++ b/Controls.DocumentViewer/My
@@ -1,9 +1,35 @@
 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("DigitalData.DocumentViewer")>
+<Assembly: AssemblyDescription("Stellt den Digital Data DocumentViewer für Applikationen zur Verfügung")>
+<Assembly: AssemblyCompany("Digutal Data GmbH, Heuchelheim")>
+<Assembly: AssemblyProduct("DigitalData.DocumentViewer")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <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("cbd5c9fc-8578-4a74-807b-0a8352bf0150")>
+
+' 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("2.6.0.0")>
+<Assembly: AssemblyFileVersion("2.6.0.0")>
--- a/Controls.DocumentViewer/frmViewerSettings.Designer.vb
+++ b/Controls.DocumentViewer/frmViewerSettings.Designer.vb
@@ -1,6 +1,4 @@
-Imports System.Windows.Forms
-
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmViewerSettings
    Inherits System.Windows.Forms.Form

--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <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
@@ -1,44 +1,188 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?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>
-    <RootNamespace>DigitalData.Controls.LookupGrid</RootNamespace>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <MyType>Windows</MyType>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</ProjectGuid>
    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Controls.LookupGrid</RootNamespace>
    <AssemblyName>DigitalData.Controls.LookupGrid</AssemblyName>
-    <AssemblyTitle>Provides functionality of LookUpGrid for DD products</AssemblyTitle>
-    <Company>Digital Data GmbH</Company>
-    <Title>$(AssemblyName)</Title>
-    <Product>$(AssemblyName)</Product>
-    <AssemblyVersion>3.5.0</AssemblyVersion>
-    <FileVersion>3.5.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Controls.LookupGrid.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>DigitalData.Controls.LookupGrid.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="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
+      <EmbedInteropTypes>False</EmbedInteropTypes>
    </Reference>
+    <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <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" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <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>
-    <Reference Include="DevExpress.Data.Desktop.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Data.Desktop.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Data.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Utils.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.Utils.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraEditors.v21.2.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraGrid.v21.2">
-      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\NetCore\DevExpress.XtraGrid.v21.2.dll</HintPath>
-    </Reference>
+    <Compile Include="frmLookupGrid.Designer.vb">
+      <DependentUpon>frmLookupGrid.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmLookupGrid.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LookupGridLocalizer.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <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>
+      <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>
+    <Compile Include="LookupControl3.Designer.vb">
+      <DependentUpon>LookupControl3.vb</DependentUpon>
+    </Compile>
+    <Compile Include="LookupControl3.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Resources\Strings.en.Designer.vb">
+      <DependentUpon>Strings.en.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Resources\Strings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </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>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.en.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <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>
+      <LastGenOutput>Strings.Designer.vb</LastGenOutput>
+    </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>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{94E38DFF-614B-4CBD-B67C-F211BB35CE8B}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Controls.LookupGrid/LookupControl3.vb
+++ b/Controls.LookupGrid/LookupControl3.vb
@@ -10,7 +10,6 @@ Imports DevExpress.Accessibility
 Imports DevExpress.XtraEditors.Controls
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Columns
-Imports System.Data

 <ToolboxItem(True)>
 Public Class LookupControl3
@@ -275,7 +274,7 @@ Public Class RepositoryItemLookupControl3
            Using oForm = GetLookupForm()
                Dim oResult = oForm.ShowDialog()

-                If oResult = System.Windows.Forms.DialogResult.OK Then
+                If oResult = Windows.Forms.DialogResult.OK Then
                    Dim oValues = oForm.SelectedValues
                    UpdateSelectedValues(oValues)

--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 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("LookupGrid")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("LookupGrid")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
 <Assembly: AssemblyTrademark("3.4.3.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("29cb2b66-3763-4f79-8e4b-6e15fdcae4b6")>
+
+' 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("3.4.3.0")>
+<Assembly: AssemblyFileVersion("3.4.3.0")>
--- a/Controls.LookupGrid/frmLookupGrid.Designer.vb
+++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb
@@ -91,7 +91,7 @@ Partial Class frmLookupGrid

    Friend WithEvents gridLookup As DevExpress.XtraGrid.GridControl
    Friend WithEvents viewLookup As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents Panel1 As System.Windows.Forms.Panel
-    Friend WithEvents btnOK As System.Windows.Forms.Button
-    Friend WithEvents btnClear As System.Windows.Forms.Button
+    Friend WithEvents Panel1 As Windows.Forms.Panel
+    Friend WithEvents btnOK As Windows.Forms.Button
+    Friend WithEvents btnClear As Windows.Forms.Button
 End Class
--- a/Controls.LookupGrid/frmLookupGrid.vb
+++ b/Controls.LookupGrid/frmLookupGrid.vb
@@ -1,5 +1,4 @@
-Imports System.Data
-Imports System.Windows.Forms
+Imports System.Windows.Forms
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 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("DigitalData.SnapPanel")>
+<Assembly: AssemblyDescription("Integriert ein SnapPanel für das Design von Forms")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
+<Assembly: AssemblyProduct("DigitalData.SnapPanel")>
+<Assembly: AssemblyCopyright("")>
 <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("5f53047b-55a4-4edc-9281-bc35744e1814")>
+
+' 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("2.1.0.0")>
+<Assembly: AssemblyFileVersion("2.1.0.0")>
--- a/Controls.SnapPanel/SnapPanel.vb
+++ b/Controls.SnapPanel/SnapPanel.vb
@@ -1,20 +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 ' Scrollbars aktivieren
+        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
-            Refresh()
+            If value > 0 AndAlso value <> _GridSize Then
+                _GridSize = value
+                Invalidate()
+            End If
        End Set
    End Property

@@ -23,55 +31,146 @@ Public Class ClassSnapPanel
            Return _ShowGrid
        End Get
        Set(value As Boolean)
-            _ShowGrid = value
-            Refresh()
+            If value <> _ShowGrid Then
+                _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)
-        UpdateScrollArea()
+        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)
-        UpdateScrollArea()
+        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)
-        If _ShowGrid Then
-            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
-        End If
+    Protected Overrides Sub OnLayout(levent As LayoutEventArgs)
+        MyBase.OnLayout(levent)
+        ScheduleScrollUpdate()
+    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
-            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()
+        If Not _ShowGrid OrElse Me.DesignMode Then Return
+
+        Dim ctrl As Control = CType(sender, Control)
+        Dim x As Integer = Math.Floor(ctrl.Left / _GridSize) * _GridSize
+        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

-        ' 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
+        For Each ctrl As Control In Me.Controls
+            maxWidth = Math.Max(maxWidth, ctrl.Right)
+            maxHeight = Math.Max(maxHeight, ctrl.Bottom)
        Next

-        ' Scrollbereich setzen
        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
@@ -1,17 +1,110 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?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>
-    <RootNamespace>DigitalData.Controls.SnapPanel</RootNamespace>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <MyType>Windows</MyType>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3E19C413-3197-4635-944E-558FC04C3475}</ProjectGuid>
    <OutputType>Library</OutputType>
+    <RootNamespace>DigitalData.Controls.SnapPanel</RootNamespace>
    <AssemblyName>DigitalData.Controls.SnapPanel</AssemblyName>
-    <Title>$(AssemblyName)</Title>
-    <AssemblyTitle>Provides a snappanel for designing forms</AssemblyTitle>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <Product>$(AssemblyName)</Product>
-    <AssemblyVersion>2.2</AssemblyVersion>
-    <FileVersion>2.2</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>DigitalData.Controls.SnapPanel.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>DigitalData.Controls.SnapPanel.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="System" />
+    <Reference Include="System.Data" />
+    <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" />
+  </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="My Project\AssemblyInfo.vb" />
+    <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>
+      <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>
+    <Compile Include="SnapPanel.vb">
+      <SubType>Component</SubType>
+    </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="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>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -76,6 +76,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService.Tests", "EDMISe
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "..\DDModules\Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Verknüpfte Projekte", "Verknüpfte Projekte", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Config", "..\DDModules\Config\Config.vbproj", "{7B7766E6-DC73-19CD-042F-6B95CE11A733}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -186,6 +190,10 @@ Global
 		{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
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -216,7 +224,8 @@ Global
 		{9D4AC920-C78E-41C3-994E-91690FF79380} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{5A7913CE-7D3D-4E84-B23D-4747C178CD71} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{E3DA65CA-964D-4896-991A-B5426884E215} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
-		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
+		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{7B7766E6-DC73-19CD-042F-6B95CE11A733} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -132,68 +132,68 @@
    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.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 Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.CAD, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.CAD.DWG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Common, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Document, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Email, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.HTML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Imaging, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.OpenDocument, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.OpenXML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.PDF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.RTF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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 Include="GdPicture.NET.14.SVG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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>
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -209,6 +209,12 @@
    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
    </Reference>
+    <Reference Include="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
+    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
@@ -821,8 +827,8 @@
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <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'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.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')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.19\build\net462\GdPicture.runtimes.windows.targets')" />
 </Project>
--- a/GUIs.Common/app.config
+++ b/GUIs.Common/app.config
@@ -103,6 +103,22 @@
        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <startup>
--- a/GUIs.Common/packages.config
+++ b/GUIs.Common/packages.config
@@ -6,8 +6,8 @@
  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.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="GdPicture" version="14.3.19" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -10,9 +10,9 @@ Imports System.Runtime.InteropServices

 <Assembly: AssemblyTitle("TestGUI")>
 <Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("DD JJMS")>
+<Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("TestGUI")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
+<Assembly: AssemblyCopyright("")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@@ -0,0 +1,2 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.Test.TestGUI/MyApplication.vb
+++ b/GUIs.Test.TestGUI/MyApplication.vb
@@ -0,0 +1,49 @@
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.EDMI.API.Modules
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.ZooFlow
+
+Namespace My
+    ''' <summary>
+    ''' Extends the My Namespace
+    ''' Example: My.LogConfig
+    ''' </summary>
+    <HideModuleName()>
+    Module Extension
+        Property LogConfig As LogConfig
+#Region "Database"
+        Property Database As DatabaseWithFallback
+        Property DatabaseECM As MSSQLServer
+        Property DatabaseIDB As MSSQLServer
+    End Module
+
+#End Region
+    Partial Friend Class MyApplication
+            Public Property Skin As String = ""
+            Public Property Palette As String = ""
+            Public Property GlobixDropAreaStyle As String = "PROGRESSIVE"
+
+            Public Property Settings As New State.SettingsState
+            Public Property User As New State.UserState
+            Public Property Service As New State.ServiceState
+            Public Property Modules As New Dictionary(Of String, State.ModuleState)
+            Public Property ModulesActive As New List(Of String)
+
+
+        Public CommandLineFunction As String
+            Public CommandLineArguments As New Dictionary(Of String, String)
+
+            Public Function GetEnvironment() As Environment
+                Return New Environment With {
+                    .Database = My.DatabaseECM,
+                    .DatabaseIDB = My.DatabaseIDB,
+                    .Modules = My.Application.Modules,
+                    .Service = My.Application.Service,
+                    .Settings = My.Application.Settings,
+                    .User = My.Application.User
+                }
+            End Function
+
+    End Class
+End Namespace
--- a/GUIs.Test.TestGUI/TestGUI.vbproj
+++ b/GUIs.Test.TestGUI/TestGUI.vbproj
@@ -78,8 +78,7 @@
    <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, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="DigitalData.Controls.DocumentViewer">
      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.GUIs.Common">
@@ -94,6 +93,10 @@
    <Reference Include="DigitalData.Modules.Database">
      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
+    <Reference Include="DigitalData.Modules.EDMI.API, Version=1.6.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
    <Reference Include="DigitalData.Modules.Encryption">
      <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
    </Reference>
@@ -118,6 +121,10 @@
    <Reference Include="DigitalData.Modules.Windream">
      <HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.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>
@@ -407,6 +414,7 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <Compile Include="MyApplication.vb" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="frmBulkInsert.resx">
@@ -488,10 +496,6 @@
      <Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project>
      <Name>EDMIService</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
-      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
-      <Name>DDZUGFeRDService</Name>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\alignhorizontalbottom.svg" />
--- a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
+++ b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
@@ -22,18 +22,10 @@ Partial Class frmDocViewPure
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
        Me.Button1 = New System.Windows.Forms.Button()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
        Me.SuspendLayout()
        '
-        'SpreadsheetControl1
-        '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(349, 187)
-        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
-        Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200)
-        Me.SpreadsheetControl1.TabIndex = 0
-        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
-        '
        'Button1
        '
        Me.Button1.Location = New System.Drawing.Point(546, 25)
@@ -43,19 +35,26 @@ Partial Class frmDocViewPure
        Me.Button1.Text = "unload"
        Me.Button1.UseVisualStyleBackColor = True
        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.FileLoaded = False
+        Me.DocumentViewer1.Location = New System.Drawing.Point(12, 54)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(661, 386)
+        Me.DocumentViewer1.TabIndex = 2
+        '
        'frmDocViewPure
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.DocumentViewer1)
        Me.Controls.Add(Me.Button1)
-        Me.Controls.Add(Me.SpreadsheetControl1)
        Me.Name = "frmDocViewPure"
        Me.Text = "frmDocViewPure"
        Me.ResumeLayout(False)

    End Sub
-
-    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
    Friend WithEvents Button1 As Button
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
 End Class
--- a/GUIs.Test.TestGUI/frmDocViewPure.vb
+++ b/GUIs.Test.TestGUI/frmDocViewPure.vb
@@ -2,7 +2,6 @@

 Public Class frmDocViewPure
    Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        SpreadsheetControl1.LoadDocument("E:\35MB.xlsx")

    End Sub

@@ -10,7 +9,7 @@ Public Class frmDocViewPure
        'SpreadsheetControl1.Document.Dispose()
        'SpreadsheetControl1.Dispose()
        'SpreadsheetControl1 = Nothing
-        SpreadsheetControl1.CreateNewDocument()
+        ' SpreadsheetControl1.CreateNewDocument()
        GC.Collect()
    End Sub
 End Class
--- a/GUIs.Test.TestGUI/frmFilesystem.Designer.vb
+++ b/GUIs.Test.TestGUI/frmFilesystem.Designer.vb
@@ -23,28 +23,119 @@ Partial Class frmFilesystem
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnStreamSimpleFile = New System.Windows.Forms.Button()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.txtServiceAddress = New DevExpress.XtraEditors.TextEdit()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtServicePort = New DevExpress.XtraEditors.TextEdit()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.txtStatus = New System.Windows.Forms.TextBox()
+        Me.GroupBox1.SuspendLayout()
+        CType(Me.txtServiceAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtServicePort.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'Button1
        '
-        Me.Button1.Location = New System.Drawing.Point(12, 12)
+        Me.Button1.Location = New System.Drawing.Point(42, 234)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.Size = New System.Drawing.Size(288, 23)
        Me.Button1.TabIndex = 0
-        Me.Button1.Text = "Button1"
+        Me.Button1.Text = "CreateDateDirectory"
        Me.Button1.UseVisualStyleBackColor = True
        '
+        'btnStreamSimpleFile
+        '
+        Me.btnStreamSimpleFile.Location = New System.Drawing.Point(6, 19)
+        Me.btnStreamSimpleFile.Name = "btnStreamSimpleFile"
+        Me.btnStreamSimpleFile.Size = New System.Drawing.Size(288, 23)
+        Me.btnStreamSimpleFile.TabIndex = 1
+        Me.btnStreamSimpleFile.Text = "Stream simple file"
+        Me.btnStreamSimpleFile.UseVisualStyleBackColor = True
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.btnStreamSimpleFile)
+        Me.GroupBox1.Location = New System.Drawing.Point(36, 153)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(709, 58)
+        Me.GroupBox1.TabIndex = 2
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Stream simple file"
+        '
+        'txtServiceAddress
+        '
+        Me.txtServiceAddress.EditValue = "172.24.12.12"
+        Me.txtServiceAddress.Location = New System.Drawing.Point(36, 37)
+        Me.txtServiceAddress.Name = "txtServiceAddress"
+        Me.txtServiceAddress.Size = New System.Drawing.Size(485, 20)
+        Me.txtServiceAddress.TabIndex = 5
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(33, 21)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(136, 13)
+        Me.Label1.TabIndex = 6
+        Me.Label1.Text = "EDMI Service Adresse: (IP)"
+        '
+        'txtServicePort
+        '
+        Me.txtServicePort.EditValue = New Decimal(New Integer() {9000, 0, 0, 0})
+        Me.txtServicePort.Location = New System.Drawing.Point(36, 63)
+        Me.txtServicePort.Name = "txtServicePort"
+        Me.txtServicePort.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Buffered
+        Me.txtServicePort.Properties.MaskSettings.Set("MaskManagerType", GetType(DevExpress.Data.Mask.NumericMaskManager))
+        Me.txtServicePort.Size = New System.Drawing.Size(485, 20)
+        Me.txtServicePort.TabIndex = 7
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(36, 89)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(85, 23)
+        Me.Button4.TabIndex = 8
+        Me.Button4.Text = "Connect"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'txtStatus
+        '
+        Me.txtStatus.Location = New System.Drawing.Point(527, 37)
+        Me.txtStatus.Name = "txtStatus"
+        Me.txtStatus.Size = New System.Drawing.Size(184, 20)
+        Me.txtStatus.TabIndex = 9
+        '
        'frmFilesystem
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.txtStatus)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.txtServicePort)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtServiceAddress)
+        Me.Controls.Add(Me.GroupBox1)
        Me.Controls.Add(Me.Button1)
        Me.Name = "frmFilesystem"
        Me.Text = "frmFilesystem"
+        Me.GroupBox1.ResumeLayout(False)
+        CType(Me.txtServiceAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtServicePort.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
+        Me.PerformLayout()

    End Sub

    Friend WithEvents Button1 As Button
+    Friend WithEvents btnStreamSimpleFile As Button
+    Friend WithEvents GroupBox1 As GroupBox
+    Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    Friend WithEvents txtServiceAddress As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtServicePort As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents Button4 As Button
+    Friend WithEvents txtStatus As TextBox
 End Class
--- a/GUIs.Test.TestGUI/frmFilesystem.resx
+++ b/GUIs.Test.TestGUI/frmFilesystem.resx
@@ -117,4 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
--- a/GUIs.Test.TestGUI/frmFilesystem.vb
+++ b/GUIs.Test.TestGUI/frmFilesystem.vb
@@ -1,39 +1,213 @@
-Imports DigitalData.Modules.Logging
+Imports System.Collections.Generic
+Imports System.IO
+Imports System.Numerics ' Verweis auf System.Numerics assembly hinzufügen!
+Imports System.Security.Cryptography
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base.IDB.Constants
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.ZooFlow.State
+Imports DigitalData.Services.EDMIService
+Imports DigitalData.Services.EDMIService.GlobalState
+Imports DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile
+Imports DigitalData.Services.EDMIService.Methods.IDB

 Public Class frmFilesystem
+    Private EDMIClient As Client
+    Private Logger As Logger
+
+    Private Const STATUS_CONNECTED = "Connection Established"
+    Private Const STATUS_CONNECTING = "Trying to create connection..."
+    Private Const STATUS_FAILED = "Connection Failed!"
+
+    Private ConnectionChanged As Boolean = False
+
+    Public Property ServiceAddress As String = ""
+    Public Property ServiceOnline As Boolean = False
    Private LogConfig As LogConfig
-    Private Filesystem As DigitalData.Modules.Filesystem.File
+    Private MYDD_Filesystem As DigitalData.Modules.Filesystem.File
+    Private _globalState As GlobalState

    Private ShortName As String = "E:\some_test_file.txt"
-    Private LongName As String = "E:\some_test_file_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more.txt"
+    Private LongName As String = "E:\some_test_file_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more.txt"

    Private Sub frmFilesystem_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Try
            LogConfig = New LogConfig(LogConfig.PathType.Temp)
-            Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
-
-
-            'Using oWriter = IO.File.CreateText("E:\some_test_file.txt")
-            '    oWriter.WriteLine("bla bla bla")
-            'End Using
-
-            'IO.File.Copy(ShortName, LongName)
-
-            'Dim oVersion1 = Filesystem.GetVersionedFilename(LongName)
-            'IO.File.Copy(ShortName, oVersion1)
-
-            'Dim oVersion2 = Filesystem.GetVersionedFilename(LongName)
-            'IO.File.Copy(ShortName, oVersion2)
-        Catch ex As Exception
-
-        Finally
-            'IO.File.Delete(ShortName)
-            'IO.File.Delete(LongName)
+            Logger = LogConfig.GetLogger()
+            MYDD_Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
+        Catch
        End Try
-
    End Sub

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oDateString = Filesystem.CreateDateDirectory("E:\")
+        Dim oDateString = MYDD_Filesystem.CreateDateDirectory("E:\")
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs)
+        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
+            System.IO.File.WriteAllText(SaveFileDialog1.FileName, "Some text data")
+        End If
+    End Sub
+
+    Public Class SecureStorageHandler
+    End Class
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        Try
+            Dim oIPAddress = txtServiceAddress.Text
+            Dim oPort = Integer.Parse(txtServicePort.Text)
+
+            EDMIClient = New Client(LogConfig, oIPAddress, oPort)
+
+            txtStatus.Text = STATUS_CONNECTING
+            Dim oResult = EDMIClient.Connect()
+
+            If oResult Then
+                ServiceAddress = $"{oIPAddress}:{oPort}"
+                ServiceOnline = True
+                txtStatus.Text = STATUS_CONNECTED
+                txtStatus.BackColor = Color.LightGreen
+                My.Application.Service.Client = EDMIClient
+                Logger.Debug("Loading client config..")
+                Dim oClientConfig = My.Application.Service.Client.ClientConfig
+                Logger.Debug("Establishing ECM connection..")
+                Dim oECMConnectionString = oClientConfig.ConnectionStringECM
+                My.DatabaseECM = New MSSQLServer(LogConfig, oECMConnectionString)
+                Logger.Debug("Establishing IDB connection..")
+                Dim oIDBConnectionString = oClientConfig.ConnectionStringIDB
+                My.DatabaseIDB = New MSSQLServer(LogConfig, oIDBConnectionString)
+
+                Logger.Debug("Establishing Database connection with fallback..")
+                My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
+
+                InitializeGlobalState()
+            Else
+                ServiceAddress = ""
+                ServiceOnline = True
+                txtStatus.Text = STATUS_FAILED
+                txtStatus.BackColor = Color.LightCoral
+                _globalState = Nothing
+            End If
+        Catch ex As Exception
+            _globalState = Nothing
+            If Logger IsNot Nothing Then Logger.Error(ex)
+            MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub btnStreamSimpleFile_ClickAsync(sender As Object, e As EventArgs) Handles btnStreamSimpleFile.Click
+        Try
+            If EDMIClient Is Nothing OrElse ServiceOnline = False Then
+                MsgBox("Bitte zuerst Verbindung zum EDMI Service herstellen.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            If My.DatabaseIDB Is Nothing OrElse My.DatabaseECM Is Nothing Then
+                MsgBox("Bitte zuerst die Datenbankverbindungen herstellen.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            If _globalState Is Nothing Then
+                MsgBox("GlobalState konnte nicht initialisiert werden.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            Using ofd As New OpenFileDialog()
+                ofd.Title = "Datei für Import wählen"
+                ofd.Filter = "Alle Dateien (*.*)|*.*"
+                If ofd.ShowDialog() <> DialogResult.OK Then
+                    Return
+                End If
+
+                Dim oFilePath = ofd.FileName
+                Dim fi As New FileInfo(oFilePath)
+                Dim fileBytes As Byte() = IO.File.ReadAllBytes(oFilePath)
+
+                Dim oUser As New UserState With {
+                    .UserName = Environment.UserName,
+                    .Language = "de-DE",
+                    .LanguageId = 1031
+                }
+
+                Dim oObjectStore As String = "WORK"
+                Dim oIDBDoctypeId As Long = 1
+                Dim oObjectKind As String = "DOC"
+                Dim oProfileId As Integer = 1
+                Dim oAttributes As New List(Of UserAttributeValue)
+
+                Logger.Debug("FilePath: [{0}]", oFilePath)
+                Logger.Debug("ObjectStore: [{0}]", oObjectStore)
+                Logger.Debug("ObjectKind: [{0}]", oObjectKind)
+                Logger.Debug("ProfileId: [{0}]", oProfileId)
+                Logger.Debug("IDB DoctypeId: [{0}]", oIDBDoctypeId)
+
+                Dim oChecksum As String
+                Using oSha256 As SHA256 = SHA256.Create()
+                    oChecksum = BitConverter.ToString(oSha256.ComputeHash(fileBytes)).Replace("-", String.Empty)
+                End Using
+
+                Dim oFileProperties As New FileProperties With {
+                    .FileName = fi.FullName,
+                    .FileCreatedAt = fi.CreationTimeUtc.ToString("O"),
+                    .FileChangedAt = fi.LastWriteTimeUtc.ToString("O"),
+                    .FileImportedAt = DateTime.UtcNow,
+                    .FileContents = fileBytes,
+                    .FileChecksum = oChecksum,
+                    .FileInfoRaw = fi
+                }
+
+                Dim oRequest As New Globix_ImportFileRequest With {
+                    .File = oFileProperties,
+                    .ProfileId = oProfileId,
+                    .IDBDoctypeId = oIDBDoctypeId,
+                    .KindType = oObjectKind,
+                    .StoreName = oObjectStore,
+                    .AttributeValues = oAttributes,
+                    .User = oUser
+                }
+
+                Dim oImportMethod = New ImportFileMethod(LogConfig, My.DatabaseIDB, My.DatabaseECM, _globalState)
+                Dim oResponse = oImportMethod.Run(oRequest)
+
+                If oResponse IsNot Nothing AndAlso oResponse.ObjectId > 0 Then
+                    Logger.Info("Import erfolgreich abgeschlossen. ObjectId [{0}]", oResponse.ObjectId)
+                    MsgBox($"Import erfolgreich. ObjectId: {oResponse.ObjectId}", MsgBoxStyle.Information, Text)
+                Else
+                    Logger.Warn("ImportFile lieferte kein erfolgreiches Ergebnis.")
+                    MsgBox("Import konnte nicht durchgeführt werden.", MsgBoxStyle.Exclamation, Text)
+                End If
+            End Using
+        Catch ex As Exception
+            If Logger IsNot Nothing Then Logger.Error(ex)
+            MsgBox("Fehler beim Datei-Import.", MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub InitializeGlobalState()
+        Try
+            _globalState = New GlobalState(LogConfig, My.DatabaseIDB, My.DatabaseECM)
+            _globalState.LoadObjectStores()
+            _globalState.LoadConnections()
+            _globalState.LoadDoctypes()
+
+            Dim oConfig As New Config With {
+                .ClientConfig = New Config.ClientConfiguration With {
+                    .ForceDirectDatabaseAccess = True
+                }
+            }
+
+            _globalState.LoadClientConfig(oConfig)
+
+            Logger.Info("GlobalState init: ObjectStores [{0}], Connections [{1}], Doctypes [{2}]",
+                        _globalState.ObjectStores.Count,
+                        _globalState.Connections.Count,
+                        _globalState.Doctypes.Count)
+        Catch ex As Exception
+            _globalState = Nothing
+            Logger.Error(ex)
+            MsgBox("GlobalState konnte nicht initialisiert werden.", MsgBoxStyle.Exclamation, Text)
+        End Try
    End Sub
 End Class
--- a/GUIs.Test.ZUGFeRDTest/App.config
+++ b/GUIs.Test.ZUGFeRDTest/App.config
@@ -161,7 +161,15 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
--- a/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
@@ -24,6 +24,7 @@ Partial Class Form1
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
        OpenFileDialog1 = New OpenFileDialog()
        btRunJob = New Button()
        ListBox1 = New ListBox()
@@ -58,10 +59,10 @@ Partial Class Form1
        ' 
        ' btRunJob
        ' 
-        btRunJob.Location = New System.Drawing.Point(8, 29)
-        btRunJob.Margin = New Padding(4, 5, 4, 5)
+        btRunJob.Location = New System.Drawing.Point(7, 22)
+        btRunJob.Margin = New Padding(4, 4, 4, 4)
        btRunJob.Name = "btRunJob"
-        btRunJob.Size = New System.Drawing.Size(295, 35)
+        btRunJob.Size = New System.Drawing.Size(258, 26)
        btRunJob.TabIndex = 0
        btRunJob.Text = "Run Job"
        btRunJob.UseVisualStyleBackColor = True
@@ -70,38 +71,39 @@ Partial Class Form1
        ' 
        ListBox1.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right
        ListBox1.FormattingEnabled = True
-        ListBox1.Location = New System.Drawing.Point(504, 12)
-        ListBox1.Margin = New Padding(4, 5, 4, 5)
+        ListBox1.ItemHeight = 15
+        ListBox1.Location = New System.Drawing.Point(441, 9)
+        ListBox1.Margin = New Padding(4, 4, 4, 4)
        ListBox1.Name = "ListBox1"
-        ListBox1.Size = New System.Drawing.Size(362, 664)
+        ListBox1.Size = New System.Drawing.Size(317, 499)
        ListBox1.TabIndex = 1
        ' 
        ' btValidateSerializePDF
        ' 
-        btValidateSerializePDF.Location = New System.Drawing.Point(8, 29)
-        btValidateSerializePDF.Margin = New Padding(4, 5, 4, 5)
+        btValidateSerializePDF.Location = New System.Drawing.Point(7, 22)
+        btValidateSerializePDF.Margin = New Padding(4, 4, 4, 4)
        btValidateSerializePDF.Name = "btValidateSerializePDF"
-        btValidateSerializePDF.Size = New System.Drawing.Size(328, 35)
+        btValidateSerializePDF.Size = New System.Drawing.Size(287, 26)
        btValidateSerializePDF.TabIndex = 2
        btValidateSerializePDF.Text = "Validate and Serialize PDF"
        btValidateSerializePDF.UseVisualStyleBackColor = True
        ' 
        ' btValidateSerializeParseProps
        ' 
-        btValidateSerializeParseProps.Location = New System.Drawing.Point(8, 74)
-        btValidateSerializeParseProps.Margin = New Padding(4, 5, 4, 5)
+        btValidateSerializeParseProps.Location = New System.Drawing.Point(7, 56)
+        btValidateSerializeParseProps.Margin = New Padding(4, 4, 4, 4)
        btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
-        btValidateSerializeParseProps.Size = New System.Drawing.Size(328, 35)
+        btValidateSerializeParseProps.Size = New System.Drawing.Size(287, 26)
        btValidateSerializeParseProps.TabIndex = 3
        btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
        btValidateSerializeParseProps.UseVisualStyleBackColor = True
        ' 
        ' btCreateMD5Checksum
        ' 
-        btCreateMD5Checksum.Location = New System.Drawing.Point(8, 29)
-        btCreateMD5Checksum.Margin = New Padding(4, 5, 4, 5)
+        btCreateMD5Checksum.Location = New System.Drawing.Point(7, 22)
+        btCreateMD5Checksum.Margin = New Padding(4, 4, 4, 4)
        btCreateMD5Checksum.Name = "btCreateMD5Checksum"
-        btCreateMD5Checksum.Size = New System.Drawing.Size(295, 35)
+        btCreateMD5Checksum.Size = New System.Drawing.Size(258, 26)
        btCreateMD5Checksum.TabIndex = 4
        btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
        btCreateMD5Checksum.UseVisualStyleBackColor = True
@@ -110,21 +112,21 @@ Partial Class Form1
        ' 
        GroupBox1.Controls.Add(ButtonValidateXMLOnly)
        GroupBox1.Controls.Add(btRunJob)
-        GroupBox1.Location = New System.Drawing.Point(16, 18)
-        GroupBox1.Margin = New Padding(4, 5, 4, 5)
+        GroupBox1.Location = New System.Drawing.Point(14, 14)
+        GroupBox1.Margin = New Padding(4, 4, 4, 4)
        GroupBox1.Name = "GroupBox1"
-        GroupBox1.Padding = New Padding(4, 5, 4, 5)
-        GroupBox1.Size = New System.Drawing.Size(319, 116)
+        GroupBox1.Padding = New Padding(4, 4, 4, 4)
+        GroupBox1.Size = New System.Drawing.Size(279, 87)
        GroupBox1.TabIndex = 7
        GroupBox1.TabStop = False
        GroupBox1.Text = "Run Job like in eInvoice Service"
        ' 
        ' ButtonValidateXMLOnly
        ' 
-        ButtonValidateXMLOnly.Location = New System.Drawing.Point(8, 74)
-        ButtonValidateXMLOnly.Margin = New Padding(4, 5, 4, 5)
+        ButtonValidateXMLOnly.Location = New System.Drawing.Point(7, 56)
+        ButtonValidateXMLOnly.Margin = New Padding(4, 4, 4, 4)
        ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
-        ButtonValidateXMLOnly.Size = New System.Drawing.Size(295, 35)
+        ButtonValidateXMLOnly.Size = New System.Drawing.Size(258, 26)
        ButtonValidateXMLOnly.TabIndex = 4
        ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
        ButtonValidateXMLOnly.UseVisualStyleBackColor = True
@@ -134,21 +136,21 @@ Partial Class Form1
        GroupBox2.Controls.Add(btValidateSerializePDF)
        GroupBox2.Controls.Add(btExtractPDFAttachments)
        GroupBox2.Controls.Add(btValidateSerializeParseProps)
-        GroupBox2.Location = New System.Drawing.Point(16, 144)
-        GroupBox2.Margin = New Padding(4, 5, 4, 5)
+        GroupBox2.Location = New System.Drawing.Point(14, 108)
+        GroupBox2.Margin = New Padding(4, 4, 4, 4)
        GroupBox2.Name = "GroupBox2"
-        GroupBox2.Padding = New Padding(4, 5, 4, 5)
-        GroupBox2.Size = New System.Drawing.Size(480, 167)
+        GroupBox2.Padding = New Padding(4, 4, 4, 4)
+        GroupBox2.Size = New System.Drawing.Size(420, 125)
        GroupBox2.TabIndex = 8
        GroupBox2.TabStop = False
        GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
        ' 
        ' btExtractPDFAttachments
        ' 
-        btExtractPDFAttachments.Location = New System.Drawing.Point(8, 118)
-        btExtractPDFAttachments.Margin = New Padding(4, 5, 4, 5)
+        btExtractPDFAttachments.Location = New System.Drawing.Point(7, 88)
+        btExtractPDFAttachments.Margin = New Padding(4, 4, 4, 4)
        btExtractPDFAttachments.Name = "btExtractPDFAttachments"
-        btExtractPDFAttachments.Size = New System.Drawing.Size(328, 35)
+        btExtractPDFAttachments.Size = New System.Drawing.Size(287, 26)
        btExtractPDFAttachments.TabIndex = 3
        btExtractPDFAttachments.Text = "Extract PDF Attachments"
        btExtractPDFAttachments.UseVisualStyleBackColor = True
@@ -157,50 +159,50 @@ Partial Class Form1
        ' 
        GroupBox3.Controls.Add(btCreateMD5Checksum)
        GroupBox3.Controls.Add(txtMD5Checksum)
-        GroupBox3.Location = New System.Drawing.Point(16, 321)
-        GroupBox3.Margin = New Padding(4, 5, 4, 5)
+        GroupBox3.Location = New System.Drawing.Point(14, 241)
+        GroupBox3.Margin = New Padding(4, 4, 4, 4)
        GroupBox3.Name = "GroupBox3"
-        GroupBox3.Padding = New Padding(4, 5, 4, 5)
-        GroupBox3.Size = New System.Drawing.Size(480, 131)
+        GroupBox3.Padding = New Padding(4, 4, 4, 4)
+        GroupBox3.Size = New System.Drawing.Size(420, 98)
        GroupBox3.TabIndex = 9
        GroupBox3.TabStop = False
        GroupBox3.Text = "Open PDF and calculate Checksum"
        ' 
        ' txtMD5Checksum
        ' 
-        txtMD5Checksum.Location = New System.Drawing.Point(8, 75)
-        txtMD5Checksum.Margin = New Padding(4, 5, 4, 5)
+        txtMD5Checksum.Location = New System.Drawing.Point(7, 56)
+        txtMD5Checksum.Margin = New Padding(4, 4, 4, 4)
        txtMD5Checksum.Name = "txtMD5Checksum"
-        txtMD5Checksum.Size = New System.Drawing.Size(463, 27)
+        txtMD5Checksum.Size = New System.Drawing.Size(406, 23)
        txtMD5Checksum.TabIndex = 5
        ' 
        ' txtPropName
        ' 
-        txtPropName.Location = New System.Drawing.Point(8, 74)
-        txtPropName.Margin = New Padding(4, 5, 4, 5)
+        txtPropName.Location = New System.Drawing.Point(7, 56)
+        txtPropName.Margin = New Padding(4, 4, 4, 4)
        txtPropName.Name = "txtPropName"
-        txtPropName.Size = New System.Drawing.Size(463, 27)
+        txtPropName.Size = New System.Drawing.Size(406, 23)
        txtPropName.TabIndex = 10
        ' 
        ' GroupBox4
        ' 
        GroupBox4.Controls.Add(btFindExtractXMLValue)
        GroupBox4.Controls.Add(txtPropName)
-        GroupBox4.Location = New System.Drawing.Point(16, 462)
-        GroupBox4.Margin = New Padding(4, 5, 4, 5)
+        GroupBox4.Location = New System.Drawing.Point(14, 346)
+        GroupBox4.Margin = New Padding(4, 4, 4, 4)
        GroupBox4.Name = "GroupBox4"
-        GroupBox4.Padding = New Padding(4, 5, 4, 5)
-        GroupBox4.Size = New System.Drawing.Size(480, 117)
+        GroupBox4.Padding = New Padding(4, 4, 4, 4)
+        GroupBox4.Size = New System.Drawing.Size(420, 88)
        GroupBox4.TabIndex = 11
        GroupBox4.TabStop = False
        GroupBox4.Text = "GroupBox4"
        ' 
        ' btFindExtractXMLValue
        ' 
-        btFindExtractXMLValue.Location = New System.Drawing.Point(8, 29)
-        btFindExtractXMLValue.Margin = New Padding(4, 5, 4, 5)
+        btFindExtractXMLValue.Location = New System.Drawing.Point(7, 22)
+        btFindExtractXMLValue.Margin = New Padding(4, 4, 4, 4)
        btFindExtractXMLValue.Name = "btFindExtractXMLValue"
-        btFindExtractXMLValue.Size = New System.Drawing.Size(295, 35)
+        btFindExtractXMLValue.Size = New System.Drawing.Size(258, 26)
        btFindExtractXMLValue.TabIndex = 11
        btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
        btFindExtractXMLValue.UseVisualStyleBackColor = True
@@ -208,21 +210,21 @@ Partial Class Form1
        ' GroupBox5
        ' 
        GroupBox5.Controls.Add(btWriteBinary)
-        GroupBox5.Location = New System.Drawing.Point(13, 589)
-        GroupBox5.Margin = New Padding(4, 5, 4, 5)
+        GroupBox5.Location = New System.Drawing.Point(11, 442)
+        GroupBox5.Margin = New Padding(4, 4, 4, 4)
        GroupBox5.Name = "GroupBox5"
-        GroupBox5.Padding = New Padding(4, 5, 4, 5)
-        GroupBox5.Size = New System.Drawing.Size(480, 87)
+        GroupBox5.Padding = New Padding(4, 4, 4, 4)
+        GroupBox5.Size = New System.Drawing.Size(420, 65)
        GroupBox5.TabIndex = 12
        GroupBox5.TabStop = False
        GroupBox5.Text = "GroupBox5"
        ' 
        ' btWriteBinary
        ' 
-        btWriteBinary.Location = New System.Drawing.Point(8, 29)
-        btWriteBinary.Margin = New Padding(4, 5, 4, 5)
+        btWriteBinary.Location = New System.Drawing.Point(7, 22)
+        btWriteBinary.Margin = New Padding(4, 4, 4, 4)
        btWriteBinary.Name = "btWriteBinary"
-        btWriteBinary.Size = New System.Drawing.Size(295, 35)
+        btWriteBinary.Size = New System.Drawing.Size(258, 26)
        btWriteBinary.TabIndex = 11
        btWriteBinary.Text = "Write Binary to PDF"
        btWriteBinary.UseVisualStyleBackColor = True
@@ -234,27 +236,29 @@ Partial Class Form1
        ' 
        ' Button1
        ' 
-        Button1.Location = New System.Drawing.Point(361, 47)
+        Button1.Location = New System.Drawing.Point(316, 35)
+        Button1.Margin = New Padding(3, 2, 3, 2)
        Button1.Name = "Button1"
-        Button1.Size = New System.Drawing.Size(94, 29)
+        Button1.Size = New System.Drawing.Size(82, 22)
        Button1.TabIndex = 5
        Button1.Text = "Log Folder"
        Button1.UseVisualStyleBackColor = True
        ' 
        ' Button2
        ' 
-        Button2.Location = New System.Drawing.Point(361, 82)
+        Button2.Location = New System.Drawing.Point(316, 62)
+        Button2.Margin = New Padding(3, 2, 3, 2)
        Button2.Name = "Button2"
-        Button2.Size = New System.Drawing.Size(94, 29)
+        Button2.Size = New System.Drawing.Size(82, 22)
        Button2.TabIndex = 13
        Button2.Text = "AppFolder"
        Button2.UseVisualStyleBackColor = True
        ' 
        ' Form1
        ' 
-        AutoScaleDimensions = New System.Drawing.SizeF(8F, 20F)
+        AutoScaleDimensions = New System.Drawing.SizeF(7F, 15F)
        AutoScaleMode = AutoScaleMode.Font
-        ClientSize = New System.Drawing.Size(879, 690)
+        ClientSize = New System.Drawing.Size(769, 518)
        Controls.Add(Button2)
        Controls.Add(Button1)
        Controls.Add(GroupBox5)
@@ -263,7 +267,8 @@ Partial Class Form1
        Controls.Add(GroupBox2)
        Controls.Add(GroupBox1)
        Controls.Add(ListBox1)
-        Margin = New Padding(4, 5, 4, 5)
+        Icon = CType(resources.GetObject("$this.Icon"), Drawing.Icon)
+        Margin = New Padding(4, 4, 4, 4)
        Name = "Form1"
        Text = "E-Invoice-TEST-Tool"
        GroupBox1.ResumeLayout(False)
--- a/GUIs.Test.ZUGFeRDTest/Form1.resx
+++ b/GUIs.Test.ZUGFeRDTest/Form1.resx
@@ -129,4 +129,480 @@
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>25</value>
  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAwAEBAQAAEABAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAQEAAAAQAgAGgEAABWBwAAICAQAAEA
+        BADoAgAAvgsAACAgAAABAAgAqAgAAKYOAAAgIAAAAQAgAKgQAABOFwAAMDAQAAEABABoBgAA9icAADAw
+        AAABAAgAqA4AAF4uAAAwMAAAAQAgAKglAAAGPQAAAAAQAAEABADbAwAArmIAAAAAAAABAAgA3QMAAIlm
+        AAAAAAAAAQAgAN0DAABmagAAKAAAABAAAAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP//
+        /wD///////////d3d3f3d3d/93d3d/d3d3/3d3d393d3f/d3/////3d/93f3d3d/d3/3d/d3d393f/d3
+        93d3f///93f3d3d/d3/3d/d3d393f/d393d3f/d/93f/////93/3d3d/d//3f/d3d393d3d/93d3f3d3
+        d3///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAoAAAAEAAAACAAAAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJC
+        QgD29vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAIC
+        AgICAgICAgICAgICAgICAQEBAQEBAQIBAQEBAQECAgEBAQEBAQECAQEBAQEBAgIBAQEBAQEBAgEBAQEB
+        AQICAQEBAgICAgICAgIBAQECAgEBAQIBAQEBAQECAQEBAgIBAQECAQEBAQEBAgEBAQICAQEBAgEBAQEB
+        AQICAgICAgEBAQIBAQEBAQECAQEBAgIBAQECAQEBAQEBAgEBAQICAQEBAgEBAQEBAQICAQECAgEBAQIC
+        AgICAgICAgEBAgIBAQEBAQECAQECAgIBAQICAQEBAQEBAgEBAQEBAQECAgEBAQEBAQIBAQEBAQEBAgIC
+        AgICAgICAgICAgICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAKAAAABAAAAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAPb2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAKAAAACAAAABAAAAAAQAEAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wD/////////////
+        //////////////////////////////93d3d3d3d/93d3d3d3d///d3d3d3d3f/d3d3d3d3f//3d3d3d3
+        d3/3d3d3d3d3//93d3d3d3d/93d3d3d3d///d3d3d3d3f/d3d3d3d3f//3d3d3d3d3/3d3d3d3d3//93
+        d3f//////////3d3d///d3d3//////////93d3f//3d3d/93d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3
+        d///d3d3/3d3d3d3d/93d3f//3d3d/93d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3
+        d////////3d3d/93d3d3d3f///////93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3d/93d3f//3d3d/93
+        d3d3d3f/d3d3//93d3f/d3d3d3d3/3d3d///d3d3/3d3d3d3d///d3f//3d3d////////////3d3//93
+        d3f///////////93d///d3d3d3d3f/d3f///d3f//3d3d3d3d3/3d3///3d3//93d3d3d3d/93d3d3d3
+        d///d3d3d3d3f/d3d3d3d3f//3d3d3d3d3/3d3d3d3d3//93d3d3d3d/93d3d3d3d///////////////
+        /////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAACAAAABAAAAAAQAIAAAAAAAABAAAAAAAAAAA
+        AAAAAQAAAAEAAAAAAABCQkIA9vb2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAP///wACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgIBAQEBAQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEB
+        AQEBAQECAgEBAQEBAQEBAQEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEB
+        AQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEBAQEBAQECAgEBAQEBAQEBAQEBAQECAgIC
+        AQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEBAQECAgICAgICAgICAgICAgICAQEBAQEB
+        AgICAgEBAQEBAQICAgICAgICAgICAgICAgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEB
+        AQEBAQICAgIBAQEBAQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEB
+        AgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEBAQEBAQICAgIBAQEBAQECAgEBAQEBAQEB
+        AQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEBAgICAgICAgICAgICAQEBAQEBAgIBAQEB
+        AQEBAQEBAQECAgICAgICAgICAgIBAQEBAQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQIC
+        AQEBAQEBAQEBAQEBAgIBAQEBAQECAgICAQEBAQEBAgIBAQEBAQEBAQEBAQECAgEBAQEBAQICAgIBAQEB
+        AQECAgEBAQEBAQEBAQEBAQICAQEBAQEBAgICAgEBAQEBAQICAQEBAQEBAQEBAQEBAgICAgEBAQECAgIC
+        AQEBAQEBAgICAgICAgICAgICAgICAgICAQEBAQICAgIBAQEBAQECAgICAgICAgICAgICAgICAgIBAQEB
+        AgICAgEBAQEBAQEBAQEBAQECAgEBAQECAgICAgEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQICAgIC
+        AQEBAQICAgIBAQEBAQEBAQEBAQEBAgIBAQEBAQEBAQEBAQEBAgICAgEBAQEBAQEBAQEBAQECAgEBAQEB
+        AQEBAQEBAQECAgICAQEBAQEBAQEBAQEBAQICAQEBAQEBAQEBAQEBAQICAgIBAQEBAQEBAQEBAQEBAgIB
+        AQEBAQEBAQEBAQEBAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAA
+        AAAAAAAA9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/QkJC/0JC
+        Qv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAADAAAABgAAAAAQAEAAAAAACABAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8A
+        AAD/AP8A//8AAP///wD/////////////////////////////////////////////////////////////
+        ////////////////////////////////////93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3
+        d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3
+        f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3
+        d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3f///93d3d3d3d3d3d3f/93d3d3d3d3d3
+        f///93d3d3f///////////////93d3d3f///93d3d3f///////////////93d3d3f///93d3d3f/////
+        //////////93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3
+        f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f///////
+        ////93d3d3f/93d3d3d3d3d3f///////////93d3d3f/93d3d3d3d3d3f///////////93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3
+        f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f/93d3d3f///93d3d3f/93d3
+        d3d3d3d3f/93d3d3f///93d3d3f/93d3d3d3d3d3f///93d3f///93d3d3f/93d3d3d3d3d3f///93d3
+        f///93d3d3f/93d3d3d3d3d3f///93d3f///93d3d3f/////////////////93d3f///93d3d3f/////
+        ////////////93d3f///93d3d3f/////////////////93d3f///93d3d3d3d3d3f/93d3f/////93d3
+        f///93d3d3d3d3d3f/93d3f/////93d3f///93d3d3d3d3d3f/93d3f/////93d3f///93d3d3d3d3d3
+        f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3
+        f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3f/93d3d3d3d3d3d3f///93d3d3d3d3d3
+        f/93d3d3d3d3d3d3f///////////////////////////////////////////////////////////////
+        //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAMAAAAGAA
+        AAABAAgAAAAAAAAJAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgD29vYAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgICAgICAgICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgIC
+        AgEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgICAgEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQICAgICAgICAgEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgICAgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgIC
+        AgEBAQEBAQEBAQEBAQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgEBAQEBAQEBAQEB
+        AQEBAQEBAQICAgEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC
+        AgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAwAAAAYAAAAAEAIAAAAAAAgCUAAAAAAAAAAAAAAAAAAAAA
+        AAD29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b29v9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv/29vb/9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
+        Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2
+        9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AACJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxyqGYAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAON
+        SURBVHic7d1BbgJBDADBEO2/R/PyzQ84ZIIc6Ko7yAKp5cNiHvd9319A0vf0AMAcAYAwAYAwAYAwAYAw
+        AYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYCw6/QN9t5/MQcvstY6er3v9387/X5tABAmABAmABAm
+        ABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAm
+        ABAmABAmABAmABAmABAmABAmABAmABB2TQ8Az6y1pkd4au89PcIRGwCECQCECQCECQCECQCECQCECQCE
+        CQCECQCECQCECQCECQCECQCECQCECQCE5e8B/Pffm0/z+Xw2GwCECQCECQCECQCECQCECQCECQCECQCE
+        CQCECQCECQCECQCECQCECQCECQCE5e8BnHr3/4d/d+4VnLEBQJgAQJgAQJgAQJgAQJgAQJgAQJjnAEir
+        P8dhA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYCwa3oAmLTWmh5hlA0AwgQAwgQAwgQAwgQA
+        wgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwgQAwtwDIG3vPT3CkdN7BjYACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACLumB3h3a63pEeDXbAAQJgAQJgAQ
+        JgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQJgAQlr8HsPeeHuGlTu8VfPrnU2cDgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDAB
+        gDABgDABgDABgDABgLDHfd/39BDADBsAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkAhAkA
+        hAkAhAkAhP0AOIQlA0VHQvQAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxy
+        qGYAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAOPSURBVHic7d1BbgJBDADBEPG8ee68ba/kBxwyiQx01R1k
+        gdTyYTG367oeX0DS9/QAwBwBgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgLD7
+        6Rustf5iDv7J3vvo9b7f13b6/doAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwA
+        IEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIOw+PQA8s/ee
+        HuGptdb0CEdsABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABAmABCWvwfw6r83
+        n+bz+Ww2AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAjL3wM49e7/D//u
+        3Cs4YwOAMAGAMAGAMAGAMAGAMAGAMAGAMM8BkFZ/jsMGAGECAGECAGECAGECAGECAGECAGECAGECAGEC
+        AGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGECAGEC
+        AGECAGH36QFg0t57eoRRNgAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        cw+AtLXW9AhHTu8Z2AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAg7D49wLvbe0+PAL9mA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYCw/D2Atdb0CP/q9F7Bp38+dTYACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACLtd1/WYHgKYYQOAMAGAMAGA
+        MAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAsB+06SYLLG5ISgAAAABJRU5ErkJggolQ
+        TkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAAAlwSFlzAAAOwwAADsMBx2+oZAAAA49JREFU
+        eJzt3UFuAkEMAMEQ8bx57rxtr+QHHDKJDHTVHWSB1PJhMbfruh5fQNL39ADAHAGAMAGAMAGAMAGAMAGA
+        MAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAMAGAsPvpG6y1/mIO/sne++j1vt/Xdvr92gAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAg
+        TAAgTAAgTAAgTAAgTAAgTAAgTAAg7D49ADyz954e4am11vQIR2wAECYAECYAECYAECYAECYAECYAECYA
+        ECYAECYAECYAECYAECYAECYAECYAEJa/B/Dqvzef5vP5bDYACBMACBMACBMACBMACBMACBMACBMACBMA
+        CBMACBMACBMACBMACBMACBMACMvfAzj17v8P/+7cKzhjA4AwAYAwAYAwAYAwAYAwAYAwAYAwzwGQVn+O
+        wwYAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIA
+        YQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYQIAYffpAWDS3nt6hFE2AAgTAAgTAAgTAAgTAAgT
+        AAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAgTAAhzD4C0tdb0CEdO7xnYACBMACBMACBMACBMACBMACBM
+        ACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBM
+        ACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACBMACDsPj3Au9t7T48Av2YDgDABgDABgDAB
+        gDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgDABgLD8PYC11vQI/+r0XsGnfz51NgAIEwAIEwAI
+        EwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        EwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAIEwAI
+        EwAIEwAIEwAIEwAIu13X9ZgeAphhA4AwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAwAYAw
+        AYAwAYCwH7TpJgssbkhKAAAAAElFTkSuQmCC
+</value>
+  </data>
 </root>
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -99,14 +99,14 @@ Public Class Form1
                Dim oEN16931_ID = oRow.Item("EN16931_ID")

                Args.PropertyMapList.Add(New XmlItemProperty() With {
-                    .XMLPath = xmlPath,
-                    .Description = description,
-                    .TableName = tableName,
-                    .TableColumn = tableColumn,
-                    .IsRequired = isRequired,
-                    .IsGrouped = isGrouped,
-                    .GroupScope = groupScope,
-                    .Specification = specification,
+                    .xmlPath = xmlPath,
+                    .description = description,
+                    .tableName = tableName,
+                    .tableColumn = tableColumn,
+                    .isRequired = isRequired,
+                    .isGrouped = isGrouped,
+                    .groupScope = groupScope,
+                    .specification = specification,
                    .ItemType = oItemType,
                    .EN16931_ID = oEN16931_ID
                })
@@ -159,9 +159,41 @@ Public Class Form1

        If oResult = DialogResult.OK Then
            Try
-                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
+                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName, True)
+                Dim oZFResult = _zugferd.ValidateZUGFeRDDocument(oDoc)
                Dim oZUGFERD = _zugferd.SerializeZUGFeRDDocument(oDoc)
-                Console.WriteLine()
+                WriteLog("Specification: " & oZFResult.Specification)
+                'WriteLog("XML-Schema: " & oResult.UsedXMLSchema)
+                WriteLog("Embedded File Name: " & oZFResult.DataFileName)
+
+                Dim oSpecification = oZFResult.Specification
+
+                If oSpecification = ZUGFeRDInterface.ZUGFERD_SPEC_10 Then
+                    oSpecification = ZUGFeRDInterface.ZUGFERD_SPEC_DEFAULT
+                End If
+
+                Dim oPropertyMap = oArgs.PropertyMapList.
+                    Where(Function(kv) kv.Specification = oSpecification).
+                    ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
+
+                Dim oResult2 = _zugferd.PropertyValues.CheckPropertyValues(oZFResult.SchemaObject, oPropertyMap, "test")
+
+                WriteLog("Valid Properties: [{0}]", oResult2.ValidProperties.Count)
+                For Each Prop In oResult2.ValidProperties
+                    If Prop.Value.Length > 250 Then
+                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value.Substring(0, 250))
+                    Else
+                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value)
+                    End If
+                Next
+
+                WriteLog("--------------------------------")
+                WriteLog("Missing Properties: [{0}]", oResult2.MissingProperties.Count)
+                For Each Prop In oResult2.MissingProperties
+                    WriteLog("Missing Property: [{0}]", Prop.ToString) ''Prop.Description
+                Next
+
+                WriteLog("--------------------------------")
            Catch ex As DigitalData.Modules.Interfaces.Exceptions.ZUGFeRDExecption
                Dim oErrorCode = GetRejectionCodeNumber(ex.ErrorCode)
                Dim oMessage = oErrorCode + " - (" + ex.ErrorCode.ToString() + ") - " + ex.Message
@@ -169,6 +201,7 @@ Public Class Form1
            Catch ex As Exception
                MsgBox(ex.Message)
            End Try
+            MsgBox("Finished - check log")
        End If
    End Sub

@@ -227,7 +260,7 @@ Public Class Form1

        Try
            If oDialogResult = DialogResult.OK Then
-                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
+                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName, True)
                Dim oResult = _zugferd.ValidateZUGFeRDDocument(oDoc)
                oResult = _zugferd.SerializeZUGFeRDDocument(oDoc)

--- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
+++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
@@ -16,27 +16,184 @@
    <Product>$(AssemblyName)</Product>
  </PropertyGroup>

+  <PropertyGroup>
+    <BaseOutputPath>$(MSBuildProjectDirectory)\bin\</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(MSBuildProjectDirectory)\obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>$(BaseOutputPath)Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>$(BaseOutputPath)Release\</OutputPath>
+  </PropertyGroup>
+
  <ItemGroup>
-    <PackageReference Include="GdPicture" Version="14.3.16" />
+    <PackageReference Include="GdPicture" Version="14.3.22" />
    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
    <PackageReference Include="NLog" Version="6.0.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll</HintPath>
+    <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="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\net8.0-windows\DigitalData.Modules.Database.dll</HintPath>
+    <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="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\net8.0-windows\DigitalData.Modules.Interfaces.dll</HintPath>
+    <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="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\net8.0-windows\DigitalData.Modules.Jobs.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\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.19\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="NativeSDK.Settings, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.19.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <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.1.0\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="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.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.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" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
  </ItemGroup>

  <ItemGroup>
@@ -53,5 +210,8 @@
      <Generator>SettingsSingleFileGenerator</Generator>
    </None>
  </ItemGroup>
-
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="..\..\DDModules\Jobs\Jobs.vbproj" />
+    <ProjectReference Include="..\..\DDModules\Config\Config.vbproj" />
+  </ItemGroup>
+</Project>
--- a/GUIs.Test.ZUGFeRDTest/packages.config
+++ b/GUIs.Test.ZUGFeRDTest/packages.config
@@ -4,8 +4,8 @@
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="GdPicture" version="14.3.14" targetFramework="net48" />
-  <package id="GdPicture.runtimes.windows" version="14.3.14" targetFramework="net48" />
+  <package id="GdPicture" version="14.3.19" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" 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" />
@@ -18,17 +18,14 @@
  <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.Data.SqlClient" version="4.8.6" 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.5" 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.6.1" targetFramework="net48" />
 </packages>
--- a/Service.EDMIService/EDMIService
+++ b/Service.EDMIService/EDMIService
@@ -0,0 +1,297 @@
+<?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>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <StartupObject>DigitalData.Services.EDMIService.WindowsService</StartupObject>
+    <RootNamespace>DigitalData.Services.EDMIService</RootNamespace>
+    <AssemblyName>EDMIService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>v4.6.2;net8.0</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    </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="DigitalData.Modules.Base">
+      <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.Database">
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.EDMI.API">
+      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Patterns">
+      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow">
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <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="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="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.5.0\lib\net462\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.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <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.IO.Compression" />
+    <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.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
+    <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" />
+  </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="BaseClass.vb" />
+    <Compile Include="BaseMethod.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigMethod.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigResponse.vb" />
+    <Compile Include="Methods\Database\DatabaseName.vb" />
+    <Compile Include="Methods\Database\DatabaseType.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryMethod.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryRequest.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryResponse.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueMethod.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueRequest.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableResponse.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileMethod.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileRequest.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileResponse.vb" />
+    <Compile Include="Methods\IDB\FileProperties.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueRequest.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\FileInfo.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoMethod.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\FileObject.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\AutomaticIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\BaseIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\AutomaticIndexing.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\PostProcessing.vb" />
+    <Compile Include="Methods\GlobalIndexer\Loader.vb" />
+    <Compile Include="Methods\GlobalIndexer\ManualIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\PostProcessingStep.vb" />
+    <Compile Include="Methods\GlobalIndexer\Profile.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileMethod.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileRequest.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueRequest.vb" />
+    <Compile Include="GlobalState.vb" />
+    <Compile Include="IDB\Helpers.vb" />
+    <Compile Include="Messages\AccessRightResult.vb" />
+    <Compile Include="Messages\Messages.vb" />
+    <Compile Include="Messages\BaseResponse.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Messages\DatabaseResult.vb" />
+    <Compile Include="EDMIService.vb" />
+    <Compile Include="Methods\IDB\AttributeValue.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileMethod.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileRequest.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileResponse.vb" />
+    <Compile Include="Scheduler\LogProvider.vb" />
+    <Compile Include="Scheduler\Scheduler.vb" />
+    <Compile Include="Scheduler\DatatableJob.vb" />
+    <Compile Include="Scheduler\JobListener.vb" />
+    <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
+    <Compile Include="ServiceHost.vb" />
+    <Compile Include="WindowsService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="IEDMIService.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <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>
+      <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>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettingsModule.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProjectInstaller.resx">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </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">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -226,6 +226,7 @@
    <Compile Include="Scheduler\DatatableJob.vb" />
    <Compile Include="Scheduler\JobListener.vb" />
    <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
    <Compile Include="ServiceHost.vb" />
    <Compile Include="WindowsService.vb">
      <SubType>Component</SubType>
--- a/Service.EDMIService/EDMIService1.vbproj
+++ b/Service.EDMIService/EDMIService1.vbproj
@@ -0,0 +1,297 @@
+<?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>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <StartupObject>DigitalData.Services.EDMIService.WindowsService</StartupObject>
+    <RootNamespace>DigitalData.Services.EDMIService</RootNamespace>
+    <AssemblyName>EDMIService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    </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="DigitalData.Modules.Base">
+      <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.Database">
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.EDMI.API">
+      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Patterns">
+      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow">
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <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="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="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.5.0\lib\net462\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.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <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.IO.Compression" />
+    <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.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
+    <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" />
+  </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="BaseClass.vb" />
+    <Compile Include="BaseMethod.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigMethod.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigResponse.vb" />
+    <Compile Include="Methods\Database\DatabaseName.vb" />
+    <Compile Include="Methods\Database\DatabaseType.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryMethod.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryRequest.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryResponse.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueMethod.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueRequest.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableResponse.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileMethod.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileRequest.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileResponse.vb" />
+    <Compile Include="Methods\IDB\FileProperties.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueRequest.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\FileInfo.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoMethod.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\FileObject.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\AutomaticIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\BaseIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\AutomaticIndexing.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\PostProcessing.vb" />
+    <Compile Include="Methods\GlobalIndexer\Loader.vb" />
+    <Compile Include="Methods\GlobalIndexer\ManualIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\PostProcessingStep.vb" />
+    <Compile Include="Methods\GlobalIndexer\Profile.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileMethod.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileRequest.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueRequest.vb" />
+    <Compile Include="GlobalState.vb" />
+    <Compile Include="IDB\Helpers.vb" />
+    <Compile Include="Messages\AccessRightResult.vb" />
+    <Compile Include="Messages\Messages.vb" />
+    <Compile Include="Messages\BaseResponse.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Messages\DatabaseResult.vb" />
+    <Compile Include="EDMIService.vb" />
+    <Compile Include="Methods\IDB\AttributeValue.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileMethod.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileRequest.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileResponse.vb" />
+    <Compile Include="Scheduler\LogProvider.vb" />
+    <Compile Include="Scheduler\Scheduler.vb" />
+    <Compile Include="Scheduler\DatatableJob.vb" />
+    <Compile Include="Scheduler\JobListener.vb" />
+    <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
+    <Compile Include="ServiceHost.vb" />
+    <Compile Include="WindowsService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="IEDMIService.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <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>
+      <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>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettingsModule.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProjectInstaller.resx">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </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">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>
--- a/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb
+++ b/Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb
@@ -86,14 +86,7 @@ Namespace Methods.GlobalIndexer.ImportFile
                oAutoAttributes = oAutomaticIndexing.ApplyAutomaticeAttributes(oUserAttributes, pData.File.FileInfoRaw, User)

                ' Import the file
-                Dim oNewFile As New NewFile.NewFileMethod(LogConfig, DatabaseIDB, DatabaseECM, GlobalState)
-                Dim oResponse = oNewFile.Run(New NewFile.NewFileRequest With {
-                    .File = pData.File,
-                    .IDBDoctypeId = pData.IDBDoctypeId,
-                    .KindType = pData.KindType,
-                    .StoreName = pData.StoreName,
-                    .User = User
-                })
+                Dim oResponse = ImportFile(pData)

                If oResponse.OK Then
                    Logger.Info("Import of file [{0}] under ObjectId [{1}] successful!", pData.File.FileName, oResponse.ObjectId)
@@ -147,7 +140,16 @@ Namespace Methods.GlobalIndexer.ImportFile
                Return New Globix_ImportFileResponse(ex)
            End Try
        End Function
-
+        Private Function ImportFile(pData As Globix_ImportFileRequest) As NewFile.NewFileResponse
+            Dim oNewFile As New NewFile.NewFileMethod(LogConfig, DatabaseIDB, DatabaseECM, GlobalState)
+            Return oNewFile.Run(New NewFile.NewFileRequest With {
+                .File = pData.File,
+                .IDBDoctypeId = pData.IDBDoctypeId,
+                .KindType = pData.KindType,
+                .StoreName = pData.StoreName,
+                .User = User
+            })
+        End Function
        Private Function GetVirtualPath(pFileInfo As FileInfo, pPathConvention As String, pUser As UserState, pUserAttributes As List(Of UserAttributeValue), pAutoAttributes As List(Of UserAttributeValue))
            Logger.Info("Generating virtual path for file [{0}]", pFileInfo.Name)

--- a/Service.EDMIService/Methods/IDB/GetFileObject/GetFileObjectMethod.vb
+++ b/Service.EDMIService/Methods/IDB/GetFileObject/GetFileObjectMethod.vb
@@ -2,6 +2,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports System.IO
+Imports DigitalData.Services.EDMIService.Security

 Namespace Methods.IDB.GetFileObject
    Public Class GetFileObjectMethod
@@ -69,6 +70,29 @@ Namespace Methods.IDB.GetFileObject
        End Function

        Private Function LoadFileContents(pFilePath As String) As Byte()
+            Try
+                Dim password = Environment.GetEnvironmentVariable("DD_FILE_ENCRYPTION_PASSWORD")
+                If String.IsNullOrWhiteSpace(password) Then
+                    Logger.Warn("No encryption password set (DD_FILE_ENCRYPTION_PASSWORD). Attempting legacy plain read for file [{0}]", pFilePath)
+                    Return ReadPlain(pFilePath)
+                End If
+
+                Try
+                    ' Try decrypt first (preferred path)
+                    Logger.Debug("Attempting AES decrypt for file [{0}]", pFilePath)
+                    Return SecureFileHandler.DecryptFileToBytes(pFilePath, password)
+                Catch exDec As Exception
+                    Logger.Warn("Decrypt failed for file [{0}]. Falling back to plain read. Reason: {1}", pFilePath, exDec.Message)
+                    Logger.Error(exDec)
+                    Return ReadPlain(pFilePath)
+                End Try
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return Nothing
+            End Try
+        End Function
+        Private Function LoadFileContents_Old(pFilePath As String) As Byte()
            Try
                Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read)
                    Using oMemoryStream As New MemoryStream()
@@ -85,6 +109,15 @@ Namespace Methods.IDB.GetFileObject

            End Try
        End Function
+
+        Private Function ReadPlain(pFilePath As String) As Byte()
+            Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read, FileShare.Read)
+                Using oMemoryStream As New MemoryStream()
+                    oFileStream.CopyTo(oMemoryStream)
+                    Return oMemoryStream.ToArray()
+                End Using
+            End Using
+        End Function
    End Class

 End Namespace
--- a/Service.EDMIService/Methods/IDB/NewFile/NewFileMethod.vb
+++ b/Service.EDMIService/Methods/IDB/NewFile/NewFileMethod.vb
@@ -3,6 +3,7 @@ Imports DigitalData.Modules.Base.IDB.Constants
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Database.MSSQLServer.TransactionMode
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Services.EDMIService.Security

 Namespace Methods.IDB.NewFile
    Public Class NewFileMethod
@@ -22,6 +23,197 @@ Namespace Methods.IDB.NewFile
            Logger.Debug("Running [NewFileMethod].")
            Dim oFilePath As String = Nothing

+            Try
+                If pData.File Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.File))
+                End If
+
+                If pData.KindType Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.KindType))
+                End If
+
+                If pData.StoreName Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.StoreName))
+                End If
+
+                If pData.User Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.User))
+                End If
+
+                If IsNothing(pData.IDBDoctypeId) Then
+                    Throw New ArgumentNullException(NameOf(pData.IDBDoctypeId))
+                End If
+
+                Logger.Debug("Checking if checksum already exists..")
+                Dim oExistingObjectId = Helpers.TestFileChecksumExists(pData.File.FileChecksum)
+                If oExistingObjectId > 0 Then
+                    Return New NewFileResponse(oExistingObjectId)
+                End If
+
+                Logger.Debug("Creating New ObjectId..")
+                Dim oObjectId = Helpers.NewObjectIdWithTransaction(pData.KindType, pData.User.UserName, Connection, Transaction)
+                If oObjectId = 0 Then
+                    LogAndThrow("Could not create new ObjectId!")
+                End If
+                Logger.Debug("New ObjectId [{0}] created!", oObjectId)
+
+                ' Find ObjectStore by Title
+                Logger.Debug("Checking for DataStore [{0}].", pData.StoreName)
+                Dim oStore = GlobalState.ObjectStores.
+                    Where(Function(store) store.Title = pData.StoreName).
+                    SingleOrDefault()
+
+                If oStore Is Nothing Then
+                    LogAndThrow($"DataStore [{pData.StoreName}] does not exist. Exiting.")
+                End If
+                Logger.Debug("Using DataStore [{0}].", pData.StoreName)
+
+                ' Get Store base and final path
+                Logger.Debug("Store BasePath is [{0}]", oStore.Path)
+                Dim oFinalPath = Helpers.GetFileObjectPath(oStore, pData.File.FileImportedAt)
+
+                ' Ensure target directory exists
+                Try
+                    If Not IO.Directory.Exists(oFinalPath) Then
+                        IO.Directory.CreateDirectory(oFinalPath)
+                    End If
+                Catch exDir As Exception
+                    LogAndThrow(exDir, $"Target directory [{oFinalPath}] could not be created.")
+                End Try
+
+                ' Get filename
+                Dim oKeepFileName As Boolean = False
+                If oStore.IsArchive Then
+                    Logger.Debug("Object Store is an archive: [{0}]", oStore.IsArchive)
+                    oKeepFileName = True
+                End If
+
+                Dim oFileName As String = GetFileObjectFileName(oObjectId, pData.File.FileName, oKeepFileName)
+                Logger.Debug("Filename is [{0}]", oFileName)
+
+                oFilePath = IO.Path.Combine(oFinalPath, oFileName)
+                Dim oFileObjectInfo As IO.FileInfo = New IO.FileInfo(oFilePath)
+
+                Dim oFileObjectName As String = oFileObjectInfo.Name
+                Logger.Debug("File Information for [{0}]:", oFileObjectName)
+
+                Dim oFileObjectSize As Long = pData.File.FileContents.Length ' original (plaintext) size
+                Logger.Debug("Original Size: [{0}]", oFileObjectSize)
+
+                Dim oOriginalExtension As String = pData.File.FileInfoRaw.Extension.Substring(1)
+                Logger.Debug("Original Extension: [{0}]", oOriginalExtension)
+
+                Logger.Debug("Checksum: [{0}]", pData.File.FileChecksum)
+
+                ' Retrieve encryption password (environment variable)
+                Dim encryptionPassword As String = Environment.GetEnvironmentVariable("DD_FILE_ENCRYPTION_PASSWORD")
+                If String.IsNullOrWhiteSpace(encryptionPassword) Then
+                    LogAndThrow("Encryption password not configured (env DD_FILE_ENCRYPTION_PASSWORD).")
+                End If
+
+                ' Perform encryption with strict failure handling
+                Try
+                    Logger.Info("Encrypting and saving file to path [{0}]", oFilePath)
+                    SecureFileHandler.EncryptFileFromBytes(pData.File.FileContents, oFilePath, encryptionPassword)
+                Catch exEnc As Exception
+                    LogAndThrow(exEnc, $"Could not encrypt/write file [{oFilePath}] to disk!")
+                End Try
+
+                ' Post-encryption validation: file must exist and contain at least header bytes
+                Try
+                    Dim fi As New IO.FileInfo(oFilePath)
+                    If Not fi.Exists Then
+                        LogAndThrow($"Encrypted file was not created at [{oFilePath}].")
+                    End If
+                    ' Minimum file size:1 (version) +4 (iterations) +32 (salt) =37 bytes
+                    If fi.Length < 37 Then
+                        LogAndThrow($"Encrypted file at [{oFilePath}] is invalid or truncated (size {fi.Length}).")
+                    End If
+                    Logger.Debug("Encrypted physical file size: [{0}]", fi.Length)
+                Catch exVal As Exception
+                    ' LogAndThrow above will throw; any other IO errors should also abort here
+                    LogAndThrow(exVal, "Encrypted file validation failed.")
+                End Try
+
+                '---------------------------------------------------------------------------
+
+                Logger.Info("Creating IDB FileObject for ObjectId [{0}].", oObjectId)
+                ' Insert into DB (store original plaintext size for consistency)
+                Dim oSQL As String = $"EXEC PRIDB_NEW_IDBFO 
+                '{oFinalPath}', 
+                '{oFileObjectName}', 
+                '{oOriginalExtension}',
+                {oFileObjectSize},
+                '{pData.File.FileChecksum}' ,
+                '{pData.User.UserName}',
+                '{oObjectId}',
+                {oStore.Id},
+                {pData.IDBDoctypeId}"
+
+                Dim oResult As Boolean = DatabaseIDB.ExecuteNonQueryWithConnectionObject(oSQL, Connection, ExternalTransaction, Transaction)
+
+                If oResult = False Then
+                    LogAndThrow("IDB FileObject could not be created!")
+                End If
+
+                '---------------------------------------------------------------------------
+
+                Dim oSystemAttributes As New Dictionary(Of String, Object) From {
+                    {Attributes.ATTRIBUTE_ORIGIN_FILENAME, pData.File.FileName},
+                    {Attributes.ATTRIBUTE_ORIGIN_CREATED, pData.File.FileCreatedAt},
+                    {Attributes.ATTRIBUTE_ORIGIN_CHANGED, pData.File.FileChangedAt}
+                }
+
+                For Each oAttribute As KeyValuePair(Of String, Object) In oSystemAttributes
+                    Try
+                        ' Dont write empty attributes
+                        If oAttribute.Value Is Nothing Then
+                            Continue For
+                        End If
+
+                        Dim oSuccess = Helpers.SetAttributeValueWithTransaction(Connection, Transaction, oObjectId, oAttribute.Key, oAttribute.Value, pData.User.Language, pData.User.UserName)
+                        If oSuccess Then
+                            Logger.Debug("System Attribute [{0}] written with value [{1}]", oAttribute.Key, oAttribute.Value)
+                        Else
+                            Logger.Warn("System attribute value could not be written")
+                        End If
+                    Catch ex As Exception
+                        LogAndThrow(ex, $"System attribute [{oAttribute.Key}] could not be written!")
+                    End Try
+                Next
+
+                '---------------------------------------------------------------------------
+
+                ' Finally, commit the transaction
+                Transaction?.Commit()
+
+                Return New NewFileResponse(oObjectId)
+
+            Catch ex As Exception
+                Logger.Warn("Error occurred while creating file!")
+                Logger.Error(ex)
+
+                Logger.Info("Cleaning up files.")
+                If Not IsNothing(oFilePath) AndAlso IO.File.Exists(oFilePath) Then
+                    Try
+                        IO.File.Delete(oFilePath)
+                    Catch exInner As Exception
+                        Logger.Warn("Error while cleaning up files.")
+                        Logger.Error(exInner)
+                    End Try
+                End If
+
+                Logger.Info("Rolling back transaction.")
+                Transaction?.Rollback()
+
+                Return New NewFileResponse(ex)
+
+            End Try
+        End Function
+        Public Function Run_Old(pData As NewFileRequest) As NewFileResponse
+            Logger.Debug("Running [NewFileMethod Old].")
+            Dim oFilePath As String = Nothing
+
            Try
                If pData.File Is Nothing Then
                    Throw New ArgumentNullException(NameOf(pData.File))
@@ -181,7 +373,6 @@ Namespace Methods.IDB.NewFile

            End Try
        End Function
-
        Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pFilename As String, pKeepFilename As Boolean) As String
            ' TODO: save actual extensions
            If pKeepFilename Then
--- a/Service.EDMIService/Security/SecureFileHandler.vb
+++ b/Service.EDMIService/Security/SecureFileHandler.vb
@@ -0,0 +1,146 @@
+Imports System.IO
+Imports System.Security.Cryptography
+
+Namespace Security
+    ''' <summary>
+    ''' Provides secure AES file encryption and decryption using PBKDF2 (Rfc2898DeriveBytes) for key derivation.
+    ''' File format:
+    ''' [1 byte Version][4 bytes IterationCount (Int32, big-endian)][32 bytes Salt][Encrypted Payload]
+    ''' </summary>
+    Public NotInheritable Class SecureFileHandler
+        Private Sub New()
+        End Sub
+
+        Private Const CURRENT_VERSION As Byte = 1
+        Private Const SALT_LENGTH As Integer = 32
+        Private Const KEY_SIZE_BYTES As Integer = 32 ' AES-256
+        Private Const IV_SIZE_BYTES As Integer = 16 ' AES Block size (128 bit)
+        Private Const DEFAULT_ITERATIONS As Integer = 100000
+        Private Const BUFFER_SIZE As Integer = 81920 '80KB streaming buffer
+
+        ''' <summary>
+        ''' Encrypts the provided byte array and writes an encrypted file to the target path using streaming.
+        ''' </summary>
+        Public Shared Sub EncryptFileFromBytes(sourceData() As Byte, targetFilePath As String, password As String, Optional iterations As Integer = DEFAULT_ITERATIONS)
+            If sourceData Is Nothing Then Throw New ArgumentNullException(NameOf(sourceData))
+            If String.IsNullOrWhiteSpace(password) Then Throw New ArgumentNullException(NameOf(password))
+            Using fsOut = New FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.None)
+                Dim salt = GenerateRandomBytes(SALT_LENGTH)
+
+                ' Write header: Version, Iterations, Salt
+                fsOut.WriteByte(CURRENT_VERSION)
+                WriteInt32BigEndian(fsOut, iterations)
+                fsOut.Write(salt, 0, salt.Length)
+
+                Using keyDerivation = New Rfc2898DeriveBytes(password, salt, iterations)
+                    Dim key = keyDerivation.GetBytes(KEY_SIZE_BYTES)
+                    Dim iv = keyDerivation.GetBytes(IV_SIZE_BYTES)
+
+                    Dim aesAlg As System.Security.Cryptography.Aes = System.Security.Cryptography.Aes.Create()
+                    Try
+                        aesAlg.KeySize = KEY_SIZE_BYTES * 8
+                        aesAlg.BlockSize = IV_SIZE_BYTES * 8
+                        aesAlg.Mode = CipherMode.CBC
+                        aesAlg.Padding = PaddingMode.PKCS7
+                        aesAlg.Key = key
+                        aesAlg.IV = iv
+
+                        Using crypto = aesAlg.CreateEncryptor()
+                            Using cs = New CryptoStream(fsOut, crypto, CryptoStreamMode.Write)
+                                Using msIn = New MemoryStream(sourceData, writable:=False)
+                                    Dim buffer(BUFFER_SIZE - 1) As Byte
+                                    Dim read As Integer
+                                    Do
+                                        read = msIn.Read(buffer, 0, buffer.Length)
+                                        If read <= 0 Then Exit Do
+                                        cs.Write(buffer, 0, read)
+                                    Loop
+                                End Using
+                                cs.FlushFinalBlock()
+                            End Using
+                        End Using
+                    Finally
+                        aesAlg.Dispose()
+                    End Try
+                End Using
+            End Using
+        End Sub
+
+        ''' <summary>
+        ''' Decrypts the encrypted file and returns the plaintext bytes.
+        ''' </summary>
+        Public Shared Function DecryptFileToBytes(encryptedFilePath As String, password As String) As Byte()
+            If String.IsNullOrWhiteSpace(encryptedFilePath) Then Throw New ArgumentNullException(NameOf(encryptedFilePath))
+            If String.IsNullOrWhiteSpace(password) Then Throw New ArgumentNullException(NameOf(password))
+            Using fsIn = New FileStream(encryptedFilePath, FileMode.Open, FileAccess.Read, FileShare.Read)
+                Dim version = CByte(fsIn.ReadByte())
+                If version <> CURRENT_VERSION Then Throw New InvalidDataException("Unsupported file version.")
+                Dim iterations = ReadInt32BigEndian(fsIn)
+                Dim salt = New Byte(SALT_LENGTH - 1) {}
+                ReadExact(fsIn, salt, 0, salt.Length)
+
+                Using keyDerivation = New Rfc2898DeriveBytes(password, salt, iterations)
+                    Dim key = keyDerivation.GetBytes(KEY_SIZE_BYTES)
+                    Dim iv = keyDerivation.GetBytes(IV_SIZE_BYTES)
+
+                    Dim aesAlg As System.Security.Cryptography.Aes = System.Security.Cryptography.Aes.Create()
+                    Try
+                        aesAlg.KeySize = KEY_SIZE_BYTES * 8
+                        aesAlg.BlockSize = IV_SIZE_BYTES * 8
+                        aesAlg.Mode = CipherMode.CBC
+                        aesAlg.Padding = PaddingMode.PKCS7
+                        aesAlg.Key = key
+                        aesAlg.IV = iv
+
+                        Using crypto = aesAlg.CreateDecryptor()
+                            Using cs = New CryptoStream(fsIn, crypto, CryptoStreamMode.Read)
+                                Using msOut = New MemoryStream()
+                                    Dim buffer(BUFFER_SIZE - 1) As Byte
+                                    Dim read As Integer
+                                    Do
+                                        read = cs.Read(buffer, 0, buffer.Length)
+                                        If read <= 0 Then Exit Do
+                                        msOut.Write(buffer, 0, read)
+                                    Loop
+                                    Return msOut.ToArray()
+                                End Using
+                            End Using
+                        End Using
+                    Finally
+                        aesAlg.Dispose()
+                    End Try
+                End Using
+            End Using
+        End Function
+
+        Private Shared Function GenerateRandomBytes(length As Integer) As Byte()
+            Dim data = New Byte(length - 1) {}
+            Using rng = RandomNumberGenerator.Create()
+                rng.GetBytes(data)
+            End Using
+            Return data
+        End Function
+
+        Private Shared Sub WriteInt32BigEndian(stream As Stream, value As Integer)
+            Dim bytes = BitConverter.GetBytes(value)
+            If BitConverter.IsLittleEndian Then Array.Reverse(bytes)
+            stream.Write(bytes, 0, bytes.Length)
+        End Sub
+
+        Private Shared Function ReadInt32BigEndian(stream As Stream) As Integer
+            Dim bytes = New Byte(3) {}
+            ReadExact(stream, bytes, 0, 4)
+            If BitConverter.IsLittleEndian Then Array.Reverse(bytes)
+            Return BitConverter.ToInt32(bytes, 0)
+        End Function
+
+        Private Shared Sub ReadExact(stream As Stream, buffer As Byte(), offset As Integer, count As Integer)
+            Dim totalRead As Integer = 0
+            While totalRead < count
+                Dim read = stream.Read(buffer, offset + totalRead, count - totalRead)
+                If read <= 0 Then Throw New EndOfStreamException("Unexpected end of stream.")
+                totalRead += read
+            End While
+        End Sub
+    End Class
+End Namespace
--- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
+++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
@@ -1,50 +1,164 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?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>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}</ProjectGuid>
    <OutputType>WinExe</OutputType>
-    <RootNamespace>DDZUGFeRDService</RootNamespace>
    <StartupObject>DDZUGFeRDService.ZUGFeRDService</StartupObject>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyTitle>DDZUGFeRDService</AssemblyTitle>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <Product>DDZUGFeRDService</Product>
-    <AssemblyVersion>3.0.0</AssemblyVersion>
-    <FileVersion>3.0.0</FileVersion>
-</PropertyGroup>
-
+    <RootNamespace>DDZUGFeRDService</RootNamespace>
+    <AssemblyName>DDZUGFeRDService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </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>DDZUGFeRDService.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>DDZUGFeRDService.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="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\net8.0-windows\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\net8.0-windows\DigitalData.Modules.Interfaces.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Interfaces, Version=2.2.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\net8.0-windows\DigitalData.Modules.Jobs.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Jobs, Version=2.8.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
-    <PackageReference Include="NLog" Version="6.0.4" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.9" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <PackageReference Include="System.DirectoryServices" Version="9.0.9" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.9" />
+    <Reference Include="Microsoft.CSharp" />
+    <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="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <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="Config.vb" />
+    <Compile Include="Constants.vb" />
+    <Compile Include="..\\..\\DDModules\\Jobs\\ZUGFeRD\\WorkerArgs.vb">
+      <Link>ZUGFeRD\\WorkerArgs.vb</Link>
+    </Compile>
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ThreadRunner.vb" />
+    <Compile Include="ZUGFeRDService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ZUGFeRDService.Designer.vb">
+      <DependentUpon>ZUGFeRDService.vb</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <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>
+    <EmbeddedResource Include="ZUGFeRDService.resx">
+      <DependentUpon>ZUGFeRDService.vb</DependentUpon>
+    </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" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Services.ZUGFeRDService/My
+++ b/Services.ZUGFeRDService/My
@@ -1,9 +1,35 @@
 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("DDZUGFeRDService")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("DDZUGFeRDService")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("2.9.3.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("c22925cb-9170-4e8a-922b-175ee4f40d46")>
+
+' 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("2.9.3.0")>
+<Assembly: AssemblyFileVersion("2.9.3.0")>
--- a/Services.ZUGFeRDService/Program.cs
+++ b/Services.ZUGFeRDService/Program.cs
@@ -1,21 +0,0 @@
-using CoreWCF.Configuration;
-using CoreWCF.Description;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add CoreWCF services
-builder.Services.AddServiceModelServices();
-builder.Services.AddServiceModelMetadata();
-builder.Services.AddSingleton<IServiceBehavior, UseRequestHeadersForMetadataAddressBehavior>();
-
-var app = builder.Build();
-
-app.UseServiceModel(builder =>
-{
-    // TODO add here service endpoints and behaviors
-});
-
-var serviceMetadataBehavior = app.Services.GetRequiredService<ServiceMetadataBehavior>();
-serviceMetadataBehavior.HttpGetEnabled = true;
-
-app.Run();
--- a/Services.ZUGFeRDService/ProjectInstaller.vb
+++ b/Services.ZUGFeRDService/ProjectInstaller.vb
@@ -0,0 +1,24 @@
+Imports System.ComponentModel
+Imports System.Configuration.Install
+Imports System.ServiceProcess
+
+<RunInstaller(True)>
+Public Class ProjectInstaller
+    Inherits Installer
+
+    Private ReadOnly process As ServiceProcessInstaller
+    Private ReadOnly components As IContainer
+    Private ReadOnly service As ServiceInstaller
+
+    Public Sub New()
+        process = New ServiceProcessInstaller With {
+            .Account = ServiceAccount.LocalSystem
+        }
+        service = New ServiceInstaller With {
+            .ServiceName = Constants.SERVICE_NAME,
+            .DisplayName = Constants.SERVICE_DISPLAY_NAME
+        }
+        Installers.Add(process)
+        Installers.Add(service)
+    End Sub
+End Class
--- a/Services.ZUGFeRDService/ThreadRunner.vb
+++ b/Services.ZUGFeRDService/ThreadRunner.vb
@@ -1,5 +1,4 @@
 Imports System.ComponentModel
-Imports System.Data
 Imports System.IO
 Imports System.Timers
 Imports DigitalData.Modules.Config
--- a/Services.ZUGFeRDService/ZUGFeRDService.vb
+++ b/Services.ZUGFeRDService/ZUGFeRDService.vb
@@ -11,8 +11,8 @@ Public Class ZUGFeRDService

    Protected Overrides Sub OnStart(args() As String)
        Try
-            LogConfig = New LogConfig(PathType.CustomPath, Path.Combine(AppContext.BaseDirectory, "Log"), Nothing, "Digital Data", "DDZUGFeRDService")
-            Dim oConfig = New ConfigManager(Of Config)(LogConfig, AppContext.BaseDirectory)
+            LogConfig = New LogConfig(PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DDZUGFeRDService")
+            Dim oConfig = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
            LogConfig.Debug = oConfig.Config.Debug
            Logger = LogConfig.GetLogger()
            Logger.Info($"{Constants.SERVICE_NAME} is starting.")
@@ -43,6 +43,4 @@ Public Class ZUGFeRDService
        Logger.Info($"{Constants.SERVICE_NAME} stopped.")
    End Sub

-
-
 End Class
--- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
@@ -465,7 +465,7 @@ namespace ZUGFeRDRESTService.Controllers
            var language = "de-DE";
            var searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web";

-            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language == language).FirstOrDefault();
+            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language.Equals(language, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
            if (messageItem != null)
            {
                _logger.Info("GetRejectionMessage() - messageItem: '" + messageItem.String1 + "'");
Author	SHA1	Message	Date
Developer01	97d4ca26f4	Upgrade .NET8 ZugferdTest	2025-12-30 12:03:59 +01:00
Developer01	942ce662ec	Vor Update .net8	2025-12-29 12:36:19 +01:00
Developer01	e1d5c2961d	Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo	2025-12-23 13:02:31 +01:00
Developer01	0ef5a3b339	Filesystem EDMI	2025-12-23 13:02:14 +01:00
Developer01	8cdd6e8026	Merge	2025-12-23 13:01:06 +01:00
Developer01	4310cd79b7	Push 462	2025-12-23 12:51:12 +01:00
Developer01	1d17afb400	GDViewer Nothing	2025-12-03 13:29:18 +01:00
Developer01	4085d05368	DocViewer isnothing	2025-12-01 16:37:27 +01:00
Developer01	07332a4990	MS DocumentViewer	2025-11-28 09:23:48 +01:00
Developer01	b87995221f	DocumentViewer GDPicture Update 14.3.19	2025-11-17 08:51:19 +01:00