Index: src/Deltares.DSoilModel.Setup/Installer UI/VerifyReadyDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/VerifyReadyDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/VerifyReadyDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="VerifyReadyDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" TrackDiskSpace="yes">
+                <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.InstallButtonText)">
+                    <Condition Action="show">NOT Installed AND ALLUSERS</Condition>
+                    <Condition Action="enable">NOT Installed</Condition>
+                    <Condition Action="default">NOT Installed</Condition>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.InstallButtonText)">
+                    <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition>
+                    <Condition Action="enable">NOT Installed</Condition>
+                    <Condition Action="default">NOT Installed</Condition>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)">
+                    <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+                    <Condition Action="enable">WixUI_InstallMode = "Repair"</Condition>
+                    <Condition Action="default">WixUI_InstallMode = "Repair"</Condition>
+                    <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition>
+                    <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
+                    <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition>
+                    <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
+                    <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
+                    <Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
+                    <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
+                    <Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
+                    <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlgDeltares">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlgDeltares">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                </Control>
+                <Control Id="InstallTitle" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
+                    <Condition Action="show">NOT Installed</Condition>
+                </Control>
+                <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
+                    <Condition Action="show">NOT Installed</Condition>
+                </Control>
+                <Control Id="RepairTitle" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
+                    <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+                </Control>
+                <Control Id="RepairText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)">
+                    <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+                </Control>
+                <Control Id="RemoveTitle" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+                </Control>
+                <Control Id="RemoveText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+                </Control>
+                <Control Id="UpdateTitle" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
+                    <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+                </Control>
+                <Control Id="UpdateText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
+                    <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+                </Control>
+		            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"  Cancel="yes" Text="!(loc.CancelButtonText)">
+                    <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
+                </Control>
+                
+		            <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Hidden="yes" TabSkip="yes" Text="!(loc.BackButtonText)">
+		                 <Condition Action="show">NOT Installed</Condition>
+		            </Control>
+                 
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/OutOfDiskDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/OutOfDiskDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/OutOfDiskDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="OutOfDiskDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.OutOfDiskDlgBannerBitmap)" />
+		<Control Id="Text" Type="Text" X="25" Y="61" Width="330" Height="60" Text="!(loc.OutOfDiskDlgText)" />
+		<Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgTitle)" />
+                <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="120" Width="330" Height="100" Sunken="yes" Fixed="yes" Remote="yes" Text="!(loc.OutOfDiskDlgVolumeList)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Banner.jpg
===================================================================
diff -u -r7 -r432
Binary files differ
Index: src/Deltares.DSoilModel.Setup/Installer UI/ExitDialogDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/ExitDialogDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/ExitDialogDeltares.wxs	(revision 432)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="ExitDialogDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.FinishButtonText)" />
+
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="ExitDialogDeltares" OnExit="success" Overridable="yes" />
+            </InstallUISequence>
+
+            <AdminUISequence>
+                <Show Dialog="ExitDialogDeltares" OnExit="success" Overridable="yes" />
+            </AdminUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/CancelDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/CancelDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/CancelDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="CancelDlgDeltares" Width="260" Height="85" Title="!(loc.Dlg_Title)">
+                <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.NoButtonText)">
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.YesButtonText)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+                <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" NoPrefix="yes" Text="!(loc.CancelDlgText)" />
+                <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.CancelDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.CancelDlgIcon)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Localization_nl-NL.wxl
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Localization_nl-NL.wxl	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Localization_nl-NL.wxl	(revision 432)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="nl-NL" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ApplicationLongName">Ringtoets</String>
+  <String Id="ApplicationShortName">Ringtoets</String>
+  <String Id="ApplicationGroupShortName">WTI</String>
+  <String Id="Manufacturer">Deltares</String>
+  <String Id="NetFramework40Required">De installatie vereist dat Microsoft .NET Framework 4.0 geïnstalleerd is om verder te gaan.</String>
+  <String Id="DowngradeErrorMessage">Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd.</String>
+  <String Id="StartApplicationDescription">Start !(loc.ApplicationLongName).</String>
+
+  <String Id="Dlg_Title">[ProductName] Installatiehulpprogramma</String>
+  
+  <String Id="RtdDescription">!(loc.ApplicationShortName)-databasebestand</String>
+
+  <String Id="WelcomeDlgDescription">[ProductName] wordt geïnstalleerd op uw computer. Klik op Volgende om door te gaan of op Annuleren als u het installatiehulpprogramma wilt afsluiten.</String>
+  <String Id="MaintenanceWelcomeDlgDescription">Met het installatiehulpprogramma kunt u de manier wijzigen waarop onderdelen van [ProductName] op uw computer worden geïnstalleerd of kunt u dit helemaal van uw computer verwijderen. Klik op Volgende om door te gaan of op Annuleren als u het installatiehulpprogramma wilt afsluiten.</String>
+  <String Id="VerifyReadyDlgRemoveText">Klik op Verwijderen om [ProductName] van uw computer te verwijderen. Klik op Annuleren als u het installatiehulpprogramma wilt afsluiten.</String>
+  <String Id="VerifyReadyDlgInstallText">Klik op Installeren om de installatie te starten. Klik op Vorige om de gekozen installatiemap te bekijken of te wijzigen. Klik op Annuleren als u het installatiehulpprogramma wilt afsluiten. </String>
+  <String Id="VerifyReadyDlgRepairText">Klik op Herstellen om de installatie van [ProductName] te herstellen. Klik op Annuleren als u het installatiehulpprogramma wilt afsluiten.</String>
+  <String Id="CancelDlgText">Weet u zeker dat u het installatiehulpprogramma van [ProductName] wilt afsluiten?</String>
+  <String Id="FatalErrorDlgDescriptionCustom">Het installatiehulpprogramma van [ProductName] is voortijdig beëindigd vanwege een fout. Het systeem is niet gewijzigd. Als u dit programma op een later tijdstip wilt installeren, voert u het installatiehulpprogramma nogmaals uit. Klik op de knop Voltooien om het installatiehulpprogramma af te sluiten.</String>
+  <String Id="UserExitDescriptionCustom">De installatie van [ProductName] is onderbroken. Het systeem is niet gewijzigd. Als u dit programma op een later tijdstip wilt installeren, voert u het installatiehulpprogramma nogmaals uit. Klik op de knop Voltooien om het installatiehulpprogramma af te sluiten.</String>
+  <String Id="ExitDialogDescription">Klik op de knop Voltooien om het installatiehulpprogramma af te sluiten.</String>
+  
+  <String Id="MaintenanceTypeDlgTitle">{\WixUI_Font_Title}Installatie herstellen of verwijderen</String>
+  <String Id="InstallDirDlgTitle">{\WixUI_Font_Title}Installatiemap</String>
+  <String Id="InstallDirDlgFolderLabel">[ProductName] installeren in:</String>
+  <String Id="InstallDirDlgDescription">{\WixUI_Font_Banner_Description}Kies hier het pad waar u [ProductName] geïnstalleerd wilt hebben.</String>
+  <String Id="InstallDirDlgText">Klik op Volgende om in de bovenstaande map te installeren of klik op Wijzigen om een andere map te kiezen.</String>
+  
+  <String Id="BackButtonText">&amp;Vorige</String>
+  <String Id="NextButtonText">V&amp;olgende</String>
+  <String Id="PrintButtonText">A&amp;fdrukken</String>
+  <String Id="CancelButtonText">A&amp;nnuleren</String>
+  <String Id="CompleetInstallationButtonText">Vo&amp;lledig</String>
+  <String Id="InstallButtonText">&amp;Installeren</String>
+  <String Id="MaintenanceTypeRepairButtonText">&amp;Herstellen</String>
+  <String Id="MaintenanceTypeRemoveButtonText">V&amp;erwijderen</String>
+  <String Id="DiskUsageButtonText">&amp;Schijfgebruik</String>
+  <String Id="NoButtonText">&amp;Nee</String>
+  <String Id="YesButtonText">&amp;Ja</String>
+  <String Id="FinishButtonText">&amp;Voltooien</String>
+  <String Id="LicenseAgreementDlgLicenseAcceptedCheckBoxText">Ik ga &amp;akkoord met de voorwaarden in de overeenkomst</String>
+</WixLocalization>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Setup/Installer UI/WixUIVariables.wxl
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/WixUIVariables.wxl	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/WixUIVariables.wxl	(revision 432)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="nl-NL" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+
+  <String Id='Language'>1043</String>
+  <!--Set X to 40 when only Deltares logo is displayed, set to 24 when also Rijkswaterstaat logo is displayed-->
+  <!--set X to 25 when no logos are displayed-->
+  <String Id='DescriptionBeforeLogosX'>25</String>
+  <!--Set Width to 220 when only Deltares logo is displayed, set to 136 when also Rijkswaterstaat logo is displayed-->
+  <!--Set Width to 320 when no logos are displayed-->
+  <String Id='DescriptionBeforeLogosWidth'>320</String>
+
+  <String Id="TitleDescriptionX">40</String>
+
+  <String Id="PrepareDlgTitle" />
+
+  <String Id="WelcomeUpdateDlgDescriptionUpdate" />
+  <String Id="WelcomeDlgTitle" />
+  <String Id="WixUICostingPopupOptOut" />
+
+  <String Id="VerifyReadyDlgUpdate" />
+  <String Id="VerifyReadyDlgUpdateTitle" />
+  <String Id="VerifyReadyDlgUpdateText" />
+  <String Id="ProgressDlgTextUpdating" />
+  <String Id="ProgressDlgTitleUpdating" />
+
+  <!-- Change the colour of the description texts in the banners to white -->
+  <String Id="BrowseDlgDescription">{\WixUI_Font_Banner_Description}Configureer de installatie locatie.</String>
+  <String Id="DiskCostDlgDescription">{\WixUI_Font_Banner_Description}De hoeveelheid geheugen nodig voor de geconfigureerde installatie.</String>
+  <String Id="LicenseAgreementDlgDescription">{\WixUI_Font_Banner_Description}Lees de licentieovereenkomst zorgvuldig.</String>
+  <String Id="MaintenanceTypeDlgDescription">{\WixUI_Font_Banner_Description}Selecteer de operatie die u wenst uit te voeren.</String>
+  <String Id="OutOfDiskDlgDescription">{\WixUI_Font_Banner_Description}Het benodigde geheugen voor de installatie is groter dan beschikbare schijfruimte.</String>
+  <String Id="OutOfRbDiskDlgDescription">{\WixUI_Font_Banner_Description}Het benodigde geheugen voor de installatie is groter dan beschikbare schijfruimte.</String>
+
+</WixLocalization>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Setup/Installer UI/FatalErrorDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/FatalErrorDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/FatalErrorDeltares.wxs	(revision 432)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="FatalErrorDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDlgDescriptionCustom)" />
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="FatalErrorDeltares" OnExit="error" Overridable="yes" />
+            </InstallUISequence>
+
+            <AdminUISequence>
+                <Show Dialog="FatalErrorDeltares" OnExit="error" Overridable="yes" />
+            </AdminUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/wixUI_Deltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/wixUI_Deltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/wixUI_Deltares.wxs	(revision 432)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI Id="WixUI_Deltares">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8"/>
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" Red="255" Green="255" Blue="255" />
+
+      <TextStyle Id="WixUI_Font_Banner_Description" FaceName="Tahoma" Size="8" Red="255" Green="255" Blue="255" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+
+      <DialogRef Id="BrowseDlgDeltares" />
+      <DialogRef Id="ErrorDlgDeltares" />
+      <DialogRef Id="FatalErrorDeltares" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="FilesInUseDeltares" />
+      <DialogRef Id="MsiRMFilesInUseDeltares" />
+      <DialogRef Id="PrepareDlgDeltares" />
+      <DialogRef Id="ProgressDlgDeltares" />
+      <DialogRef Id="ResumeDlgDeltares" />
+      <DialogRef Id="UserExitDeltares" />
+
+      <Publish Dialog="ExitDialogDeltares" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="BrowseDlgDeltares" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="1">1</Publish>
+      <Publish Dialog="BrowseDlgDeltares" Control="OK" Event="SpawnDialog" Value="InvalidDirDlgDeltares" Order="2"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+      <Publish Dialog="WelcomeDlgDeltares" Control="Next" Event="NewDialog" Value="InstallDirDlgDeltares">1</Publish>
+
+      <Publish Dialog="InstallDirDlgDeltares" Control="Back" Event="NewDialog" Value="WelcomeDlgDeltares">1</Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="Next" Event="SpawnDialog" Value="InvalidDirDlgDeltares" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="Next" Event="NewDialog" Value="VerifyReadyDlgDeltares" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlgDeltares" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlgDeltares" Order="2">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlgDeltares" Control="Back" Event="NewDialog" Value="InstallDirDlgDeltares">1</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlgDeltares" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlgDeltares">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlgDeltares" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlgDeltares">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlgDeltares" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlgDeltares">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlgDeltares" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlgDeltares">1</Publish>
+    </UI>
+    
+    <UIRef Id="WixUI_Common" />
+  </Fragment>
+</Wix>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Setup/Installer UI/ErrorDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/ErrorDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/ErrorDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="ErrorDlgDeltares" Width="270" Height="105" Title="!(loc.Dlg_Title)" ErrorDialog="yes">
+                <Control Id="ErrorText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" NoPrefix="yes" Text="!(loc.ErrorDlgErrorText)" />
+                <Control Id="Y" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIYes)">
+                    <Publish Event="EndDialog" Value="ErrorYes">1</Publish>
+                </Control>
+                <Control Id="A" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="EndDialog" Value="ErrorAbort">1</Publish>
+                </Control>
+                <Control Id="C" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="EndDialog" Value="ErrorCancel">1</Publish>
+                </Control>
+                <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
+                <Control Id="I" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIIgnore)">
+                    <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish>
+                </Control>
+                <Control Id="N" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUINo)">
+                    <Publish Event="EndDialog" Value="ErrorNo">1</Publish>
+                </Control>
+                <Control Id="O" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
+                    <Publish Event="EndDialog" Value="ErrorOk">1</Publish>
+                </Control>
+                <Control Id="R" Type="PushButton" X="100" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIRetry)">
+                    <Publish Event="EndDialog" Value="ErrorRetry">1</Publish>
+                </Control>
+            </Dialog>
+
+            <Property Id="ErrorDialog" Value="ErrorDlgDeltares" />
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/UserExitDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/UserExitDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/UserExitDeltares.wxs	(revision 432)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="UserExitDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="Finish" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.FinishButtonText)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+                 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.UserExitBitmap)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+		            <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.UserExitDescriptionCustom)" />
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="UserExitDeltares" OnExit="cancel" Overridable="yes" />
+            </InstallUISequence>
+
+            <AdminUISequence>
+                <Show Dialog="UserExitDeltares" OnExit="cancel" Overridable="yes" />
+            </AdminUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/FilesInUseDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/FilesInUseDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/FilesInUseDeltares.wxs	(revision 432)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="FilesInUseDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" KeepModeless="yes">
+                <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIRetry)">
+                    <Publish Event="EndDialog" Value="Retry">1</Publish>
+                </Control>
+                <Control Id="Ignore" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="!(loc.WixUIIgnore)">
+                    <Publish Event="EndDialog" Value="Ignore">1</Publish>
+                </Control>
+                <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="!(loc.FilesInUseExit)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+		            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
+		            <Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
+		            <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
+                <Control Id="List" Type="ListBox" X="20" Y="87" Width="330" Height="130" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/InvalidDirDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/InvalidDirDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/InvalidDirDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+The use and distribution terms for this software are covered by the
+Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+which can be found in the file CPL.TXT at the root of this distribution.
+By using this software in any fashion, you are agreeing to be bound by
+the terms of this license.
+
+You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="InvalidDirDlgDeltares" Width="260" Height="85" Title="!(loc.Dlg_Title)">
+        <Control Id="OK" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
+          <Publish Event="EndDialog" Value="Return">1</Publish>
+        </Control>
+        <Control Id="Text" Type="Text" X="48" Y="22" Width="194" Height="30" Text="!(loc.InvalidDirDlgText)" />
+        <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.InvalidDirDlgIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.InvalidDirDlgIcon)" />
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj
===================================================================
diff -u -r415 -r432
--- src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 415)
+++ src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 432)
@@ -30,13 +30,28 @@
   <ItemGroup>
     <Compile Include="BinFolder.wxs" />
     <Compile Include="Devexpress.wxs" />
