diff --git a/.vs/DD_PM_WINDREAM/v15/.suo b/.vs/DD_PM_WINDREAM/v15/.suo
index 795d24d..e17d520 100644
Binary files a/.vs/DD_PM_WINDREAM/v15/.suo and b/.vs/DD_PM_WINDREAM/v15/.suo differ
diff --git a/.vs/ProcessManagerClient/v15/.suo b/.vs/ProcessManagerClient/v15/.suo
index 993f2f1..62acf23 100644
Binary files a/.vs/ProcessManagerClient/v15/.suo and b/.vs/ProcessManagerClient/v15/.suo differ
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 6b61141..c8a8006 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -2,5 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
+  "SelectedNode": "\\DD_PM_WINDREAM.sln",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/DD_PM_WINDREAM.sln b/DD_PM_WINDREAM.sln
index a730ab5..cfdcc0f 100644
--- a/DD_PM_WINDREAM.sln
+++ b/DD_PM_WINDREAM.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_PM_WINDREAM", "DD_PM_WINDREAM\DD_PM_WINDREAM.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{A28B0175-3407-4831-86DA-22AF0D121FFD}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{E714688A-5E3D-4229-9645-9FB650139B47}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,16 +26,16 @@ Global
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.Release|x86.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.CD_ROM|x86.ActiveCfg = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.CD_ROM|x86.Build.0 = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.Debug|x86.ActiveCfg = Debug|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.Debug|x86.Build.0 = Debug|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.DVD-5|x86.ActiveCfg = Debug|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.DVD-5|x86.Build.0 = Debug|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.Release|x86.ActiveCfg = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.Release|x86.Build.0 = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.SingleImage|x86.ActiveCfg = Release|x86
-		{A28B0175-3407-4831-86DA-22AF0D121FFD}.SingleImage|x86.Build.0 = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.CD_ROM|x86.ActiveCfg = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.CD_ROM|x86.Build.0 = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.Debug|x86.ActiveCfg = Debug|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.Debug|x86.Build.0 = Debug|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.DVD-5|x86.ActiveCfg = Debug|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.DVD-5|x86.Build.0 = Debug|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.Release|x86.ActiveCfg = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.Release|x86.Build.0 = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.SingleImage|x86.ActiveCfg = Release|x86
+		{E714688A-5E3D-4229-9645-9FB650139B47}.SingleImage|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DD_PM_WINDREAM/My Project/licenses.licx b/DD_PM_WINDREAM/My Project/licenses.licx
index e69de29..8b13789 100644
--- a/DD_PM_WINDREAM/My Project/licenses.licx	
+++ b/DD_PM_WINDREAM/My Project/licenses.licx	
@@ -0,0 +1 @@
+
diff --git a/Setup/Config.wxi b/Setup/Config.wxi
new file mode 100644
index 0000000..2f5c59e
--- /dev/null
+++ b/Setup/Config.wxi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define ProgramName="DD_PM_WINDREAM"?>
+  <?define ProductName="Process Manager"?>
+  <?define Manufacturer="Digital Data"?>
+  <?define Description="Beschreibung des Programms"?>
+  <?define Comments="Kommentar wie Copyright-Hinweis"?>
+  <?define UpgradeCode="21ECB2F2-574B-4F4C-8889-A1CA2CEB2455"?>
+</Include>
\ No newline at end of file
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index 8d5195d..0507b9e 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Process Manger" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
-    <Package Id="*" Keywords="Installer" Description="Digital Data Process Manager Setup" Comments="Process Manager is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
+<?include Config.wxi?>
 
-    <!-- Nicht entfernen! -->
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value="Process Manager Install" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+    <Package
+      Id="*"
+      Keywords="Installer"
+      Description="$(var.Description)"
+      Comments="$(var.Comments)"
+      Manufacturer="$(var.Manufacturer)"
+      InstallerVersion="100"
+      Languages="1031"
+      Compressed="yes"
+      SummaryCodepage="1252"
+      InstallScope="perMachine"
+    />
+
+    <Property Id="APPLICATIONFOLDER">
+      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+    </Property>
+
+    <Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+    <Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
 
