diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb
index 11cbdf09..e95260a9 100644
--- a/EnvelopeGenerator.Form/Controllers/BaseController.vb
+++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb
@@ -144,12 +144,6 @@ Public MustInherit Class BaseController
             If IO.File.Exists(pDocument.Filepath) Then
                 IO.File.Delete(pDocument.Filepath)
             End If
-            Dim oFolder As String = Path.GetDirectoryName(pDocument.Filepath)
-            If Directory.Exists(oFolder) Then
-                Directory.Delete(oFolder)
-            End If
-
-
             Return True
         Catch ex As Exception
             Logger.Error(ex)
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index 0053407a..fffe99c4 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -158,7 +158,7 @@ Public Class EnvelopeEditorController
         Try
             Dim oFileInfo = New FileInfo(pDocumentFilePath)
             Dim oTempFiles As New TempFiles(State.LogConfig)
-            Dim oTempFilePath = Path.Combine(oTempFiles.TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
+            Dim oTempFilePath = Path.Combine(oTempFiles._TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
 
             Await Helpers.CopyFileAsync(oFileInfo.FullName, oTempFilePath)
 
@@ -294,7 +294,7 @@ Public Class EnvelopeEditorController
     Private Function GetEnvelopePath(pEnvelope As Envelope) As String
         Try
             Dim oTempFiles As New TempFiles(State.LogConfig)
-            Dim oTempFolderPath = oTempFiles.TempPath
+            Dim oTempFolderPath = oTempFiles._TempPath
             Dim oEnvelopePath As String = Path.Combine(oTempFolderPath, pEnvelope.Uuid)
 
             If Not Directory.Exists(oEnvelopePath) Then
diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
index c3b113b5..00e52928 100644
--- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
+++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
@@ -50,6 +50,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
+    <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.BonusSkins.v21.2" />
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v21.2" />
@@ -98,26 +101,167 @@
     <Reference Include="DigitalData.Modules.Messaging">
       <HintPath>..\..\2_DLL Projekte\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="EnvelopeGenerator.Common, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.1.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\Microsoft.Win32.Registry.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.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="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.45\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.45\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=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.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" />
+    <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.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.1\lib\net462\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.0\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.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -127,6 +271,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -285,12 +430,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.1\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.1\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.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.1\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.1\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/EnvelopeGenerator.Form/Helper/TempFiles.vb b/EnvelopeGenerator.Form/Helper/TempFiles.vb
index 3ae0eff7..a7359900 100644
--- a/EnvelopeGenerator.Form/Helper/TempFiles.vb
+++ b/EnvelopeGenerator.Form/Helper/TempFiles.vb
@@ -5,19 +5,23 @@ Imports DigitalData.Modules.Logging
 Public Class TempFiles
     Inherits BaseClass
 
-    Public Property TempPath As String
+    Public Property _TempPath As String
 
     Public Sub New(pLogConfig As LogConfig)
         MyBase.New(pLogConfig)
 
         Dim oTempDirectoryPath = Path.GetTempPath()
-        TempPath = Path.Combine(oTempDirectoryPath, "EnvelopeGenerator")
+        _TempPath = Path.Combine(oTempDirectoryPath, "EnvelopeGenerator")
+
+        If Not Directory.Exists(_TempPath) Then
+            Directory.CreateDirectory(_TempPath)
+        End If
     End Sub
 
     Public Function Create() As Boolean
         Try
-            If Directory.Exists(TempPath) = False Then
-                Directory.CreateDirectory(TempPath)
+            If Directory.Exists(_TempPath) = False Then
+                Directory.CreateDirectory(_TempPath)
             Else
                 CleanUpFiles()
             End If
@@ -32,10 +36,13 @@ Public Class TempFiles
 
     Private Function CleanUpFiles() As Boolean
         Try
-            For Each fileItem As String In Directory.GetFiles(TempPath)
-                Logger.Debug("Deleting tempPath-file: {0} ...", fileItem)
-                File.Delete(fileItem)
-            Next
+            If Directory.Exists(_TempPath) Then
+                For Each fileItem As String In Directory.GetFiles(_TempPath)
+                    Logger.Debug("Deleting tempPath-file: {0} ...", fileItem)
+                    File.Delete(fileItem)
+                Next
+            End If
+
 
             Return True
 
@@ -47,8 +54,8 @@ Public Class TempFiles
 
     Public Function CleanUp() As Boolean
         Try
-            Logger.Debug("Deleting tempPath-Data: {0} ...", TempPath)
-            Directory.Delete(TempPath, True)
+            Logger.Debug("Deleting tempPath-Data: {0} ...", _TempPath)
+            Directory.Delete(_TempPath, True)
             Return True
 
         Catch ex As Exception
diff --git a/EnvelopeGenerator.Form/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Form/My Project/AssemblyInfo.vb
index 8afa2bdc..76e7b2de 100644
--- a/EnvelopeGenerator.Form/My Project/AssemblyInfo.vb	
+++ b/EnvelopeGenerator.Form/My Project/AssemblyInfo.vb	
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Envelope Generator")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("2.8.0.0")>
+<Assembly: AssemblyTrademark("2.9.0.0")>
 <Assembly: AssemblyCulture("")>
 
 ' Setting ComVisible to false makes the types in this assembly not visible 
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 ' [assembly: AssemblyVersion("1.0.*")]
-<Assembly: AssemblyVersion("2.8.0.0")>
+<Assembly: AssemblyVersion("2.9.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/EnvelopeGenerator.Form/app.config b/EnvelopeGenerator.Form/app.config
index 6cdebead..cb25803d 100644
--- a/EnvelopeGenerator.Form/app.config
+++ b/EnvelopeGenerator.Form/app.config
@@ -72,7 +72,31 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 7b06c843..0e07e699 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -73,6 +73,7 @@ Partial Public Class frmEnvelopeEditor
 
         If oDocument IsNot Nothing Then
             Documents.Add(oDocument)
+            GridDocuments.DataSource = Documents
             ' Update_File_DB(OpenFileDialog1.FileName)
             ClearBsiItem()
             Return True
@@ -113,7 +114,7 @@ Partial Public Class frmEnvelopeEditor
 
             For Each docItem As EnvelopeDocument In Documents
                 If Not File.Exists(docItem.Filepath) Then
-                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFolder = TempFiles._TempPath
                     Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{Envelope.Id}.pdf")
                     If File.Exists(oTempFilename) Then
                         Try
@@ -220,7 +221,7 @@ Partial Public Class frmEnvelopeEditor
                 Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument)
                 Dim oEnvelope = Controller.Envelope
                 If Not IsNothing(oDocument.Byte_Data) Then
-                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFolder = TempFiles._TempPath
                     Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
                     If Not File.Exists(oTempFilename) Then
                         WriteBytetoPath(oTempFilename, oDocument.Byte_Data)
@@ -677,7 +678,7 @@ Partial Public Class frmEnvelopeEditor
                     Dim dstPDF As GdPicturePDF = arPDF(0).MergeDocuments(arPDF)
                     Dim oStatus As GdPictureStatus = arPDF(0).GetStat()
                     If oStatus = GdPictureStatus.OK Then
-                        Dim oTempFolder = MyTempFiles.TempPath
+                        Dim oTempFolder = MyTempFiles._TempPath
                         If Not Directory.Exists(oTempFolder) Then
                             Directory.CreateDirectory(oTempFolder)
                         End If
diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx
index a3591bff..c83fef0d 100644
--- a/EnvelopeGenerator.Form/frmMain.resx
+++ b/EnvelopeGenerator.Form/frmMain.resx
@@ -1469,16 +1469,16 @@
     <value>0</value>
   </data>
   <metadata name="RefreshTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>193, 17</value>
+    <value>17, 54</value>
   </metadata>
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>316, 17</value>
+    <value>17, 91</value>
   </metadata>
   <data name="SaveFileDialog1.Filter" xml:space="preserve">
     <value>PDF Files|*.pdf</value>
   </data>
   <metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>452, 17</value>
+    <value>17, 128</value>
   </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index 5875beea..31b22f28 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -250,7 +250,7 @@ Public Class frmMain
             Me.Cursor = Cursors.WaitCursor
             Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
             GetResRepFileStreamByte(oEnvelope.Id)
-            Dim oTempFolder = TempFiles.TempPath
+            Dim oTempFolder = TempFiles._TempPath
             If Not Directory.Exists(oTempFolder) Then
                 Directory.CreateDirectory(oTempFolder)
             End If
@@ -377,7 +377,7 @@ Public Class frmMain
                 Exit Sub
             Else
                 If Not IsNothing(oDocument.Byte_Data) Then
-                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFolder = TempFiles._TempPath
                     Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
                     If File.Exists(oTempFilename) Then
                         Try
diff --git a/EnvelopeGenerator.Form/packages.config b/EnvelopeGenerator.Form/packages.config
index 45150649..ff18ed4b 100644
--- a/EnvelopeGenerator.Form/packages.config
+++ b/EnvelopeGenerator.Form/packages.config
@@ -1,6 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
+  <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.1" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.1" 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" />
+  <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="net462" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.45" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.45" 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="9.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
+  <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
+  <package id="System.Management" version="9.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="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="9.0.0" 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>
\ No newline at end of file