+    <Compile Include="Installer UI\BrowseDlgDeltares.wxs" />
+    <Compile Include="Installer UI\CancelDlgDeltares.wxs" />
+    <Compile Include="Installer UI\DiskCostDlgDeltares.wxs" />
+    <Compile Include="Installer UI\ErrorDlgDeltares.wxs" />
+    <Compile Include="Installer UI\ExitDialogDeltares.wxs" />
+    <Compile Include="Installer UI\FatalErrorDeltares.wxs" />
+    <Compile Include="Installer UI\FilesInUseDeltares.wxs" />
+    <Compile Include="Installer UI\InstallDirDlgDeltares.wxs" />
+    <Compile Include="Installer UI\InvalidDirDlgDeltares.wxs" />
+    <Compile Include="Installer UI\MaintenanceTypeDlgDeltares.wxs" />
+    <Compile Include="Installer UI\MaintenanceWelcomeDlg.wxs" />
+    <Compile Include="Installer UI\MsiRMFilesInUseDeltares.wxs" />
+    <Compile Include="Installer UI\OutOfDiskDlgDeltares.wxs" />
+    <Compile Include="Installer UI\OutOfRbDiskDlgDeltares.wxs" />
+    <Compile Include="Installer UI\PrepareDlgDeltares.wxs" />
+    <Compile Include="Installer UI\ProgressDlgDeltares.wxs" />
+    <Compile Include="Installer UI\ResumeDlgDeltares.wxs" />
+    <Compile Include="Installer UI\UserExitDeltares.wxs" />
+    <Compile Include="Installer UI\VerifyReadyDlgDeltares.wxs" />
+    <Compile Include="Installer UI\WelcomeDlgDeltares.wxs" />
+    <Compile Include="Installer UI\wixUI_Deltares.wxs" />
     <Compile Include="Product.wxs" />
