Index: setup/Plugins/WtiSetup/Installer UI/BrowseDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/BrowseDlgDeltares.wxs	(.../BrowseDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/BrowseDlgDeltares.wxs	(.../BrowseDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -38,8 +38,8 @@
                 <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="125" Y="29" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgDescription)" />
-		<Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
+		<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.BrowseDlgTitle)" />
             </Dialog>
         </UI>
     </Fragment>
Index: setup/Plugins/WtiSetup/Installer UI/CustomizeDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/CustomizeDlgDeltares.wxs	(.../CustomizeDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/CustomizeDlgDeltares.wxs	(.../CustomizeDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -16,9 +16,9 @@
             <Dialog Id="CustomizeDlgDeltares" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
                 <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
                 <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
-     		    <Publish Event="SelectionBrowse" Value="BrowseDlgDeltares">1</Publish>
-                    <Condition Action="hide">Installed</Condition>
-                    <Condition Action="disable">Installed</Condition>
+     		          <Publish Event="SelectionBrowse" Value="BrowseDlgDeltares">1</Publish>
+                  <Condition Action="hide">Installed</Condition>
+                  <Condition Action="disable">Installed</Condition>
                 </Control>
 <!-- nothing to reset
                 <Control Id="Reset" Type="PushButton" X="10" Y="243" Width="81" Height="17" Text="!(loc.CustomizeDlgReset)">
@@ -41,8 +41,8 @@
                 <Control Id="Text" Type="Text" X="25" Y="61" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
                 <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="125" Y="29" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
-                <Control Id="Title" Type="Text" X="125" Y="16" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
                 <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />
                 <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)">
                     <Subscribe Event="SelectionDescription" Attribute="Text" />
Index: setup/Plugins/WtiSetup/Installer UI/DiskCostDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/DiskCostDlgDeltares.wxs	(.../DiskCostDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/DiskCostDlgDeltares.wxs	(.../DiskCostDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -21,8 +21,8 @@
                 <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="125" Y="29" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgDescription)" />
-		<Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgTitle)" />
+                <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>
Index: setup/Plugins/WtiSetup/Installer UI/FilesInUseDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/FilesInUseDeltares.wxs	(.../FilesInUseDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/FilesInUseDeltares.wxs	(.../FilesInUseDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -27,8 +27,8 @@
 		<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="125" Y="29" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
-                <Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
+                <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>
Index: setup/Plugins/WtiSetup/Installer UI/LicenseAgreementDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/LicenseAgreementDlgDeltares.wxs	(.../LicenseAgreementDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/LicenseAgreementDlgDeltares.wxs	(.../LicenseAgreementDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -17,8 +17,8 @@
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
         <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="125" Y="29" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
-        <Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
+        <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
+        <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgTitle)" />
         <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
         <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
           <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
Index: setup/Plugins/WtiSetup/Installer UI/MaintenanceTypeDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/MaintenanceTypeDlgDeltares.wxs	(.../MaintenanceTypeDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -52,8 +52,8 @@
                 <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="125" Y="16" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
-                <Control Id="Description" Type="Text" X="125" Y="29" Width="340" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgDescription)" />
+		<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>
Index: setup/Plugins/WtiSetup/Installer UI/MsiRMFilesInUseDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/MsiRMFilesInUseDeltares.wxs	(.../MsiRMFilesInUseDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/MsiRMFilesInUseDeltares.wxs	(.../MsiRMFilesInUseDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -35,8 +35,8 @@
                 <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="125" Y="29" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.MsiRMFilesInUseDescription)" />
-                <Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MsiRMFilesInUseTitle)" />
+                <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>
Index: setup/Plugins/WtiSetup/Installer UI/OutOfDiskDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/OutOfDiskDlgDeltares.wxs	(.../OutOfDiskDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/OutOfDiskDlgDeltares.wxs	(.../OutOfDiskDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -21,8 +21,8 @@
 		<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="125" Y="29" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgDescription)" />
-                <Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfDiskDlgTitle)" />
+                <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>
Index: setup/Plugins/WtiSetup/Installer UI/OutOfRbDiskDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/OutOfRbDiskDlgDeltares.wxs	(.../OutOfRbDiskDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/OutOfRbDiskDlgDeltares.wxs	(.../OutOfRbDiskDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -25,8 +25,8 @@
                 <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="125" Y="29" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgDescription)" />
-                <Control Id="Title" Type="Text" X="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.OutOfRbDiskDlgTitle)" />
+                <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>
Index: setup/Plugins/WtiSetup/Installer UI/ProgressDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/ProgressDlgDeltares.wxs	(.../ProgressDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -26,31 +26,31 @@
                 <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="125" Y="16" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleInstalling)">
+		<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="125" Y="16" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleChanging)">
+                <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="125" Y="16" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRepairing)">
+		<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="125" Y="16" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleRemoving)">
+                <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="125" Y="16" Width="330" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.ProgressDlgTitleUpdating)">
+		<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">
Index: setup/Plugins/WtiSetup/Installer UI/SetupTypeDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/SetupTypeDlgDeltares.wxs	(.../SetupTypeDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -33,8 +33,8 @@
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="58" TabSkip="no" Text="!(loc.SetupTypeDlgBannerBitmap)" />
                 <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="125" Y="16" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.SetupTypeDlgTitle)" />
-                <Control Id="Description" Type="Text" X="125" Y="29" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.SetupTypeDlgDescription)" />
+                <Control Id="Title" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.SetupTypeDlgTitle)" />
+                <Control Id="Description" Type="Text" X="!(loc.TitleDescriptionX)" Y="29" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.SetupTypeDlgDescription)" />
                 <Control Id="TypicalText" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.SetupTypeDlgTypicalText)" />
                 <Control Id="CustomText" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.SetupTypeDlgCustomText)" />
                 <Control Id="CompleteText" Type="Text" X="60" Y="191" Width="280" Height="20" Default="yes" Text="!(loc.SetupTypeDlgCompleteText)" />
