diff --git a/.vs/DDClipboardSearcher/v15/.suo b/.vs/DDClipboardSearcher/v15/.suo
new file mode 100644
index 0000000..3fd5d11
Binary files /dev/null and b/.vs/DDClipboardSearcher/v15/.suo differ
diff --git a/.vs/DD_Clipboard_Searcher/v15/.suo b/.vs/DD_Clipboard_Searcher/v15/.suo
new file mode 100644
index 0000000..f2f60f5
Binary files /dev/null and b/.vs/DD_Clipboard_Searcher/v15/.suo differ
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..f8b4888
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..3c0cc08
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index 2bb791e..75330e0 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -36,7 +36,7 @@
     </Upgrade>
 
     <!-- Legt das Icon fest -->
-    <Icon Id="AppIcon" SourceFile="$(var.ProgramName).exe" />
+    <Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />
     <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
     <Property Id="ARPPRODUCTICON" Value="AppIcon" />
 
@@ -50,7 +50,10 @@
 
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}">
-        <File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes"/>
+        <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>
       </Component>
 
       <Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}">
@@ -63,14 +66,14 @@
 
       <!-- DEVEXPRESS Bibliotheken -->
       <Component Id="DevExpressLibs" Guid="665D0AC8-93FC-4499-BA89-F660CAC6C577">
-        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes" />
-        <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" />
-        <File Id="DevExpress.Sparkline.v15.2.Core" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" />
-        <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Utils.v15.2.dll" />
-        <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" />
-        <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" />
-        <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" />
-        <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" />
+        <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.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.Sparkline.v15.2.Core" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.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.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.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="{72D6927F-8297-4D51-BF4A-813064089A4A}">
@@ -86,6 +89,17 @@
 
           <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">
@@ -94,6 +108,7 @@
       <ComponentRef Id="DDLibStandarts"/>
       <ComponentRef Id="DevExpressLibs"/>
       <ComponentRef Id="RegistryKeys" />
+      <ComponentRef Id="ProgramMenuDir" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->