diff --git a/wix/Folders.wxs b/wix/Folders.wxs
index 519bfce..c1cf829 100644
--- a/wix/Folders.wxs
+++ b/wix/Folders.wxs
@@ -1,7 +1,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)" />
-    </StandardDirectory>
-  </Fragment>
+	<Fragment>
+		<StandardDirectory Id="ProgramFiles64Folder">
+			<Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)" />
+		</StandardDirectory>
+		<StandardDirectory Id="ProgramMenuFolder">
+			<Directory Id="ApplicationProgramsFolder" Name="!(bind.Property.ProductName)"/>
+		</StandardDirectory>
+	</Fragment>
 </Wix>
diff --git a/wix/LanMouseComponents.wxs b/wix/LanMouseComponents.wxs
index 9fb7de4..666a8ce 100644
--- a/wix/LanMouseComponents.wxs
+++ b/wix/LanMouseComponents.wxs
@@ -1,9 +1,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER">
-      <Component>
-        <File Source="..\target\release\lan-mouse.exe" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
+	<Fragment>
+		<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER">
+			<Component>
+				<File Source="..\target\release\lan-mouse.exe"/>
+			</Component>
+			<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">
+				<Shortcut Id="ApplicationStartMenuShortcut"
+						  Name="!(bind.Property.ProductName)"
+						  Description ="Mouse and Keyboard sharing Software"
+						  Target="[INSTALLFOLDER]lan-mouse.exe"
+						  WorkingDirectory="INSTALLFOLDER"/>
+				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\Feschber\LanMouse" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</ComponentGroup>
+	</Fragment>
 </Wix>
diff --git a/wix/LanMouseMsi.wixproj b/wix/LanMouseMsi.wixproj
deleted file mode 100644
index fbf44b0..0000000
--- a/wix/LanMouseMsi.wixproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="WixToolset.Sdk/5.0.2">
-	<PropertyGroup>
-		<InstallerPlatform>x64</InstallerPlatform>
-	</PropertyGroup>
-</Project>
diff --git a/wix/package.wxs b/wix/package.wxs
index c0c7329..dc1ff8c 100644
--- a/wix/package.wxs
+++ b/wix/package.wxs
@@ -8,7 +8,7 @@
 
 	<MediaTemplate EmbedCab="yes"/>
     <Feature Id="Main">
-      <ComponentGroupRef Id="LanMouseComponents" />
+      <ComponentGroupRef Id="LanMouseComponents"/>
     </Feature>
   </Package>
 </Wix>