Index: setup/Plugins/WtiSetup/Installer UI/VerifyReadyDlgDeltares.wxs
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/VerifyReadyDlgDeltares.wxs	(.../VerifyReadyDlgDeltares.wxs)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/VerifyReadyDlgDeltares.wxs	(.../VerifyReadyDlgDeltares.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -104,31 +104,31 @@
                     <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="125" Y="16" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
+                <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="ChangeTitle" Type="Text" X="125" Y="16" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)">
+                <Control Id="ChangeTitle" Type="Text" X="!(loc.TitleDescriptionX)" Y="16" Width="325" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)">
                     <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
                 </Control>
                 <Control Id="ChangeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)">
                     <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
                 </Control>
-                <Control Id="RepairTitle" Type="Text" X="125" Y="16" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
+                <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="125" Y="16" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
+                <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="125" Y="16" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
+                <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)">
Index: setup/Plugins/WtiSetup/Installer UI/WixUIVariables.wxl
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Installer UI/WixUIVariables.wxl	(.../WixUIVariables.wxl)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/Installer UI/WixUIVariables.wxl	(.../WixUIVariables.wxl)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -7,6 +7,7 @@
   <!--Set Width to 220 when only Deltares logo is displayed, set to 136 when also Rijkswaterstaat logo is displayed-->
   <String Id='DescriptionBeforeLogosWidth'>220</String>
 
+  <String Id="TitleDescriptionX">40</String>
 
   <String Id="PrepareDlgTitle" />
 
@@ -21,13 +22,13 @@
   <String Id="ProgressDlgTitleUpdating" />
 
   <!-- Change the colour of the description texts in the banners to white -->
-  <String Id="BrowseDlgDescription">{\WixUI_Font_Banner_Description}Browse to the destination folder</String>
-  <String Id="CustomizeDlgDescription">{\WixUI_Font_Banner_Description}Select the way you want features to be installed.</String>
-  <String Id="DiskCostDlgDescription">{\WixUI_Font_Banner_Description}The disk space required for the installation of the selected features.</String>
-  <String Id="LicenseAgreementDlgDescription">{\WixUI_Font_Banner_Description}Please read the following license agreement carefully</String>
-  <String Id="MaintenanceTypeDlgDescription">{\WixUI_Font_Banner_Description}Select the operation you wish to perform.</String>
-  <String Id="OutOfDiskDlgDescription">{\WixUI_Font_Banner_Description}Disk space required for the installation exceeds available disk space.</String>
-  <String Id="OutOfRbDiskDlgDescription">{\WixUI_Font_Banner_Description}Disk space required for the installation exceeds available disk space.</String>
-  <String Id="SetupTypeDlgDescription">{\WixUI_Font_Banner_Description}Choose the setup type that best suits your needs</String>
+  <String Id="BrowseDlgDescription">{\WixUI_Font_Banner_Description}Configureer de installatie locatie.</String>
+  <String Id="CustomizeDlgDescription">{\WixUI_Font_Banner_Description}Configureer de features die u wilt installeren.</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 be schikbare schijfruimte.</String>
+  <String Id="OutOfRbDiskDlgDescription">{\WixUI_Font_Banner_Description}Het benodigde geheugen voor de installatie is groter dan be schikbare schijfruimte.</String>
+  <String Id="SetupTypeDlgDescription">{\WixUI_Font_Banner_Description}Kies de type installatie die het beste past.</String>
 
 </WixLocalization>
\ No newline at end of file
Index: setup/Plugins/WtiSetup/Product.wxs
===================================================================
diff -u -r957e76e82009f3a67e7754011ce89efa0b4aa4e4 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision 957e76e82009f3a67e7754011ce89efa0b4aa4e4)
+++ setup/Plugins/WtiSetup/Product.wxs	(.../Product.wxs)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -7,7 +7,9 @@
   <?include Variables.wxi ?>
   
 	<Product Id="*" Name="$(var.ApplicationFullName)" Language="1043" Version="$(var.FullReleaseVersion)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="8c52b205-2bc3-4281-9d81-080fb1b2105d">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <!--Comment left empty on purpose to remove auto-generated text.-->
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Languages="1043" Manufacturer="!(loc.Manufacturer)" Comments=" "/>
+    
     <Media Id="1" Cabinet="WtiFull.cab" EmbedCab="yes"/>
     <Property Id="ARPPRODUCTICON" Value="Wti.ico" />
 
@@ -96,7 +98,7 @@
       </Directory>
     </Directory>
     
-		<Feature Id="CompleteInstallation" Title="!(loc.ApplicationLongName)" Level="1">
+		<Feature Id="CompleteInstallation" Title="!(loc.ApplicationLongName)" Level="1" Absent="disallow" ConfigurableDirectory="INSTALLDIR">
       <ComponentGroupRef Id="WtiApplicationComponents"/>
       <ComponentRef Id="InstalledShortcut"/>
       <ComponentRef Id="ProgramMenuShortcut"/>
Index: setup/Plugins/WtiSetup/WtiSetup.wixproj
===================================================================
diff -u -r08a4dec8b186e30b7824dd34023532dafa7c7384 -r27cd59305935b7513a85f4a335f13fb97259c613
--- setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision 08a4dec8b186e30b7824dd34023532dafa7c7384)
+++ setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision 27cd59305935b7513a85f4a335f13fb97259c613)
@@ -15,8 +15,8 @@
 		Environment Variable: BUILD_NUMBER
 		Field could be set by BuildServer. If not present, it will be skipped.
 	-->
-    <OutputName Condition=" '$(BUILD_NUMBER)' == '' ">Wti Setup ($(ReleaseVersion))</OutputName>
-    <OutputName Condition=" '$(BUILD_NUMBER)' != '' ">Wti Setup ($(ReleaseVersion).$(BUILD_NUMBER))</OutputName>
+    <OutputName Condition=" '$(BUILD_NUMBER)' == '' ">WTI Setup ($(ReleaseVersion))</OutputName>
+    <OutputName Condition=" '$(BUILD_NUMBER)' != '' ">WTI Setup ($(ReleaseVersion).$(BUILD_NUMBER))</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>