-    <!-- UPGRADE -->
-    <!-- 
-      Bei neuer Version muss die Versionsnummer unter 
-      My Project >> Anwendung >> Assemblyinformationen und unter Product/@Version geändert werden.
-      Hier die Assemblyversion UND Dateiversion ändern.
-      
-      NICHT den UpdateCode ändern!
-      Darf sich NIE MEHR ändern!
-    -->
     <MajorUpgrade
       AllowDowngrades="no"
       AllowSameVersionUpgrades="no"
@@ -24,130 +29,109 @@
     />
 
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="{930076B5-9D2B-455F-920F-9718ED091D0C}">
+    <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion
-        Minimum="1.0.0" Maximum="99.0.0"
+        Minimum="1.0.0.0" Maximum="99.0.0.0"
         Property="PREVIOUSVERSIONSINSTALLED"
         IncludeMinimum="yes" IncludeMaximum="no" />
     </Upgrade>
-    <!-- UPGRADE END -->
 
     <!-- Legt das Icon fest -->
-    <Icon Id="DD_PM_WINDREAM.exe" SourceFile="E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe" />
-
+    <Icon Id="AppIcon" SourceFile="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" />
     <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
-    <Property Id="ARPPRODUCTICON" Value="DD_PM_WINDREAM.exe" />
+    <Property Id="ARPPRODUCTICON" Value="AppIcon" />
 
-    <!-- Liest den Installationsort über die Registry aus -->
-    <Property Id="APPLICATIONFOLDER">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
-    </Property>
-
-    <!-- Legt die Ordner Struktur fest -->
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="Pfiles">
-        <Directory Id="DD" Name="Digital Data">
-          <!-- Speichert den Installationsort in der Registry -->
-          <Component Id="RegistryEntries" Guid="57CCE36E-F152-4D17-81A0-CCAAEFA777A3">
-            <RegistryKey Root="HKCU" Key="Software\[Manufacturer]\[ProductName]">
-              <RegistryValue Type="string" Name="Path" Value="[INSTALLDIR]" KeyPath="yes" />
-            </RegistryKey>
-          </Component>
-
-          <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Process Manager">
-
-            <!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="EE8034F0-A2DE-4C38-A961-7F7668229416">
-              <File Id="GIEXE" Name="DD_PM_WINDREAM.exe" Source="E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe" KeyPath="yes">
-                <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="Process Manager" WorkingDirectory="INSTALLDIR" Icon="DD_PM_WINDREAM.exe" IconIndex="0" Advertise="yes" />
-                <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Process Manager" WorkingDirectory="INSTALLDIR" Icon="DD_PM_WINDREAM.exe" IconIndex="0" Advertise="yes" />
-              </File>
-              <!--Programmordner bei Deinstallation entfernen-->
-              <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-            </Component>
-            <!-- Die ReleaseNotes -->
-            <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
-              <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt" KeyPath="yes">
-              </File>
-            </Component>
-            <!-- Die ApplicationIco -->
-            <Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
-              <File Id="ApplicationIco" Name="DD_Icons_ICO_PM_128.ico" Source="S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_PM_128.ico" KeyPath="yes">
-              </File>
-            </Component>
-
-            <!--WINDREAM Bibliotheken-->
-            <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll" KeyPath="yes"/>
-              <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll"/>
-            </Component>
-
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes"/>
-            </Component>
-
-            <!-- DEVEXPRESS Bibliotheken -->
-            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes"/>
-              <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll"/>
-              <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" />
-              <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll"/>
-              <File Id="DevExpress.RichEdit.v15.2.Core" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll"/>
-              <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll"/>
-              <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll"/>
-              <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll"/>
-              <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll"/>
-              <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll"/>
-              <File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll"/>
-              <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll"/>
-             </Component>
-            <!-- Digital-Data DLLS -->
-            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll" KeyPath="yes"/>
-            </Component>
-            <!-- Oracle-Bibliothek -->
-            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
-            </Component>
-          </Directory>
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="DDDIR" Name="$(var.Manufacturer)">
+          <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
+    </Directory>
+
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes"/>
+      </Component>
+
+      <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
+        <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt" KeyPath="yes">
+        </File>
+      </Component>
+
+      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
+        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
+        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll"/>
+      </Component>
+
+      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
+        <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes"/>
+      </Component>
+
+      <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
+        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
+      </Component>
+
+      <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
+      </Component>
+
+      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
+        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes"/>
+        <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll"/>
+        <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" />
+        <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll"/>
+        <File Id="DevExpress.RichEdit.v15.2.Core" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll"/>
+        <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll"/>
+        <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll"/>
+        <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll"/>
+        <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll"/>
+        <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll"/>
+        <File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll"/>
+        <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll"/>
+      </Component>
+
+      <Component Id="RegistryKeys" Guid="4503BF18-22F2-4DBF-B281-06DE039F52C8">
+        <RegistryKey Root="HKCU" Key="Software">
+
+          <RegistryKey Key="[Manufacturer]">
+            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+            </RegistryKey>
+          </RegistryKey>
+
+        </RegistryKey>
+
+        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      </Component>
 
