Index: DeltaShell.sln
===================================================================
diff -u -r267173112f1505e669c823dd0512a185bf927462 -rfbbd9584a4c38bd750d48c340b625e5b2765900c
--- DeltaShell.sln	(.../DeltaShell.sln)	(revision 267173112f1505e669c823dd0512a185bf927462)
+++ DeltaShell.sln	(.../DeltaShell.sln)	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
@@ -153,7 +153,7 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "installer", "installer", "{C4E268AD-A25B-4F47-8F92-E5137FDF7CC7}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Wti2017Setup", "setup\Plugins\Wti2017Setup\Wti2017Setup.wixproj", "{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WtiSetup", "setup\Plugins\WtiSetup\WtiSetup.wixproj", "{3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
Index: setup/Plugins/Wti2017Setup/Banner.jpg
===================================================================
diff -u -r3912a159ea7726b8b92966345440c2fff2b297e0 -rfbbd9584a4c38bd750d48c340b625e5b2765900c
Binary files differ
Fisheye: Tag fbbd9584a4c38bd750d48c340b625e5b2765900c refers to a dead (removed) revision in file `setup/Plugins/Wti2017Setup/Product.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: setup/Plugins/Wti2017Setup/Wti2017.ico
===================================================================
diff -u -r3912a159ea7726b8b92966345440c2fff2b297e0 -rfbbd9584a4c38bd750d48c340b625e5b2765900c
Binary files differ
Fisheye: Tag fbbd9584a4c38bd750d48c340b625e5b2765900c refers to a dead (removed) revision in file `setup/Plugins/Wti2017Setup/Wti2017Setup.wixproj'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: setup/Plugins/WtiSetup/Banner.jpg
===================================================================
diff -u
Binary files differ
Index: setup/Plugins/WtiSetup/Localization_nl-NL.wxl
===================================================================
diff -u
--- setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(revision 0)
+++ setup/Plugins/WtiSetup/Localization_nl-NL.wxl	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="nl-NL" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ApplicationLongName">Wettelijk Toets Instrumentarium</String>
+  <String Id="Manufacturer">Deltares</String>
+  <String Id="NetFramework45Required">De installatie vereist dat Microsoft .NET Framework 4.5 geïnstalleerd is om verder te gaan.</String>
+  <String Id="DowngradeErrorMessage">Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd.</String>
+</WixLocalization>
\ No newline at end of file
Index: setup/Plugins/WtiSetup/Product.wxs
===================================================================
diff -u
--- setup/Plugins/WtiSetup/Product.wxs	(revision 0)
+++ setup/Plugins/WtiSetup/Product.wxs	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="!(loc.ApplicationLongName)" Language="1043" Version="0.5.0" Manufacturer="!(loc.Manufacturer)" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Media Id="1" Cabinet="WtiFull.cab" EmbedCab="yes"/>
+
+		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
+
+    <!-- Specify default installer UI and which folder the user can configure during setup -->
+    <UIRef Id="WixUI_InstallDir"/>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+
+    <!-- Requirement: .Net framework 4.5 installed on machine -->
+    <PropertyRef Id="NETFRAMEWORK45"/>
+    <Condition Message="!(loc.NetFramework45Required)">
+      <![CDATA[Installed OR NETFRAMEWORK45]]>
+    </Condition>
+
+    <!-- File System hierarchy -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="Deltares" Name="!(loc.Manufacturer)">
+          <Directory Id="INSTALLDIR" Name="!(loc.ApplicationLongName)">
+            <Directory Id="APPLICATIONDIR" Name="application"/>
+            
+            <!--
+            WtiPayload.wxs defines all files going into this folder. 
+            WtiPayload.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="!(loc.ApplicationLongName)"
+                        Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                        WorkingDirectory="APPLICATIONDIR"
+                        Icon="Wti.ico"/>
+
+              <RemoveFolder Id="RemoveINSTALLDIR" Directory="INSTALLDIR" On="uninstall" />
+              <RemoveFolder Id="RemoveDeltares" Directory="Deltares" On="uninstall" />
+              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiAppShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+            </Component>
+            
+          </Directory>
+        </Directory>
+      </Directory>
+
+      <!-- Start menu folder -->
+      <Directory Id="ProgramMenuFolder" Name="Programs">
+        <Directory Id="ProgramMenuDeltares" Name="!(loc.Manufacturer)">
+          <Directory Id="ProgramMenuWti2017" Name="!(loc.ApplicationLongName)">
+            
+            <Component Id="ProgramMenuShortcut" Guid="1BF4BE48-FB81-425D-85E4-C30F1BF51DA4">
+              <Shortcut Id="ApplicationStartMenuShortcut"
+                        Name="!(loc.ApplicationLongName)"
+                        Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                        WorkingDirectory="APPLICATIONDIR"
+                        Icon="Wti.ico"/>
+              
+              <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuWti2017" On="uninstall" />
+              <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
+              <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiProgMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+              
+            </Component>
+            
+          </Directory>
+        </Directory>
+      </Directory>
+
+      <!-- Desktop -->
+      <Directory Id="DesktopFolder" Name="Desktop">
+
+        <Component Id="DesktopShortcut" Guid="A871DE12-BE7D-4A80-86F6-5BA23249A8BB">
+          <Shortcut Id="ApplicationDesktopShortcut"
+                    Name="!(loc.ApplicationLongName)"
+                    Target="[APPLICATIONDIR]DeltaShell.Gui.exe"
+                    WorkingDirectory="APPLICATIONDIR"
+                    Icon="Wti.ico"/>
+
+          <RegistryValue Root="HKCU" Key="Software\Deltares\WTI" Name="wtiDesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
+
+        </Component>
+
+      </Directory>
+    </Directory>
+    
+		<Feature Id="CompleteInstallation" Title="!(loc.ApplicationLongName)" Level="1">
+      <ComponentGroupRef Id="WtiApplicationComponents"/>
+      <ComponentRef Id="InstalledShortcut"/>
+      <ComponentRef Id="ProgramMenuShortcut"/>
+      <ComponentRef Id="DesktopShortcut"/>
+		</Feature>
+
+    <Icon Id="Wti.ico" SourceFile="Wti.ico"/>
+    
+	</Product>
+</Wix>
\ No newline at end of file
Index: setup/Plugins/WtiSetup/Wti.ico
===================================================================
diff -u
Binary files differ
Index: setup/Plugins/WtiSetup/WtiSetup.wixproj
===================================================================
diff -u
--- setup/Plugins/WtiSetup/WtiSetup.wixproj	(revision 0)
+++ setup/Plugins/WtiSetup/WtiSetup.wixproj	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>3ccb05db-c7b3-4ef7-b41d-22b6d2a3774e</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Wti Setup</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <Name>WtiSetup</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug;ApplicationBinFolderPath=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+    <WixVariables>
+    </WixVariables>
+    <DefineConstants>ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
+    <Cultures>nl-NL</Cultures>
+    <SuppressAllWarnings>True</SuppressAllWarnings>
+    <Pedantic>False</Pedantic>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+    <Compile Include="WtiPayload.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\DeltaShell\DeltaShell.Gui\DeltaShell.Gui.csproj">
+      <Name>DeltaShell.Gui</Name>
+      <Project>{4a7d6720-4aa1-4f0b-a796-a0436db3d7d7}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Banner.jpg" />
+    <Content Include="Wti.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization_nl-NL.wxl" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg WtiApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)WtiPayload.wxs"</PreBuildEvent>
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
Index: src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj
===================================================================
diff -u -ra27d78b792ec9f9bbb135c2433924e09eee6850f -rfbbd9584a4c38bd750d48c340b625e5b2765900c
--- src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj	(.../DeltaShell.Gui.csproj)	(revision a27d78b792ec9f9bbb135c2433924e09eee6850f)
+++ src/DeltaShell/DeltaShell.Gui/DeltaShell.Gui.csproj	(.../DeltaShell.Gui.csproj)	(revision fbbd9584a4c38bd750d48c340b625e5b2765900c)
@@ -91,6 +91,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CreateInstaller|x64'">
     <OutputPath>bin\x64\CreateInstaller\</OutputPath>