diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 63cc71a..6058670 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1902,8 +1902,7 @@ Public Class frmIndex
     Private Sub frmIndex_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         Try
             ' This prevents the thread issue when the form containing the viewer is opened via ShowDialog.
-            DocumentViewer1.CloseFile()
-            DocumentViewer1.Dispose()
+            DocumentViewer1.Done()
 
             ClassWindowLocation.SaveFormLocationSize(Me)
             My.Settings.Save()
@@ -2600,7 +2599,7 @@ Public Class frmIndex
                         If Name_Generieren() = True Then
                             If LogErrorsOnly = False Then ClassLogger.Add(" ...Name_Generieren durchlaufen", False)
                             'Dokumentenviewer ausblenden um keinen Zugriffsfehler zu produzieren
-                            DocumentViewer1.CloseFile()
+                            DocumentViewer1.Done()
                             If LogErrorsOnly = False Then ClassLogger.Add(" ...Viewer geschlossen", False)
                             'Die Datei verschieben
                             If Move_File2_Target() = True Then
@@ -2614,7 +2613,7 @@ Public Class frmIndex
                                 ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
                                     'Die temporäre Datei löschen
                                     If CURRENT_WORKFILE.EndsWith("pdf") Then
-                                        DocumentViewer1.CloseFile()
+                                        DocumentViewer1.Done()
                                     End If
 
                                     DeleteFile()
diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index f78fd93..fa46e76 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -113,6 +113,14 @@
         <File Id="Filesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll" KeyPath="no" />
         <File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
         <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="no" />
+        <File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" />
+      </Component>
+      
+       <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
+        <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
+        <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
+        <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
+        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
       </Component>
 
       <!--Verschiedene Bibliotheken-->
@@ -236,6 +244,7 @@
       <ComponentRef Id="Microsoft.Office" />
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="DevExpressLibs" />
+      <ComponentRef Id="GDPictureLibs" />
       <ComponentRef Id="RegistryKeys"/>
       <ComponentRef Id="ApplicationIco"/>
       <ComponentRef Id="GlobalIndexer.Locales.de" />