-    <Compile Include="UI\CustomExitDialog.wxs" />
-    <Compile Include="UI\CustomPrepareDlg.wxs" />
-    <Compile Include="UI\CustomUI_InstallDir.wxs" />
-    <Compile Include="UI\CustomUserExit.wxs" />
-    <Compile Include="UI\CustomWelcomeDlg.wxs" />
-    <Compile Include="UI\CustomMaintenanceWelcomeDlg.wxs" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
@@ -57,7 +72,7 @@
     <Content Include="SplashscreenD-SoilModel.jpg" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="UI\" />
+    <Folder Include="Installer UI\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Deltares.DSoilModel.Application\Deltares.DSoilModel.Application.csproj">
@@ -69,6 +84,10 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Installer UI\WixUIVariables.wxl" />
+    <EmbeddedResource Include="Localization_nl-NL.wxl" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent>$(ProjectDir)..\..\utils\svn_insert_version.cmd $(ProjectDir) Variables.wxi.svn Variables.wxi</PreBuildEvent>
Index: src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceWelcomeDlg.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceWelcomeDlg.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceWelcomeDlg.wxs	(revision 432)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="MaintenanceWelcomeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)">
+                    <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgDescription)" />
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="MaintenanceWelcomeDlgDeltares" Before="ProgressDlgDeltares" Overridable="yes">Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH</Show>
+            </InstallUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/ResumeDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/ResumeDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/ResumeDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="ResumeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes">
+                    <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                    <Condition Action="show">ALLUSERS</Condition>
+                </Control>
+                <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.ResumeDlgInstall)" Hidden="yes">
+                    <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+                    <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+                    <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+                    <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+                    <Condition Action="show">NOT ALLUSERS</Condition>
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ResumeDlgBitmap)" />
+                <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ResumeDlgDescription)" />
+                <Control Id="Title" Type="Text" X="39" Y="160" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ResumeDlgTitle)" />
+            </Dialog>
+
+            <InstallUISequence>
+		<Show Dialog="ResumeDlgDeltares" Before="ProgressDlg" Overridable="yes">Installed AND (RESUME OR Preselected)</Show>
+            </InstallUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/SplashscreenD-SoilModel.jpg
===================================================================
diff -u -r7 -r432
Binary files differ
Index: src/Deltares.DSoilModel.Setup/Installer UI/OutOfRbDiskDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/OutOfRbDiskDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/OutOfRbDiskDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="OutOfRbDiskDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUINo)">
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="!(loc.WixUIYes)">
+                    <Publish Event="EnableRollback" Value="False">1</Publish>
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.OutOfRbDiskDlgBannerBitmap)" />
+                <Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="90" Text="!(loc.OutOfRbDiskDlgText) !(loc.OutOfRbDiskDlgText2)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgTitle)" />
+                <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="150" Width="330" Height="70" Sunken="yes" Fixed="yes" Remote="yes" ShowRollbackCost="yes" Text="!(loc.OutOfRbDiskDlgVolumeList)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/WelcomeDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/WelcomeDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/WelcomeDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+        <UI>
+          <Dialog Id="WelcomeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
+              <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            </Control>
+            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
+            <Control Id="Title" Type="Text" X="39" Y="160" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
+          </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="WelcomeDlgDeltares" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
+            </InstallUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/BrowseDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/BrowseDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/BrowseDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="BrowseDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" />
+                <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
+                    <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="Reset" Value="0">1</Publish>
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="ComboLabel" Type="Text" X="25" Y="63" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" />
+		            <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="60" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
+                    <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
+                </Control>
+		            <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="60" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)">
+                    <Publish Event="DirectoryListUp" Value="0">1</Publish>
+                </Control>
+		            <Control Id="NewFolder" Type="PushButton" X="325" Y="60" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
+                    <Publish Event="DirectoryListNew" Value="0">1</Publish>
+                </Control>
+                <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
+                <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+		            <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgDescription)" />
+		            <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+	     <Dialog Id="MaintenanceTypeDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="RepairButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeRepairButtonText)">
+                    <Publish Property="WixUI_InstallMode" Value="Repair">1</Publish>
+                    <Condition Action="disable">ARPNOREPAIR</Condition>
+                </Control>
+                <Control Id="RepairText" Type="Text" X="60" Y="85" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)">
+                    <Condition Action="hide">ARPNOREPAIR</Condition>
+                </Control>
+                <Control Id="RepairDisabledText" Type="Text" X="60" Y="85" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes">
+                    <Condition Action="show">ARPNOREPAIR</Condition>
+                </Control>
+                <Control Id="RemoveButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeRemoveButtonText)">
+                    <Publish Property="WixUI_InstallMode" Value="Remove">1</Publish>
+                    <Condition Action="disable">ARPNOREMOVE</Condition>
+                </Control>
+                <Control Id="RemoveText" Type="Text" X="60" Y="138" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)">
+                    <Condition Action="hide">ARPNOREMOVE</Condition>
+                </Control>
+                <Control Id="RemoveDisabledText" Type="Text" X="60" Y="138" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
+                    <Condition Action="show">ARPNOREMOVE</Condition>
+                </Control>
+                <Control Id="Back" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.MaintenanceTypeDlgBannerBitmap)" />
+		            <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+		            <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgDescription)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/MsiRMFilesInUseDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/MsiRMFilesInUseDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/MsiRMFilesInUseDeltares.wxs	(revision 432)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Property Id="WixUIRMOptionDeltares" Value="UseRM" />
+            <Dialog Id="MsiRMFilesInUseDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" KeepModeless="yes">
+                <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                    <Publish Event="RMShutdownAndRestart" Value="0">WixUIRMOptionDeltares~="UseRM"</Publish>
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+
+                <Control Id="ShutdownOption" Type="RadioButtonGroup" X="26" Y="190" Width="305" Height="45" Property="WixUIRMOptionDeltares">
+                    <RadioButtonGroup Property="WixUIRMOptionDeltares">
+                        <RadioButton Value="UseRM" X="0" Y="0" Width="295" Height="16" Text="!(loc.MsiRMFilesInUseUseRM)" />
+                        <RadioButton Value="DontUseRM" X="0" Y="20" Width="295" Height="16" Text="!(loc.MsiRMFilesInUseDontUseRM)" />
+                    </RadioButtonGroup>
+                </Control>
+
+                <Control Id="List" Type="ListBox" X="20" Y="100" Width="330" Height="80" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.MsiRMFilesInUseBannerBitmap)" />
+                <Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="45" Text="!(loc.MsiRMFilesInUseText)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MsiRMFilesInUseDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MsiRMFilesInUseTitle)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/PrepareDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/PrepareDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/PrepareDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="PrepareDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" Modeless="yes">
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.PrepareDlgBitmap)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+		            <Control Id="Description" Type="Text" X="!(loc.DescriptionBeforeLogosX)" Y="160" Width="!(loc.DescriptionBeforeLogosWidth)" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.PrepareDlgDescription)" />
+                <Control Id="Title" Type="Text" X="39" Y="160" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.PrepareDlgTitle)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" TabSkip="yes" Text="!(loc.WixUIBack)" />
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" TabSkip="yes" Text="!(loc.WixUINext)" />
+                <Control Id="ActionData" Type="Text" X="39" Y="205" Width="220" Height="30" Transparent="yes" NoPrefix="yes">
+                    <Subscribe Event="ActionData" Attribute="Text" />
+                </Control>
+                <Control Id="ActionText" Type="Text" X="39" Y="185" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
+                    <Subscribe Event="ActionText" Attribute="Text" />
+                </Control>
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="PrepareDlgDeltares" Before="AppSearch" Overridable="yes" />
+            </InstallUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/DiskCostDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/DiskCostDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/DiskCostDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="DiskCostDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+                <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIOK)">
+                    <Publish Event="EndDialog" Value="Return">1</Publish>
+                </Control>
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.DiskCostDlgBannerBitmap)" />
+                <Control Id="Text" Type="Text" X="20" Y="61" Width="330" Height="50" Text="!(loc.DiskCostDlgText)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgDescription)" />
+		<Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgTitle)" />
+                <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes" Text="!(loc.DiskCostDlgVolumeList)" />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/ProgressDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/ProgressDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/ProgressDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="ProgressDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)" Modeless="yes">
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.CancelButtonText)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.ProgressDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <!-- mutually exclusive title and description strings overlap  -->
+                <Control Id="TextInstalling" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextInstalling)">
+                    <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition>
+                </Control>
+		            <Control Id="TitleInstalling" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)">
+                    <Condition Action="show">NOT Installed OR (Installed AND (RESUME OR Preselected) AND NOT PATCH)</Condition>
+                </Control>
+                <Control Id="TextChanging" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextChanging)">
+                    <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
+                </Control>
+                <Control Id="TitleChanging" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleChanging)">
+                    <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
+                </Control>
+                <Control Id="TextRepairing" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRepairing)">
+                    <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+                </Control>
+		            <Control Id="TitleRepairing" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)">
+                    <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+                </Control>
+                <Control Id="TextRemoving" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextRemoving)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+                </Control>
+                <Control Id="TitleRemoving" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRemoving)">
+                    <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+                </Control>
+                <Control Id="TextUpdating" Type="Text" X="20" Y="65" Width="330" Height="35" Hidden="yes" NoPrefix="yes" Text="!(loc.ProgressDlgTextUpdating)">
+                    <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+                </Control>
+		            <Control Id="TitleUpdating" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)">
+                    <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+                </Control>
+                <Control Id="ActionText" Type="Text" X="70" Y="100" Width="285" Height="10">
+                    <Subscribe Event="ActionText" Attribute="Text" />
+                </Control>
+                <Control Id="ProgressBar" Type="ProgressBar" X="20" Y="115" Width="330" Height="10" ProgressBlocks="yes" Text="!(loc.ProgressDlgProgressBar)">
+                    <Subscribe Event="SetProgress" Attribute="Progress" />
+                </Control>
+                <Control Id="StatusLabel" Type="Text" X="20" Y="100" Width="50" Height="10" Text="!(loc.ProgressDlgStatusLabel)" />
+            </Dialog>
+
+            <InstallUISequence>
+                <Show Dialog="ProgressDlgDeltares" Before="ExecuteAction" Overridable="yes" />
+            </InstallUISequence>
+        </UI>
+    </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Installer UI/InstallDirDlgDeltares.wxs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Installer UI/InstallDirDlgDeltares.wxs	(revision 0)
+++ src/Deltares.DSoilModel.Setup/Installer UI/InstallDirDlgDeltares.wxs	(revision 432)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) Microsoft Corporation.  All rights reserved.
+
+The use and distribution terms for this software are covered by the
+Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+which can be found in the file CPL.TXT at the root of this distribution.
+By using this software in any fashion, you are agreeing to be bound by
+the terms of this license.
+
+You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="InstallDirDlgDeltares" Width="370" Height="270" Title="!(loc.Dlg_Title)">
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)">
+          <Publish Event="SpawnDialog" Value="CancelDlgDeltares">1</Publish>
+        </Control>
+
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+        <Control Id="Text" Type="Text" X="25" Y="210" Width="320" Height="20" Text="!(loc.InstallDirDlgText)" />
+        <Control Id="BannerLine" Type="Line" X="0" Y="58" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
+        <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+
+        <Control Id="FolderLabel" Type="Text" X="20" Y="70" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+        <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+        <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
Index: src/Deltares.DSoilModel.Setup/Product.wxs
===================================================================
diff -u -r414 -r432
--- src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 414)
+++ src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 432)
@@ -52,7 +52,7 @@
     <!-- see this introduction on how to customize Wix like this: http://www.dizzymonkeydesign.com/blog/misc/adding-and-customizing-dlgs-in-wix-3/ -->
     <WixVariable Id="WixUIDialogBmp" Value="SplashscreenD-SoilModel.jpg" />
     <WixVariable Id="WixUIBannerBmp" Value="Banner.jpg" />
-    <UIRef Id="CustomUI_InstallDir" />
+    <UIRef Id="WixUI_Deltares" />
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
 
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomPrepareDlg.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomUI_InstallDir.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomUserExit.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomWelcomeDlg.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomMaintenanceWelcomeDlg.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/UI/CustomExitDialog.wxs'.
Fisheye: No comparison available.  Pass `N' to diff?