diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
index 9282b96..9c1851f 100644
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -56,39 +56,35 @@
     </Reference>
     <Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Sparkline.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDMonorepo\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
diff --git a/app/DD_Clipboard_Searcher/frmSplash.vb b/app/DD_Clipboard_Searcher/frmSplash.vb
index dae5b27..3e2015b 100644
--- a/app/DD_Clipboard_Searcher/frmSplash.vb
+++ b/app/DD_Clipboard_Searcher/frmSplash.vb
@@ -102,7 +102,7 @@ Public NotInheritable Class frmSplash
                 ERROR_INIT = "DATABASE"
             End If
         Catch ex As Exception
-            MsgBox("Unexpected Error in bw_DoWork: " & vbNewLine, MsgBoxStyle.Critical)
+            MsgBox("Unexpected Error in bw_DoWork: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
 
diff --git a/app/SetupWix/Product.wxs b/app/SetupWix/Product.wxs
index 8f33582..fdb9f39 100644
--- a/app/SetupWix/Product.wxs
+++ b/app/SetupWix/Product.wxs
@@ -43,18 +43,43 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="DD" Name="Digital Data">
+        <Directory Id="DD" Name="$(var.Manufacturer)">
           <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
+
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+      </Directory>
+
+      <Directory Id="DesktopFolder" />
     </Directory>
 
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut_StartMenu" Guid="459eecd2-6db7-4b30-97f5-63719879e4a9">
+        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="ApplicationShortcut_Desktop" Guid="1717d19a-4510-423f-93b1-671f280dcca3">
+        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}">
-        <File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
-          <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>
+        <File Id="MainApplicationExe" Source="..\DD_Clipboard_Searcher\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
       </Component>
 
       <Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}">
@@ -65,6 +90,7 @@
         <File Id="DDLibStandarts" Name="DD_LIB_Standards.dll" KeyPath="yes" Checksum="yes"/>
         <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
         <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/>
+        <File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
       </Component>
       
       <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
@@ -84,29 +110,16 @@
       </Component>
 
       <Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
-          <RegistryKey Root="HKCU" Key="Software">
-
+          <RegistryKey Root="HKLM" 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>
-
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="$(var.ProductName)">
-          <Component Id="ProgramMenuDir" Guid="4284ffe9-d8fd-43a0-90f4-132d55035f8d">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" />
-          </Component>
-        </Directory>
-      </Directory>
-
-      <Directory Id="DesktopFolder" Name="Desktop" />
     </DirectoryRef>
 
     <Feature Id="MainApplication" Title="Main Application" Level="1">
@@ -116,14 +129,25 @@
       <ComponentRef Id="NLog"/>
       <ComponentRef Id="DevExpressLibs"/>
       <ComponentRef Id="RegistryKeys" />
-      <ComponentRef Id="ProgramMenuDir" />
+    </Feature>
+
+    <Feature Id="DesktopShortcut" Title="Desktop Shortcut">
+      <Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
+      <ComponentRef Id="ApplicationShortcut_Desktop"/>
+    </Feature>
+
+    <Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
+      <Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
+      <ComponentRef Id="ApplicationShortcut_StartMenu" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+    <Property Id="_BrowseProperty" Value="INSTALLDIR" />
 
     <UI>
-      <UIRef Id="WixUI_InstallDir" />
+      <!--<UIRef Id="WixUI_InstallDir" />-->
+      <UIRef Id="WixUI_FeatureTree"/>
       <UIRef Id="WixUI_ErrorProgressText" />
       <Publish Dialog="WelcomeDlg"
             Control="Next"
@@ -135,6 +159,21 @@
             Event="NewDialog"
             Value="WelcomeDlg"
             Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="Next"
+            Event="NewDialog"
+            Value="FeaturesDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="ChangeFolder"
+            Event="NewDialog"
+            Value="BrowseDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="FeaturesDlg"
+              Control="Back"
+              Event="NewDialog"
+              Value="InstallDirDlg"
+              Order="2">1</Publish>
     </UI>
     
   </Product>