diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs
index 828db69..3130595 100644
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -43,20 +43,13 @@
       <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
     </Property>
 
-    <!-- Legt die Ordner Struktur fest -->
+    <!-- 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="[DD]" KeyPath="yes" />
-            </RegistryKey>
-          </Component>
+        <Directory Id="DD" Name="Digital Data">         
           
           <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Record Organizer 1.0">          
+          <Directory Id="INSTALLDIR" Name="Record Organizer">          
             
             <!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
             <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
@@ -78,11 +71,13 @@
               <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="Interop.WMOBRWSLib.dll" KeyPath="no" />
               <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="Interop.WMOSRCHLib.dll" KeyPath="no" />
             </Component>
+            
              <!-- Oracle-Bibliothek -->
             <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
               <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
             </Component>
             
+            <!-- Commandline Bibliothek -->
             <Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
               <File Id="Commandline" Name="Commandline.dll" Source="Commandline.dll" KeyPath="yes" />
             </Component>
@@ -172,11 +167,27 @@
           <Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
             <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
             
-            <!-- Wird bei Deinstallation gelöscht -->
-            <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="[DD]" Name="Path" />
-            <RegistryValue Root="HKCU" Key="Software\Classes\pmo" Type="string" Name="URL Protocol" Value="" />
-            <RegistryValue Root="HKCU" Key="Software\Classes\pmo\DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organiser.exe,0&quot;" />
-            <RegistryValue Root="HKCU" Key="Software\Classes\pmo\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organiser.exe&quot; --data %1" />
+            <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 Key="Classes">
+                <RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
+                  <RegistryValue Type="string" Name="URL Protocol" Value="" />
+                  <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organiser.exe,0&quot;" />
+                  <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organiser.exe&quot; --data %1" />
+                </RegistryKey>
+              </RegistryKey>
+              
+            </RegistryKey>
+            
+            
+            
+            
           </Component>
         </Directory>
       </Directory>
@@ -197,7 +208,7 @@
       <ComponentRef Id="RecordOrganizer.Locales.en_us" />
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="ProgramMenuDir"/>
-      <ComponentRef Id="RegistryEntries"/>
+      <!--<ComponentRef Id="RegistryEntries"/>-->
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="Commandline" />
     </Feature>