-      <!-- Startmenü Ordner -->
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="Process Manager">
-          <Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
+          <Component Id="ProgramMenuDir" Guid="84FC82EA-EF4F-4246-A463-B076E878DF0A">
             <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
             <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" />
           </Component>
         </Directory>
       </Directory>
 
-      <!-- Desktop Ordner -->
       <Directory Id="DesktopFolder" Name="Desktop" />
-    </Directory>
+    </DirectoryRef>
 
-    <!-- Installierte Features -->
-    <Feature Id="Complete" Level="1">
-      <ComponentRef Id="MainExecutable" />
-      <ComponentRef Id="ReleaseNotes"/>
+    <Feature Id="MainApplication" Title="Main Application" Level="1">
+      <ComponentRef Id="MainApplicationExe" />
+      <ComponentRef Id="RegistryKeys" />
+      <ComponentRef Id="ReleaseNotes" />
       <ComponentRef Id="WindreamLibs" />
       <ComponentRef Id="DDLibs" />
-      <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="Oracle" />
+      <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="ProgramMenuDir"/>
-      <ComponentRef Id="RegistryEntries"/>
-      <ComponentRef Id="ApplicationIco"/>
-
+      <ComponentRef Id="ProgramMenuDir" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
 
-    <!-- OBERFLÄCHE -->
     <UI>
       <UIRef Id="WixUI_InstallDir" />
       <UIRef Id="WixUI_ErrorProgressText" />
@@ -157,11 +141,10 @@
             Value="InstallDirDlg"
             Order="2">1</Publish>
       <Publish Dialog="InstallDirDlg"
-                Control="Back"
-                Event="NewDialog"
-                Value="WelcomeDlg"
-                Order="2">1</Publish>
+            Control="Back"
+            Event="NewDialog"
+            Value="WelcomeDlg"
+            Order="2">1</Publish>
     </UI>
-    <!-- OBERFLÄCHE END -->
   </Product>
 </Wix>
\ No newline at end of file
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index 6521459..844b015 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?include Config.wxi?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.9</ProductVersion>
-    <ProjectGuid>a28b0175-3407-4831-86da-22af0d121ffd</ProjectGuid>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>e714688a-5e3d-4229-9645-9fb650139b47</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Process Manager</OutputName>
+    <OutputName>Setup</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -15,6 +15,8 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <Cultures>
+    </Cultures>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -33,7 +35,13 @@
       <Name>WixUIExtension</Name>
     </WixExtension>
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+  <ItemGroup>
+    <Content Include="Config.wxi" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
+    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
   <Target Name="BeforeBuild">
     <!-- Get the programs assembly version from the .exe file -->
     <GetAssemblyIdentity AssemblyFiles="..\DD_PM_WINDREAM\bin\$(Configuration)\DD_PM_WINDREAM.exe">
diff --git a/Setup/Setup.wixproj.user b/Setup/Setup.wixproj.user
new file mode 100644
index 0000000..7f2e74f
--- /dev/null
+++ b/Setup/Setup.wixproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ReferencePaths>E:\JenneJ\Visual Studio\ProcessManagerClient\DD_PM_WINDREAM\bin\Debug\</ReferencePaths>
+  </PropertyGroup>
+</Project>
\ No newline at end of file