Index: setup/Plugins/Wti2017Setup/Product.wxs
===================================================================
diff -u -rc451c62f5b26082aea318048b7c7add24bb5f904 -ra27d78b792ec9f9bbb135c2433924e09eee6850f
--- setup/Plugins/Wti2017Setup/Product.wxs	(.../Product.wxs)	(revision c451c62f5b26082aea318048b7c7add24bb5f904)
+++ setup/Plugins/Wti2017Setup/Product.wxs	(.../Product.wxs)	(revision a27d78b792ec9f9bbb135c2433924e09eee6850f)
@@ -1,45 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 	<Product Id="C8F4EE7D-F2BA-4E1E-ABDB-C454FC68E780" Name="WTI 2017" Language="1033" Version="0.5.0" Manufacturer="Deltares" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="Wti2017Full.cab" EmbedCab="yes"/>
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of WTI 2017 is already installed." />
 
+    <!-- Requirement: .Net framework 4.5 installed on machine -->
+    <PropertyRef Id="NETFRAMEWORK45"/>
+    <Condition Message='This setup requires Microsoft .NET Framework 4.5 package to be installed for this installation to continue.'>
+      <![CDATA[Installed OR NETFRAMEWORK45]]>
+    </Condition>
+
     <!-- File System hierarchy -->
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="Deltares" Name="Deltares">
           <Directory Id="INSTALLDIR" Name="WTI 2017">
-
+            <Directory Id="APPLICATIONDIR" Name="application"/>
+            
             <!--
             Wti2017Payload.wxs defines all files going into this folder. 
             Wti2017Payload.wxs will be generated on pre-build. Ensure you clean first before building the installer!
             -->
+
+            <Component Id="InstalledShortcut" Guid="441A8BC7-0B13-453D-9FBB-F03293282A3D">
+              <Shortcut Id="ApplicationInstallDirShortcut"
+                        Name="WTI 2017"
+                        Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                        WorkingDirectory="APPLICATIONDIR"
+                        Icon="Wti2017.ico"/>
+
+              <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
+              <RemoveFolder Id="RemoveDeltares" Directory="Deltares" On="uninstall" />
+              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI2017" Name="wti2017AppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+            </Component>
             
           </Directory>
         </Directory>
       </Directory>
-      <!--
+
+      <!-- Start menu folder -->
       <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="WTI 2017">
-          <Component Id="ProgramMenuDir" Guid="FD571168-AB13-48B2-A86C-EC50F4117FD5">
-            <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
-            <RegistryValue Root='HKCU' Key='Software\Deltares\WTI2017' Type='string' Value='' KeyPath='yes' />
-          </Component>
+        <Directory Id="ProgramMenuDeltares" Name="Deltares">
+          <Directory Id="ProgramMenuWti2017" Name="WTI 2017">
+            
+            <Component Id="ProgramMenuShortcut" Guid="1BF4BE48-FB81-425D-85E4-C30F1BF51DA4">
+              <Shortcut Id="ApplicationStartMenuShortcut"
+                        Name="WTI 2017"
+                        Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                        WorkingDirectory="APPLICATIONDIR"
+                        Icon="Wti2017.ico"/>
+              
+              <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuWti2017" On="uninstall" />
+              <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
+              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI2017" Name="wti2017ProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+              
+            </Component>
+            
+          </Directory>
         </Directory>
       </Directory>
-      -->
 
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <!-- Desktop -->
+      <Directory Id="DesktopFolder" Name="Desktop">
+
+        <Component Id="DesktopShortcut" Guid="A871DE12-BE7D-4A80-86F6-5BA23249A8BB">
+          <Shortcut Id="ApplicationDesktopShortcut"
+                    Name="WTI 2017"
+                    Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                    WorkingDirectory="APPLICATIONDIR"
+                    Icon="Wti2017.ico"/>
+
+          <RegistryValue Root="HKCU" Key="Software\Deltares\WTI2017" Name="wti2017DesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+
+        </Component>
+
+      </Directory>
     </Directory>
     
 		<Feature Id="CompleteInstallation" Title="Wti 2017" Level="1">
       <ComponentGroupRef Id="Wti2017ApplicationComponents"/>
-      <!--
-			<ComponentRef Id="MainExecutable" />
-      <ComponentRef Id="ProgramMenuDir" />
-      -->
+      <ComponentRef Id="InstalledShortcut"/>
+      <ComponentRef Id="ProgramMenuShortcut"/>
 		</Feature>
 
     <Icon Id="Wti2017.ico" SourceFile="Wti2017.ico"/>
Index: setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj
===================================================================
diff -u -rc451c62f5b26082aea318048b7c7add24bb5f904 -ra27d78b792ec9f9bbb135c2433924e09eee6850f
--- setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj	(.../Wti2017Setup.wixproj)	(revision c451c62f5b26082aea318048b7c7add24bb5f904)
+++ setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj	(.../Wti2017Setup.wixproj)	(revision a27d78b792ec9f9bbb135c2433924e09eee6850f)
@@ -42,6 +42,12 @@
     <Content Include="Banner.jpg" />
     <Content Include="Wti2017.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg Wti2017ApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)Wti2017Payload.wxs"</PreBuildEvent>
Index: src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj
===================================================================
diff -u -r3912a159ea7726b8b92966345440c2fff2b297e0 -ra27d78b792ec9f9bbb135c2433924e09eee6850f
--- src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj	(.../DeltaShell.Gui.csproj)	(revision 3912a159ea7726b8b92966345440c2fff2b297e0)
+++ src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj	(.../DeltaShell.Gui.csproj)	(revision a27d78b792ec9f9bbb135c2433924e09eee6850f)
@@ -83,7 +83,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstaller|x86'">
-    <OutputPath>bin\CreateInstaller\</OutputPath>
+    <OutputPath>bin\application\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>1591</NoWarn>
@@ -130,6 +130,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />