Index: src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj
===================================================================
diff -u -r28 -r73
--- src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 28)
+++ src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 73)
@@ -25,6 +25,7 @@
     <OutputPath>bin\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>BinFolder=..\bin\release</DefineConstants>
+    <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BinFolder.wxs" />
Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r26 -r73
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 26)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 73)
@@ -2,181 +2,187 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{93D84029-54D4-461C-86ED-3E480126E306}">
+            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{9E05FAF4-9409-41E3-9983-96F0AEF06AE8}">
                 <File Id="fil4F2F84FF87942002C8948E87F05D7778" KeyPath="yes" Source="$(var.BinFolder)\borlndmm.dll" />
             </Component>
-            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{4F41B120-E451-4DDC-89A5-CFD1C6783BA7}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{8C02017F-5929-49D8-8CF0-F6D07959CF12}">
                 <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
             </Component>
-            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{C17CE615-1584-4E6A-8C9E-B14550D321A3}">
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{A39CD08A-1C23-48FD-BDEE-CD1AB8D0D92A}">
                 <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
             </Component>
-            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{AAAF6EE3-9E08-4134-BE8D-3CFB9330CE34}">
+            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{DBABD7C9-2CAB-497B-8414-BA0FC74CC458}">
                 <File Id="fil91D9F542E01E16BA0EF901B13142A8E1" KeyPath="yes" Source="$(var.BinFolder)\D-SoilModel.ico" />
             </Component>
-            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{E20984F5-7F0F-4519-888E-FC927D3FF0A1}">
+            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{80195556-D30C-478D-86CD-D281B649AB54}">
                 <File Id="fil10BD73AB0BB296E6DFEAA7D72CC26003" KeyPath="yes" Source="$(var.BinFolder)\Deltares.AssessmentMechanism.dll" />
             </Component>
-            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{099522CB-DA81-42C3-B645-DD6854098437}">
+            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{51E27A04-D574-4D45-A897-610F36E8B9A5}">
                 <File Id="fil1992AA5619D465310A20205E7D1B118B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DeltaModel.dll" />
             </Component>
-            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{2A31AB10-11B3-4D09-9109-2D4E9E93AF64}">
+            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{F4873A92-3F15-4416-85C8-7602B4B94E76}">
                 <File Id="fil830BBEF28A818FF7484F117C8F4D9FD9" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Data.dll" />
             </Component>
-            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{835A363F-5216-4B41-9B6D-DBF4E64119B3}">
+            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{95CDE837-3878-4BAC-B555-CD0FCFF51BCA}">
                 <File Id="fil5F82F57C4DC68136D0AA96686BDC9EA1" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Forms.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{0C56AE30-DB97-46FA-8BB6-AEBCFD19B601}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{5DE5CF66-9C03-44DD-ADA8-F6E781BAD27B}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{E88F4D0A-B99E-4E7E-A7CC-5B10361A1801}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{BDEF0137-945B-47E5-B61B-C7926856BE77}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{B41EE18D-101A-42B6-B9D2-A14782357668}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{6C33FB6B-B22E-491B-A5D3-D9A88DD5C999}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{E6C8C78D-9827-462C-B99B-3CECC5E324CB}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{1BCBF245-AD5C-4A2D-BE23-8288C066E1EA}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{D5FA5E72-2834-48C2-BF33-2463B64AD4D4}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{D91E8D40-E45F-40E6-87AD-7B9A87F90DBA}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{D58E2956-A7C7-484D-8D16-99F5C1E5C10C}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{C9DEDA89-E624-4DDB-A5F3-F59142DFAEC1}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{7A69A4BB-C096-4A83-BDE7-C2D2763A9724}">
+            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{BF708CA7-C5DB-455D-B2EE-84D8FDDE0581}">
                 <File Id="filD609F583F9120C092011AFCFCCC2CA2A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.WaternetCreator.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{35B1D37B-AAE6-49CE-B9D3-81A2BD15BD65}">
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{68E99D6D-F481-4D5F-9E12-6FDA54184724}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{83E5BE79-36E3-4C1C-81B4-33F0815E6302}">
+            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{0B039076-253D-4D0C-B165-7633A259C072}">
                 <File Id="fil9A91397F5BD956AB1251C9635BA53B48" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.IO.Classic.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{E8117A79-AEBB-4AAB-8D80-F508322146CB}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{9724825E-803D-4505-846F-D9D7C9E24136}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{529F4F24-779A-4147-87DA-A4269D686CF2}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{004EF944-2F76-4E13-8906-4CACEA12EC03}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{9E2FA74C-15AB-4AA8-B8A1-7AAA8508DC1E}">
+            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{E36475F3-8C9D-46F9-94BE-A0211A1EA45D}">
                 <File Id="fil8D6B9C2156EADA1AAD9A42D76A95873D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{454257B9-3EE5-4D3A-B493-2AE81F575B8F}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{9053FC16-F4EB-4AAF-AC89-CE3CE0906734}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{717141CA-5F12-4AEB-87AF-65150369B5F5}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{3FB6D9F7-4711-4854-BBC9-3BB6D31CBE0F}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{E99AFBF8-3F31-45C7-B28A-6487FCF0CF4E}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{DEAD8AB5-E552-4093-9E9C-6F33DD6BC0AE}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{A590D08F-6B18-4326-A565-B0243D50B153}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{501AF1E3-2905-46A5-8AB0-1832FE93A282}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{55292186-4D8E-4052-98DF-C964BE3F5DE4}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{CE8C1145-744E-46FE-A99C-54C152A18221}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{BA04A18F-266C-472F-A7EC-7D2C698AAA46}">
+            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{C16D509B-5E03-45B8-9260-A4CE80B82984}">
                 <File Id="filABE4682BE5464D6FBA20B56403F5A5DB" KeyPath="yes" Source="$(var.BinFolder)\DGSGEF.dll" />
             </Component>
-            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{85AF8C35-C7FE-4648-A6CE-26562B2A375A}">
+            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{B47C7517-D9CA-4C0A-9D10-5F08F74C2ACC}">
                 <File Id="filBEA5E161DDC438A31EA77F1BF1916C48" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabSerializer.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{51CAA9D0-FCA3-4173-B418-0A1E5B67ADEF}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{4D0CE907-3D33-461B-9BC5-0550C02014AB}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{DDD149BE-3FB3-47D2-B0E5-D49B59EFC36E}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{7F29EFF8-C5A3-4BEE-81A3-0FFBE1DCB00D}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{D243F636-19B1-432E-AB04-7E8B3EF51576}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{64DB12D3-64DC-4FCC-AE9D-0801F4B3480C}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{3A6403BF-AF8C-4256-9E55-BDE914E1FA67}">
+            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{CAF14B18-8BFA-4BF7-951D-3AE3CA532B46}">
+                <File Id="filC95772BD906C6022EF697886806A5DCD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Rasters.GdalExtension.dll" />
+            </Component>
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{FE609E47-4C95-439A-8D2E-F2B0DF04DA98}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{E9EF2BE6-CF93-46C3-B669-475C6BE27BD2}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{652E425E-7CA3-440B-A443-84FD6E4CB15B}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{E13E68BF-3ECF-493B-AADF-3500EC17192F}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{0B11646E-5FFC-4069-857C-3E743BC8C6A2}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{9ACADFFB-6333-4F8F-93BD-04A41D0A444B}">
+            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{DB62A45B-C87C-4FB3-BA4B-99CFAA68333D}">
                 <File Id="fil4F36B405D36414D50469C1B930CD5F41" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Plugins.BruTileLayer.dll" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{D1080B24-2DC1-486E-ABF5-19C0CA883B02}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{E7C61E00-021A-41B9-BFA4-C1A8625C2318}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{0424D1E8-552A-4B78-AC9E-3647876CDD61}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{9A5D3597-630B-40F5-A3E8-80EC7790C2C5}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{1D500CB3-6A94-4732-9EC9-7BD7EBC78AC1}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{50791C14-B7D1-4C22-B98F-A7F77BF82C63}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{F3EDED46-38C5-457F-AE2F-3D31922885DE}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{30A73D87-F29A-46BB-9731-1616156D626D}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{9E8FA0F3-FEFC-4E8D-9655-9D33B9254107}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{EEEC2431-9F51-4E59-94CE-00D6282206F7}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{6E072CB1-2A2C-43ED-914A-888D9ECD240B}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{4F4D00BE-5189-4FB4-A941-D7DF7D8EAB9C}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{34136B5D-1866-461C-8496-7B84CC52D9C5}">
-                <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe" />
+            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{5AAE4ADA-C4F5-4C40-9E07-312D867BB6EE}">
+                <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\D-Soil Model.exe" />
             </Component>
-            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{8B8C7E38-F57C-40F8-8C68-88294443AAF7}">
-                <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe.config" />
+            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{C37915B7-0A12-4DB4-942A-1ACFC84F9F44}">
+                <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\D-Soil Model.exe.config" />
             </Component>
-            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{5205C48A-25ED-49EF-BC7E-574A64C1F427}">
+            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{13E88958-CF15-4E64-84E0-288D7B9C973F}">
                 <File Id="filA80D8C7C88FEA11402E41B4F0A597F13" KeyPath="yes" Source="$(var.BinFolder)\fbembed.dll" />
             </Component>
-            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{12684144-4C83-4885-A443-F21C71B0E869}">
+            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{E959C9E3-CD46-42EE-9D1A-90A8A24A1D84}">
                 <File Id="fil5AD82B318E8DD2E38581B3708F19B820" KeyPath="yes" Source="$(var.BinFolder)\firebird.msg" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{C1AFD442-DCD6-4689-A5BE-CBBB09049E01}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{99669404-F722-4EEB-AFA7-5C77DC66F9AE}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{CF6D01DD-C467-465F-A1E1-C35778DE7281}">
+            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{8ACAD21D-9F2C-46DE-8ED8-2EA8316B37DF}">
+                <File Id="filDD73F351863FEF37BD9EA1EDA68D49A6" KeyPath="yes" Source="$(var.BinFolder)\gdal_csharp.dll" />
+            </Component>
+            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{A70E0A7E-D9C5-4FA1-879E-17FECD7A1AEC}">
                 <File Id="filCA1B93B1E04F9E859706929F4AB3CFAE" KeyPath="yes" Source="$(var.BinFolder)\Gef2.dll" />
             </Component>
-            <Component Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" Guid="{F15723BE-6787-4929-992D-0A0755F8F967}">
-                <File Id="filA57D83131128C8DF0624B91B5BCB404A" KeyPath="yes" Source="$(var.BinFolder)\GefBoreNL.dat" />
-            </Component>
-            <Component Id="cmp2CF79882141672A94EAF05B498ED9029" Guid="{CAF31FE1-ABBF-48EC-9A84-507DF0A5FD31}">
-                <File Id="fil7E670CDE16A03B5EF9F1D974C818A5FF" KeyPath="yes" Source="$(var.BinFolder)\GefBoreUK.dat" />
-            </Component>
-            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{0F45BA91-D586-40DB-B2C9-D56F51C45BD6}">
+            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{847D2D7D-32C8-4675-A21B-89B1C1B3211E}">
                 <File Id="fil55A495EE2A8C0D1AC7E4625A9332454F" KeyPath="yes" Source="$(var.BinFolder)\ib_util.dll" />
             </Component>
-            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{57C6F0AA-1883-4AD1-9F4A-81ADB3512A7E}">
+            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{EBCD116E-6BEE-45CF-ADCA-302536845B7C}">
                 <File Id="fil8500BA131F16F61959822A95B67A257C" KeyPath="yes" Source="$(var.BinFolder)\icudt30.dll" />
             </Component>
-            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{B64444FE-EF6A-49A7-ADE8-9DFE1F7A5CF3}">
+            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{519AE81E-A38B-4FE4-A457-50BF6A34A026}">
                 <File Id="fil19B3813E023D34D2E651155522C0E83A" KeyPath="yes" Source="$(var.BinFolder)\icuin30.dll" />
             </Component>
-            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{2141E4F7-6E54-4F28-B36D-5A6BDC240831}">
+            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{E6401976-A18D-458A-84E2-8965B44D2458}">
                 <File Id="filEB52BFF83606A0185E8CC52B28A4FC43" KeyPath="yes" Source="$(var.BinFolder)\icuuc30.dll" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{97D63CAD-86CD-4E73-B80B-29430D75B679}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{DDB23335-B254-462C-A834-4128ED8D0579}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{8C7306D2-B0C0-45C0-B3E8-A5AAD2A48834}">
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{A9FFC627-8A99-4922-A6B4-5B77FA66DACA}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{7DFEE7D4-8C6A-4DA2-B8A7-989F4AF885CC}">
+            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{5EFA67A2-F037-49C4-AAF0-E071BF1E254F}">
+                <File Id="fil58FA97A82C74E7C028484557C2E9031F" KeyPath="yes" Source="$(var.BinFolder)\ogr_csharp.dll" />
+            </Component>
+            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{F331881A-3A6C-42EF-8CD4-382A2A07924E}">
+                <File Id="fil85F845F2C104287D16405A9C5D4DD89C" KeyPath="yes" Source="$(var.BinFolder)\osr_csharp.dll" />
+            </Component>
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{1DEE679D-F283-4A16-A3C3-6D7CED34836C}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
-            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{05394B11-D9E0-461F-BB8A-574CD01107B1}">
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{31CC36EA-F7A3-4C36-897C-927A436AC1E6}">
                 <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
             </Component>
             <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl">
-                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{6D2D7DD4-29DC-4D87-812B-E6690737CF08}">
+                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{125CD007-2CBA-4159-9877-FFCBC1A0D541}">
                     <File Id="filF7D36D11E7B251700E8C6B6DB2B21155" KeyPath="yes" Source="$(var.BinFolder)\nl\DotSpatial.Projections.Forms.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir97F42FF68945B97AAE670945C4FDAE93" Name="x86">
-                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{18C397C1-A684-4CBD-B478-0BC1F58FE1E3}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{F9D1ACA2-E3BC-4A8D-86A2-847BCCB223CA}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>
@@ -214,6 +220,7 @@
             <ComponentRef Id="cmp19841C10C857DFCDC8107E742C3E9AB5" />
             <ComponentRef Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" />
             <ComponentRef Id="cmp24EBCB901CDC2155D82D2B4B1261F570" />
+            <ComponentRef Id="cmpEEF21AC7D292805806520DA05D6BFF1F" />
             <ComponentRef Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" />
             <ComponentRef Id="cmpB2DD75DCC3588842729CB37CD7FDB677" />
             <ComponentRef Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" />
@@ -229,15 +236,16 @@
             <ComponentRef Id="cmp80712E9CCA92E22C396220732AED9BA3" />
             <ComponentRef Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" />
             <ComponentRef Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" />
+            <ComponentRef Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" />
             <ComponentRef Id="cmp41854AF6C9F928B540998D5517BB62C6" />
-            <ComponentRef Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" />
-            <ComponentRef Id="cmp2CF79882141672A94EAF05B498ED9029" />
             <ComponentRef Id="cmp8AA6CD076A02D9492C231BDF24A98A54" />
             <ComponentRef Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" />
             <ComponentRef Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" />
             <ComponentRef Id="cmp30C1802BC382DE5E0C8F33B33B275D88" />
             <ComponentRef Id="cmp9DD47D0347AE254D923E22047764B092" />
             <ComponentRef Id="cmp3ED5A0A4D782A8BF371C8403342D615B" />
+            <ComponentRef Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" />
+            <ComponentRef Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" />
             <ComponentRef Id="cmp20B8D4726881994439470FFC8B08FD93" />
             <ComponentRef Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" />
             <ComponentRef Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" />
Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r45 -r73
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 45)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 73)
@@ -9,7 +9,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Deltares.DSoilModel.Application</RootNamespace>
-    <AssemblyName>DSoilModel</AssemblyName>
+    <AssemblyName>D-Soil Model</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
Index: src/Deltares.DSoilModel.Setup/Product.wxs
===================================================================
diff -u -r37 -r73
--- src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 37)
+++ src/Deltares.DSoilModel.Setup/Product.wxs	(.../Product.wxs)	(revision 73)
@@ -4,7 +4,7 @@
   <?include Variables.wxi ?>
 
   <?define ReleaseVersion="16.1.0" ?> <!-- Update this to the correct version -->
-  <?define ProductName="D-SoilModel" ?>  
+  <?define ProductName="D-Soil Model" ?>  
 
   <?ifdef env.BUILD_NUMBER ?>
     <?define FullProductVersion="$(var.ReleaseVersion).$(env.BUILD_NUMBER)" ?>
@@ -13,13 +13,13 @@
   <?endif?>
   
   <Product Id="*" Name="$(var.ProductName) $(var.FullProductVersion)" Language="1033" Version="$(var.FullProductVersion)"
-           Manufacturer="Deltares" UpgradeCode="35FDBB77-67F5-45C8-AC61-81AFA221FC60">
+           Manufacturer="Deltares" UpgradeCode="50FCB555-76C8-4A15-9559-90AD78A17004">
 
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser" InstallPrivileges="limited"
              Keywords="Installer" Description="$(var.ProductName) Installer" Manufacturer="Deltares"
              Comments="$(var.ProductName) is a program developed by Deltares." />
 
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="no"/>
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes"/>
     <MediaTemplate EmbedCab="yes" />
 
     <!-- .Net framework 4.0 -->
@@ -34,10 +34,11 @@
       <ComponentGroupRef Id="ProductComponents" />
       <ComponentGroupRef Id="DevExpressComponents" />
       <ComponentRef Id="ApplicationShortcut" />
+      <ComponentRef Id="DesktopShortcut" />
     </Feature>
 
     <!-- 
-    NOTE: the contents of the Bin\Release folder are "harvested" using the BuildHarvest.bat script included in this project, please run this any time the content of the setup changes
+    NOTE: the contents of the Bin\Release folder are "harvested" using the BuildWixProject.bat script included in this project, please run this any time the content of the setup changes
     
     the resulting BinFolder.wxs is included in the project to put all relevant content of the bin folder in the installer
 
@@ -62,32 +63,44 @@
       <!-- installation folder -->
       <Directory Id="ProgramFilesFolder">
         <Directory Id="ProgramFilesDeltares" Name="Deltares">
-          <Directory Id="INSTALLFOLDER" Name="DSoilModel" />
+          <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)" />
         </Directory>
       </Directory>
       <!-- Start menu folder -->
       <Directory Id="ProgramMenuFolder" Name="StartMenu">
         <Directory Id="ProgramMenuDeltares" Name="Deltares">
-          <Directory Id="ProgramMenuShortcut" Name="D-SoilModel"/>
+          <Directory Id="ProgramMenuShortcut" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
+      <!-- Desktop folder -->
+      <Directory Id="DesktopFolder" />
     </Directory>
   </Fragment>
 
   <!-- Start Menu shortcut -->
   <Fragment>
-   
-      <Component Id="ApplicationShortcut" Directory="ProgramMenuShortcut" Guid="*">
-        <Shortcut Id="ApplicationStartMenuShortcut"
-                  Name="D-SoilModel"
-                  Description="Deltares D-SoilModel"
-                  Target="[INSTALLFOLDER]DSoilModel.exe"
-                  WorkingDirectory="INSTALLFOLDER" />
-        <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuShortcut" On="uninstall" />
-        <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
-        <RegistryValue Root="HKCU" Key="Software\Deltares\DSoilModel" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    
+    <Component Id="ApplicationShortcut" Directory="ProgramMenuShortcut" Guid="*">
+      <Shortcut Id="ApplicationStartMenuShortcut"
+                Name="$(var.ProductName)"
+                Description="Deltares D-SoilModel"
+                Target="[INSTALLFOLDER]$(var.ProductName).exe"
+                WorkingDirectory="INSTALLFOLDER" />
+      <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuShortcut" On="uninstall" />
+      <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
+      <RegistryValue Root="HKCU" Key="Software\Deltares\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+    </Component>
   </Fragment>
 
+  <!-- Desktop shortcut -->
+  <Fragment>
+    <Component Id="DesktopShortcut" Directory="DesktopFolder" Guid="CB644C04-11C1-47B3-B675-CD207511DE7D">
+      <Shortcut Id="ApplicationDesktopShortcut"
+                Name="$(var.ProductName)"
+                Description="Deltares $(var.ProductName)"
+                Target="[INSTALLFOLDER]$(var.ProductName).exe"
+                WorkingDirectory="INSTALLFOLDER"/>
+      <RegistryValue Root="HKCU" Key="Software\Deltares\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+    </Component>
+  </Fragment>
+
 </Wix>