Index: release/DSoilModel/System.Numerics.Vectors.dll
===================================================================
diff -u
Binary files differ
Index: release/DSoilModel/System.Resources.Extensions.dll
===================================================================
diff -u
Binary files differ
Index: release/DSoilModel/KellermanSoftware.Compare-NET-Objects.dll
===================================================================
diff -u -r1073 -r1110
Binary files differ
Index: release/DSoilModel/DSoilModel.exe.config
===================================================================
diff -u -r1096 -r1110
--- release/DSoilModel/DSoilModel.exe.config	(.../DSoilModel.exe.config)	(revision 1096)
+++ release/DSoilModel/DSoilModel.exe.config	(.../DSoilModel.exe.config)	(revision 1110)
@@ -23,29 +23,41 @@
 -->
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.0.94.0" newVersion="1.0.94.0"/>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.94.0" newVersion="1.0.94.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Resources.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="BruTileFileCacheFormat" value="png"/>
-    <add key="BruTileFileCacheExpire" value="30"/>
-    <add key="BruTilePermaCacheType" value="FileCache"/>
-    <add key="brtWmtsCapabilityUrl" value="https://service.pdok.nl/brt/achtergrondkaart/wmts/v2_0?request=getcapabilities&amp;service=wmts"/>
-    <add key="aerialWmtsCapabilityUrl" value="https://service.pdok.nl/hwh/luchtfotorgb/wmts/v1_0?request=GetCapabilities&amp;service=wmts"/>
+    <add key="BruTileFileCacheFormat" value="png" />
+    <add key="BruTileFileCacheExpire" value="30" />
+    <add key="BruTilePermaCacheType" value="FileCache" />
+    <add key="brtWmtsCapabilityUrl" value="https://service.pdok.nl/brt/achtergrondkaart/wmts/v2_0?request=getcapabilities&amp;service=wmts" />
+    <add key="aerialWmtsCapabilityUrl" value="https://service.pdok.nl/hwh/luchtfotorgb/wmts/v1_0?request=GetCapabilities&amp;service=wmts" />
   </appSettings>
   <system.net>
     <!-- do not remove this unless auto-detection of internet proxy is required -->
-    <defaultProxy enabled="false" useDefaultCredentials="false"/>
+    <defaultProxy enabled="false" useDefaultCredentials="false" />
     <!-- this improves the performance of web map layers a bit -->
     <connectionManagement>
-      <add address="*" maxconnection="4"/>
+      <add address="*" maxconnection="4" />
     </connectionManagement>
   </system.net>
-</configuration>
+</configuration>
\ No newline at end of file
Index: release/DSoilModel/System.Runtime.CompilerServices.Unsafe.dll
===================================================================
diff -u
Binary files differ
Index: release/DSoilModel/Deltares.DSoilModel.Data.dll
===================================================================
diff -u -r1096 -r1110
Binary files differ
Index: release/DSoilModel/Deltares.Standard.TestUtils.dll
===================================================================
diff -u -r1096 -r1110
Binary files differ
Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r1109 -r1110
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 1109)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 1110)
@@ -2,284 +2,302 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{39B382FB-FDAA-49F7-86C5-70A97BA9773E}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{84030DF6-8D84-48FF-A757-8F5A30D1351C}">
                 <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
             </Component>
-            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{AF448B86-3F87-4F41-8061-6A8ABE07FEAB}">
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{9858F389-A8AF-481C-ADDE-BE40F2EDA121}">
                 <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
             </Component>
-            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{2495ACA2-6185-4F3F-B6A4-93E1CEEEC1A1}">
+            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{E020E868-5635-426E-8C96-35FEDE594AFD}">
                 <File Id="fil91D9F542E01E16BA0EF901B13142A8E1" KeyPath="yes" Source="$(var.BinFolder)\D-SoilModel.ico" />
             </Component>
-            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{B1241550-EE75-4E7B-9DA1-B959FB13C65E}">
+            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{86F0CB46-3B85-4A77-B5EE-968A78BD4946}">
                 <File Id="fil830BBEF28A818FF7484F117C8F4D9FD9" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Data.dll" />
             </Component>
-            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{ED8B616F-9CDE-4631-B9BB-848F9BE4AE07}">
+            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{070EE44C-E6A9-471F-AB8E-7063882D0B90}">
                 <File Id="fil5F82F57C4DC68136D0AA96686BDC9EA1" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Forms.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{56AF0536-4D6C-40F8-93EE-FED75E7B5090}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{2C96E435-336C-4874-BE16-FBDB97790C1E}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{03B6C1D3-E17C-4BC3-9FDC-BCE1390BAF4A}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{458113E7-7894-4E11-8B33-FC38FFE1D062}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{C9A832CD-92C7-41E5-87C5-BBD40DA47A81}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{F813E429-1474-4BA7-BDFE-57025DF5791A}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{46CFCF10-2780-4AD2-9AA4-482C56F46E64}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{A422FED4-B17F-48A4-A5DE-70A7F190EB0B}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{1340F1CF-658A-4D40-BC1B-F6128349B183}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{872AC5D0-851E-4D1F-9F7C-89CBE6243E90}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{846E70A8-CEF8-4E54-A6EC-790A70217B22}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{F0FC464E-E10E-4EF3-8167-1710D58D5A8F}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{1FEE9135-9BB0-4CAC-9252-23F3F710F9C2}">
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{9268D092-DBEE-4F08-8D0B-95487D11610B}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{3C00C770-BAA0-4EF8-9AAE-F7255F47C3E2}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{9BDDE817-8EA6-4742-AB14-2543CCAD2FB8}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{939D2595-B623-455B-AF20-24A703EAD4B7}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{8D36D424-AA2D-413C-A108-778393AB99A5}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{01D44231-AD7A-440F-9CD4-755C25425021}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{E1F5686E-DC1D-4A43-8B79-0526EA016A90}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{1469093C-D581-4AF3-BFC5-7CC91191241B}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{49A71D0B-3FCE-4BB6-B16A-624D6B047A5E}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{BE371795-AB37-4BB4-8A2B-02B3AC041CB8}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{C1829E05-BCF8-496A-ADAE-83EBCD0018B9}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{AB685A3D-5AF5-4135-98F6-D4038A28364B}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{A977ADF7-44F6-4EBF-9ACD-7FB3903D5C7A}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{FC6A35B2-C94B-4155-B36B-2DF07C2A2569}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{500D6E10-E8AE-4497-ACF3-B89DEA3489DF}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmp30704738CF02D353C0709E0724DA8EB0" Guid="{968C9E30-F0A7-458F-B52F-8482A01275F0}">
+            <Component Id="cmp30704738CF02D353C0709E0724DA8EB0" Guid="{F36480E5-7DD6-4809-9A52-87224C29E18B}">
                 <File Id="filF76B646D13F149437C668E172ED85C3E" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Charts.v23.1.Core.dll" />
             </Component>
-            <Component Id="cmp14B2D9057DE38372D2F7363264FD2433" Guid="{C06BD5A3-0AFE-45A3-9B63-9083021BFE9C}">
+            <Component Id="cmp14B2D9057DE38372D2F7363264FD2433" Guid="{D4F7A614-BAF5-47DF-B060-309A6C5F06DE}">
                 <File Id="filA70CAF758CAD655F19E51FFCB4900DBA" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Data.Desktop.v23.1.dll" />
             </Component>
-            <Component Id="cmp040BA6A6F85A3EF2B67359A3BD106CC6" Guid="{90DD169B-120E-4899-BDF8-F2332635F544}">
+            <Component Id="cmp040BA6A6F85A3EF2B67359A3BD106CC6" Guid="{2DE5857F-97FD-4EC4-8884-E818CFD77242}">
                 <File Id="fil1C7710BF31741B82ED3111BAA158338C" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Data.v23.1.dll" />
             </Component>
-            <Component Id="cmpC238DE337E46D081B62E04179CC96430" Guid="{80575005-798A-49F9-99BD-5D552A026EC6}">
+            <Component Id="cmpC238DE337E46D081B62E04179CC96430" Guid="{475C8D09-0F50-46E9-8AB0-1CF8D14382A8}">
                 <File Id="fil866844D38DFBFCB696A2662551AEA0D5" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Drawing.v23.1.dll" />
             </Component>
-            <Component Id="cmpD8DA976294D6BF750DDBCD7500686E64" Guid="{F4455D73-C0E5-416F-B689-E26F04D302CC}">
+            <Component Id="cmpD8DA976294D6BF750DDBCD7500686E64" Guid="{BF5D4D25-9516-4D44-AEED-AC4D9750A41F}">
                 <File Id="fil5256B4E200C29570BA9935150EF78634" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Images.v23.1.dll" />
             </Component>
-            <Component Id="cmpA7074393C8A464411210D0A736772D94" Guid="{55B50336-66DC-484C-B12E-B46B92E8D19A}">
+            <Component Id="cmpA7074393C8A464411210D0A736772D94" Guid="{8B011DCE-0532-49E9-ADBC-1FB8D5C194D8}">
                 <File Id="fil173AB3542670A42D83387588696C7243" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Printing.v23.1.Core.dll" />
             </Component>
-            <Component Id="cmpB8303204E8E64D69B0B99A4D775C6826" Guid="{5DBD49E0-807E-4CD8-8C04-D1009B769D9F}">
+            <Component Id="cmpB8303204E8E64D69B0B99A4D775C6826" Guid="{4133A9C0-911A-45AA-8902-43DE36C9B34B}">
                 <File Id="fil2FC0F2F38F843D6FBCF02D5CD1DE884C" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.RichEdit.v23.1.Core.dll" />
             </Component>
-            <Component Id="cmpE9B84F13CBE5672B514BA6B2D4FFB6EA" Guid="{7288C3CD-2E36-4253-8D27-1A3C50AD1F52}">
+            <Component Id="cmpE9B84F13CBE5672B514BA6B2D4FFB6EA" Guid="{E33AE6DA-E17F-43BC-9B83-17C7D961124C}">
                 <File Id="fil6726C4CC21C45623A90402FC683FB4C9" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Utils.v23.1.dll" />
             </Component>
-            <Component Id="cmpC4D963E74942D0C3B820CFE9F1452977" Guid="{F46FA1AF-85CB-4D55-86A5-BDE0B941041A}">
+            <Component Id="cmpC4D963E74942D0C3B820CFE9F1452977" Guid="{A432792C-CDE0-4308-83A9-A7CDF72FB145}">
                 <File Id="fil0E89FD9BA507978CDB45D85DB22D49C5" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.Utils.v23.1.UI.dll" />
             </Component>
-            <Component Id="cmp01A47C58A2A3D8040A22C0BB9A763BB5" Guid="{03D5E44B-B2FE-4F29-BC96-3E29ECF9A3A9}">
+            <Component Id="cmp01A47C58A2A3D8040A22C0BB9A763BB5" Guid="{4CCACF81-62C8-4FBB-A793-711B57C37ED6}">
                 <File Id="fil7B048990214544F234BAD01EA2D521F0" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraBars.v23.1.dll" />
             </Component>
-            <Component Id="cmp7161E7694307E4BD1AF6E2C87D027C3A" Guid="{6D0E5A76-6B5E-4468-AB8B-D478D33636F4}">
+            <Component Id="cmp7161E7694307E4BD1AF6E2C87D027C3A" Guid="{A7437EAC-791B-441E-8AFD-2F399E491C74}">
                 <File Id="filE3C233717903B064CC30DDDEEE7E42E1" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraCharts.v23.1.dll" />
             </Component>
-            <Component Id="cmp2CF18506176DE2101487F05751FA4EED" Guid="{FDB54D18-F77A-4985-9652-B5E556E6C905}">
+            <Component Id="cmp2CF18506176DE2101487F05751FA4EED" Guid="{0235F9FF-CE46-44C9-83A3-9F4FA32B5FF7}">
                 <File Id="fil53B3ADE8AB2F3BA03426A02F4949C975" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraCharts.v23.1.UI.dll" />
             </Component>
-            <Component Id="cmpCF6725C5BB5387D343F0076377E4D249" Guid="{0541EC0B-B096-4FD3-A2F6-3BA84BBED125}">
+            <Component Id="cmpCF6725C5BB5387D343F0076377E4D249" Guid="{7A46A7B0-EC96-4927-80B1-2871177A279B}">
                 <File Id="fil3200DF7881E08357600EDF75DE4D73CA" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraCharts.v23.1.Wizard.dll" />
             </Component>
-            <Component Id="cmpAA7421CA4779217EFA075CB044A13FEA" Guid="{9795EB1A-1AB6-4530-AB61-97847554A99D}">
+            <Component Id="cmpAA7421CA4779217EFA075CB044A13FEA" Guid="{D1D4506F-A924-4E9B-87AC-C88D1005F65B}">
                 <File Id="filB97582C686486B6D61C956A96DAC6DA6" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraEditors.v23.1.dll" />
             </Component>
-            <Component Id="cmp8C2DF63C7E7EB066FEB7124B5D4DD1B3" Guid="{60345CFA-6A14-4EDF-AB0B-472B429B717C}">
+            <Component Id="cmp8C2DF63C7E7EB066FEB7124B5D4DD1B3" Guid="{E273EC3D-19C4-45A0-8C05-9760E8C45393}">
                 <File Id="fil1C4D422909DDEFC0E6887682E22D36E6" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraGauges.v23.1.Core.dll" />
             </Component>
-            <Component Id="cmp32C59ECE9B65FA654D13E96653999A74" Guid="{798B399E-C95E-4DEB-9C0D-79A599C200D7}">
+            <Component Id="cmp32C59ECE9B65FA654D13E96653999A74" Guid="{FE81A2C1-FED5-4CB1-851B-502AFD3AA504}">
                 <File Id="fil32003B4E035D11067012496A81B38D44" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraGauges.v23.1.Win.dll" />
             </Component>
-            <Component Id="cmp47AD801B9181EA252D91F437C2625B60" Guid="{33E23C6B-DFC1-42DB-BB13-840C430CD643}">
+            <Component Id="cmp47AD801B9181EA252D91F437C2625B60" Guid="{974D46A7-B81A-4858-9090-1EFE7B94452C}">
                 <File Id="fil25B4482BA10116807679BD0D1DFBCD07" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraGrid.v23.1.dll" />
             </Component>
-            <Component Id="cmp9BEFC302C09AAF44C5566022D0011C77" Guid="{427A7779-21DC-4DE5-A529-194709FFEEAC}">
+            <Component Id="cmp9BEFC302C09AAF44C5566022D0011C77" Guid="{B457F448-4506-4C24-AD62-E8F1DDC17C98}">
                 <File Id="fil1A41CECC8568599BC234F028E868FEDD" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraLayout.v23.1.dll" />
             </Component>
-            <Component Id="cmp6636BC85D9079DDC42101C42D029F63D" Guid="{927FC181-102A-4330-98DB-DC79D2CF048A}">
+            <Component Id="cmp6636BC85D9079DDC42101C42D029F63D" Guid="{8009EB35-D3C9-499B-8548-4ACE5D8CB18C}">
                 <File Id="filE40079494C62055BD02391B615489C8A" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraNavBar.v23.1.dll" />
             </Component>
-            <Component Id="cmp3AFE9F85629D9EA1DE71A96A90C77AB2" Guid="{7D0BD3D0-D7CC-4F5C-8212-16B358B72E3A}">
+            <Component Id="cmp3AFE9F85629D9EA1DE71A96A90C77AB2" Guid="{C1F72ABE-3433-4345-A7E8-F8771629DD60}">
                 <File Id="fil74676B006A4B2F94A29B1D2B30CAA22F" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraPrinting.v23.1.dll" />
             </Component>
-            <Component Id="cmpA52102FBABB41A37A96C923A0C600200" Guid="{574A2415-6DCB-4B49-A4E8-5A03A8A8CC4D}">
+            <Component Id="cmpA52102FBABB41A37A96C923A0C600200" Guid="{DD0A0B69-A33A-403D-A041-38FB1281E54C}">
                 <File Id="filE3932F9A5328E8F86FDED3F960F115F3" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraReports.v23.1.dll" />
             </Component>
-            <Component Id="cmp7A0F96A9F73A5EB8CB8D3B355E991196" Guid="{42808692-952F-411D-8468-6EB54D0498D5}">
+            <Component Id="cmp7A0F96A9F73A5EB8CB8D3B355E991196" Guid="{775A06D6-707B-4CC3-B09F-E2BEAE48AC22}">
                 <File Id="fil092E275098FB14E53665D5B62B55DBEF" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraRichEdit.v23.1.dll" />
             </Component>
-            <Component Id="cmpAF37E763C9ECD5DBE57C4B2AA703D332" Guid="{17EF1030-AAA5-432B-8AF9-F2BEEDBB52B7}">
+            <Component Id="cmpAF37E763C9ECD5DBE57C4B2AA703D332" Guid="{287BED2A-8C8C-4C57-B74F-F828C8BC4AE6}">
                 <File Id="fil4FD3EA165041AC8097876172A2C42D16" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraTreeList.v23.1.dll" />
             </Component>
-            <Component Id="cmpEF2FD9D0F8E1530997DB8AE6251F45BC" Guid="{B1CC6E0B-411E-4DEE-B284-125E3608FE7F}">
+            <Component Id="cmpEF2FD9D0F8E1530997DB8AE6251F45BC" Guid="{2F1FDD9B-38E3-47F4-9631-965BB99AE8E8}">
                 <File Id="fil7C6367B9F235B21FD31F4684E1614463" KeyPath="yes" Source="$(var.BinFolder)\DevExpress.XtraVerticalGrid.v23.1.dll" />
             </Component>
-            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{9C3FFF3A-8735-4EDC-BE37-1E4188200B4F}">
+            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{42DB9D5A-ACC4-481D-8745-4F70BF6CB07B}">
                 <File Id="filABE4682BE5464D6FBA20B56403F5A5DB" KeyPath="yes" Source="$(var.BinFolder)\DGSGEF.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{52131528-C560-4383-8186-6AA318D93632}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{F90D53B2-071E-4802-9FAE-BE7D7996604D}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmpBC118B2FB85D2949E0EFF8C32B85653B" Guid="{210F5096-4119-4517-A233-8F85D037861F}">
+            <Component Id="cmpBC118B2FB85D2949E0EFF8C32B85653B" Guid="{D8B743DF-3829-4834-8E66-B55852A63068}">
                 <File Id="fil1C586EB46710012BC50016909A4C0446" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll.config" />
             </Component>
-            <Component Id="cmp5CC80658F4F2B44E395911512437ABAA" Guid="{F1B0B610-417C-46FD-8BBF-782767839B49}">
+            <Component Id="cmp5CC80658F4F2B44E395911512437ABAA" Guid="{AAE5F2A5-6C5E-4BA8-9E86-9EEDE9AD0206}">
                 <File Id="fil954697444778DEB1D7CA1D94324ACEBA" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.xml" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{5347B3B0-D343-4DED-B865-98584B9E8700}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{F2248532-2D86-44C5-B96F-9B573453D332}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp4277157B248C635853C058302ACC2409" Guid="{40B98135-D6D2-4234-940C-20C509E4E109}">
+            <Component Id="cmp4277157B248C635853C058302ACC2409" Guid="{7CA74E81-325B-453C-9F08-FA1B067EFF6A}">
                 <File Id="filCC19170F3C7B6BB55D33B0C2D2F83392" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll.config" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{E47707F2-B870-4BAE-BB99-947FEE334D8B}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{65EEC4C5-FC98-42AA-93DD-9EC98FB2405B}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{C69999D0-86A0-4381-919D-476A1300D0F2}">
+            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{8B5088E8-97A4-4DBD-812C-A39940BE4FF3}">
                 <File Id="filC95772BD906C6022EF697886806A5DCD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Rasters.GdalExtension.dll" />
             </Component>
-            <Component Id="cmp6CDED7F5E17DE7B1D2D555DA040D2F34" Guid="{861C9DA9-7368-478C-B3E6-D5E90BADA66F}">
+            <Component Id="cmp6CDED7F5E17DE7B1D2D555DA040D2F34" Guid="{645FF47F-42A9-467B-A553-C94C34382DAA}">
                 <File Id="filF4CD56E56597F304E7E8CCD300644DAD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.xml" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{4DD4A251-750B-4D3D-ADC1-2300478145DD}">
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{9CC6EB69-833C-4B17-8453-3258FFD6FF5E}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmp5D32B7C21A4A5A8FB8A51A756E2D500E" Guid="{6EE3658A-BF0F-4FC7-9291-7525671709F3}">
+            <Component Id="cmp5D32B7C21A4A5A8FB8A51A756E2D500E" Guid="{D0CF7B16-F76F-450D-86FD-B36282C7EB09}">
                 <File Id="fil47A943B7673C83DD515D724325C6DE58" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.xml" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{F50B3623-E4D1-4EBA-B377-EDA029C7F76A}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{6D8CCE9E-9766-4622-B899-A51369EFA3DB}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpEF4C9BB8D8DCCC05BD0C0FDC0F1D27E4" Guid="{35FCB944-DDA6-4E0C-83A3-57DE6BC7A34A}">
+            <Component Id="cmpEF4C9BB8D8DCCC05BD0C0FDC0F1D27E4" Guid="{6CA81DE6-CEA2-4C60-83AB-88BF9C8CCF3C}">
                 <File Id="fil062FDD475D430A1D5DE3B6A66A556FB3" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.xml" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{E2A1AEBE-4683-4497-B0A8-EE0A279E1785}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{287B88BF-0585-4225-A047-786C32C77EE4}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmp2F41A31E598EEA6BC0B8363182A7E58D" Guid="{922FCD05-D219-429F-AA56-09E341A868E5}">
+            <Component Id="cmp2F41A31E598EEA6BC0B8363182A7E58D" Guid="{4CBE5D71-6775-4D13-904C-07B508FE955D}">
                 <File Id="filFE9AB3C4FA31AF5B5B40BC209543B15D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.xml" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{615F74B0-F610-4FF9-99FE-EA6CFE72CD97}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{702C705B-C2C3-4F51-A7A5-48745BA1F138}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{66BB9395-143B-45D1-AE85-827FBBB8795C}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{79280B5A-DC60-4A9B-9E5D-21B92D9404FF}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp08621A5E8154EADC2AE8D5BAA9CB0D41" Guid="{54D8FDE2-8534-4186-86B5-0A5038061EAA}">
+            <Component Id="cmp08621A5E8154EADC2AE8D5BAA9CB0D41" Guid="{7340B9BC-E0E5-4BED-8A45-672D63621177}">
                 <File Id="fil3732E838CFFE5D33AB39D6C53CD4230E" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.xml" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{7B125C80-8F22-45D2-817D-FBBF71C8AAF1}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{69C769E7-6D09-4864-8BA1-C10B61346A7B}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmp82F1D7187B1A956C16D11A3ED80B8145" Guid="{4EC1389C-6CD5-4FC6-9706-5F75A041A027}">
+            <Component Id="cmp82F1D7187B1A956C16D11A3ED80B8145" Guid="{163B2EB2-5F79-4D5B-9F6C-47C7C0D43D51}">
                 <File Id="filE1E8E700660946CD0F574E62F882FC72" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll.config" />
             </Component>
-            <Component Id="cmpF5361ACAC638363CEA70A35ACE92D28E" Guid="{745E0C88-09F2-4BCA-B2F0-05F59340F6B3}">
+            <Component Id="cmpF5361ACAC638363CEA70A35ACE92D28E" Guid="{EDBE2132-235F-4A8A-82F5-696F0BF17F38}">
                 <File Id="fil0AFCFA3AF1F3984965386D8545E317D1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.xml" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{E1DD24B9-B179-4920-B307-041E2D140BD7}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{6C58189F-E0DF-44CF-A8F2-3B17852A3EE1}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{C797F830-EA06-4FFC-A036-C6A8664EB81B}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{9A02D658-1468-40C3-B9A6-CEB6FA9EA9C9}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmp18DBE8559882FDB1E9F7F1DE31FAEC92" Guid="{A9308A53-6AB2-44DE-8F50-47AC56BCBAC6}">
+            <Component Id="cmp18DBE8559882FDB1E9F7F1DE31FAEC92" Guid="{3F54CCE4-C674-4447-BEC8-8539D035859A}">
                 <File Id="fil66ED67D1CCEC55A07C06A8494EDCD501" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.xml" />
             </Component>
-            <Component Id="cmp07BE718FDECF4127DA9083B5288E8F06" Guid="{E7F8AE3D-C0A6-4A6F-AAFF-8C2E44A02EFD}">
+            <Component Id="cmp07BE718FDECF4127DA9083B5288E8F06" Guid="{5C7C2FEF-D91F-4BD2-8EF9-8B7ED731E32F}">
                 <File Id="fil26873270142840951E5B34A531971C87" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.xml" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{0C0F0BD6-DC6F-4297-BF49-1A14D1E68300}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{6227BBA6-6BEE-4B70-A98F-CBD4F3876DFB}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpDB848C600CE1A433C73635BCB7613680" Guid="{DF14535F-F966-4D8D-A22E-C724E1F4997C}">
+            <Component Id="cmpDB848C600CE1A433C73635BCB7613680" Guid="{F8A7E599-BF19-43CB-AC85-FCE0E14D36F0}">
                 <File Id="fil0E57FA78EABA9DB3B76A9E76B300B409" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.xml" />
             </Component>
-            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{2FD34AA9-3AFF-4176-9F25-97611A11E5CA}">
+            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{62399971-95B4-41B0-8045-23AC885B7EFF}">
                 <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe" />
             </Component>
-            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{A2EDC279-7D44-47B7-B218-1E95DF98FA47}">
+            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{5FB17CDE-CCCD-4523-92F6-0EBBE221133C}">
                 <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe.config" />
             </Component>
-            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{F1C05536-3782-4A10-9B2C-1FA3EB13A800}">
+            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{43C38C5B-8FDC-42A6-BF24-1D64172F2545}">
                 <File Id="filA80D8C7C88FEA11402E41B4F0A597F13" KeyPath="yes" Source="$(var.BinFolder)\fbembed.dll" />
             </Component>
-            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{74038FEA-5182-407A-85E4-F79C9AB7C750}">
+            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{AABDF882-5397-4728-89CF-169CF1E4F0A4}">
                 <File Id="fil5AD82B318E8DD2E38581B3708F19B820" KeyPath="yes" Source="$(var.BinFolder)\firebird.msg" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{79C5D0B3-6120-4FB1-908C-FFEAA6EB0482}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{F336BE2D-07F7-4938-98F8-401FE527FC89}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{BB149A8E-AEE2-4938-B21D-3615B1565DD5}">
+            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{B59BC430-96E3-4A12-A618-AD8D81E3A37D}">
                 <File Id="filDD73F351863FEF37BD9EA1EDA68D49A6" KeyPath="yes" Source="$(var.BinFolder)\gdal_csharp.dll" />
             </Component>
-            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{3746A677-4CFA-41A3-919A-104812DB21F4}">
+            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{948B5E66-E94E-4CE5-8A22-5260AC37B6E5}">
                 <File Id="filCA1B93B1E04F9E859706929F4AB3CFAE" KeyPath="yes" Source="$(var.BinFolder)\Gef2.dll" />
             </Component>
-            <Component Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" Guid="{875756C5-0091-461E-AC1F-1A87C7B86698}">
+            <Component Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" Guid="{B0EE4089-9D80-4DE8-BFC3-12EC757B7020}">
                 <File Id="filA57D83131128C8DF0624B91B5BCB404A" KeyPath="yes" Source="$(var.BinFolder)\GefBoreNL.dat" />
             </Component>
-            <Component Id="cmp2CF79882141672A94EAF05B498ED9029" Guid="{CC179442-BD95-4AB6-962A-7E767D432D0D}">
+            <Component Id="cmp2CF79882141672A94EAF05B498ED9029" Guid="{0E203B06-C9DB-4646-A038-CCE762154F64}">
                 <File Id="fil7E670CDE16A03B5EF9F1D974C818A5FF" KeyPath="yes" Source="$(var.BinFolder)\GefBoreUK.dat" />
             </Component>
-            <Component Id="cmp45A0ADE7943B7A4A2E589D96D210770D" Guid="{3704993B-A2E6-4A35-A0F4-B3AEB74202BD}">
+            <Component Id="cmp45A0ADE7943B7A4A2E589D96D210770D" Guid="{C3A1C6F5-3FBF-4727-849E-FA85F1245ACB}">
                 <File Id="filDF048C4845A59576DEF0AAF729816264" KeyPath="yes" Source="$(var.BinFolder)\GeoAPI.dll" />
             </Component>
-            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{C3E8E1AF-83B2-4893-B942-F53A630571A9}">
+            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{96871F43-B6CE-4679-B47D-FC3A4567FE46}">
                 <File Id="fil55A495EE2A8C0D1AC7E4625A9332454F" KeyPath="yes" Source="$(var.BinFolder)\ib_util.dll" />
             </Component>
-            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{FB584CD8-C62C-44F1-BD0A-A479BBC6028F}">
+            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{838284FF-71DE-4954-8687-ED5B3C10FB37}">
                 <File Id="fil8500BA131F16F61959822A95B67A257C" KeyPath="yes" Source="$(var.BinFolder)\icudt30.dll" />
             </Component>
-            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{C09EB452-DBE2-40A6-A8CC-8460B821B318}">
+            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{7A98B4FC-6A0B-4AE4-9E40-51DE774639A0}">
                 <File Id="fil19B3813E023D34D2E651155522C0E83A" KeyPath="yes" Source="$(var.BinFolder)\icuin30.dll" />
             </Component>
-            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{826E800E-C9A7-4E55-9C16-5830316ED23A}">
+            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{C8A34180-943C-452C-95B9-BCD7E7FCF908}">
                 <File Id="filEB52BFF83606A0185E8CC52B28A4FC43" KeyPath="yes" Source="$(var.BinFolder)\icuuc30.dll" />
             </Component>
-            <Component Id="cmp68E04A185E00A6AD09D27A0AAAE200EA" Guid="{9A8BCBF7-2C13-4B69-98C1-772E27936A49}">
+            <Component Id="cmp68E04A185E00A6AD09D27A0AAAE200EA" Guid="{5C9D0B5E-3996-40B9-9046-3C9DFE5EBB2B}">
                 <File Id="filF94AB4B6338BE821729E1DD8952F8591" KeyPath="yes" Source="$(var.BinFolder)\KellermanSoftware.Compare-NET-Objects.dll" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{C36603C5-3C89-46F1-B877-51DCDA748753}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{9188B5D5-8E41-44B6-B1F7-996E7C218C03}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{DF203378-A7A1-46CF-9121-BCD1970EF76B}">
+            <Component Id="cmp968AC9A7D1F89ACEC42E7A1933B1DC85" Guid="{395B819F-574B-43D3-A845-DD35AD767B0E}">
+                <File Id="filEFC68F06EA163C1C28037C23DA95C0C7" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.xml" />
+            </Component>
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{AE3792D0-16D5-425B-843D-608F5C3FFC43}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" Guid="{F3480F1A-25AC-45FF-9871-7CA14DDD49EC}">
+            <Component Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" Guid="{30E4D8CF-F81B-43F6-8878-4155EACB4591}">
                 <File Id="filAB89E906D8C3E63F4810FD84943E839D" KeyPath="yes" Source="$(var.BinFolder)\NetTopologySuite.dll" />
             </Component>
-            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{16F6E8A0-EE6D-4AD6-98E1-99F1CCDE90E6}">
+            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{B9787F0F-5B11-4315-B1D0-A30D601074AC}">
                 <File Id="fil58FA97A82C74E7C028484557C2E9031F" KeyPath="yes" Source="$(var.BinFolder)\ogr_csharp.dll" />
             </Component>
-            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{22297545-6AA1-44D0-9024-0A01E76622C6}">
+            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{28EAF8FE-2D96-4590-A4F0-3F380009E8FC}">
                 <File Id="fil85F845F2C104287D16405A9C5D4DD89C" KeyPath="yes" Source="$(var.BinFolder)\osr_csharp.dll" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{1021A8B3-98B2-4598-8F27-B3CB340DEDD9}">
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{9F27F624-3F5F-4D84-88B1-9F29D71617B4}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
-            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{722F506E-DE56-4D1F-A8ED-365F6C5B3E6B}">
+            <Component Id="cmpA748C45814948C0E47F0962CF5A9E2C5" Guid="{77211CDC-7394-44BA-BA4B-C147D3BE75CD}">
+                <File Id="filAF63FF48A59E0E5E7F49BFD1CBBB0CC3" KeyPath="yes" Source="$(var.BinFolder)\System.Buffers.dll" />
+            </Component>
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{4C6E1187-6C96-4BBD-9F15-1CD253FDD0FC}">
                 <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
             </Component>
+            <Component Id="cmp642ED5B0D0BD1F16347D1310992C55A0" Guid="{D948B2F5-B572-4DB9-9404-1EB2855BA375}">
+                <File Id="filFA1D7EC932018D1CCB80F9F43D328009" KeyPath="yes" Source="$(var.BinFolder)\System.Memory.dll" />
+            </Component>
+            <Component Id="cmp89AE5ECEB789ECF60BE6CC568D60B2F9" Guid="{23D59094-7707-485D-8B31-2462B39DEA6F}">
+                <File Id="fil07CC506FCE6F39AF87379627460A5FFB" KeyPath="yes" Source="$(var.BinFolder)\System.Numerics.Vectors.dll" />
+            </Component>
+            <Component Id="cmp4A8A6A75A7C3928058FB8D71B03DECA5" Guid="{41FC1C0B-0D7C-4543-8D15-1A7BB37DA138}">
+                <File Id="fil905A3F9E6816128D691E37CC90C0750D" KeyPath="yes" Source="$(var.BinFolder)\System.Resources.Extensions.dll" />
+            </Component>
+            <Component Id="cmpAFCF21A15F6EDA45A32D147050609285" Guid="{C0288DFF-744F-4E7A-8D55-54AB03AF5BC9}">
+                <File Id="filAE286E96EA00902BC284AEBF3030D6E4" KeyPath="yes" Source="$(var.BinFolder)\System.Runtime.CompilerServices.Unsafe.dll" />
+            </Component>
             <Directory Id="dir97F42FF68945B97AAE670945C4FDAE93" Name="x86">
-                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{52DECAA9-BADB-4AA3-91CD-77ADBFD1EA2F}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{E985D500-8AF4-42FA-A4ED-2F0016F653F4}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>
@@ -373,12 +391,18 @@
             <ComponentRef Id="cmp30C1802BC382DE5E0C8F33B33B275D88" />
             <ComponentRef Id="cmp68E04A185E00A6AD09D27A0AAAE200EA" />
             <ComponentRef Id="cmp9DD47D0347AE254D923E22047764B092" />
+            <ComponentRef Id="cmp968AC9A7D1F89ACEC42E7A1933B1DC85" />
             <ComponentRef Id="cmp3ED5A0A4D782A8BF371C8403342D615B" />
             <ComponentRef Id="cmpE1A276CBD4AA0395A6D00E549496DB5C" />
             <ComponentRef Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" />
             <ComponentRef Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" />
             <ComponentRef Id="cmp20B8D4726881994439470FFC8B08FD93" />
+            <ComponentRef Id="cmpA748C45814948C0E47F0962CF5A9E2C5" />
             <ComponentRef Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" />
+            <ComponentRef Id="cmp642ED5B0D0BD1F16347D1310992C55A0" />
+            <ComponentRef Id="cmp89AE5ECEB789ECF60BE6CC568D60B2F9" />
+            <ComponentRef Id="cmp4A8A6A75A7C3928058FB8D71B03DECA5" />
+            <ComponentRef Id="cmpAFCF21A15F6EDA45A32D147050609285" />
             <ComponentRef Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" />
         </ComponentGroup>
     </Fragment>
Index: src/Deltares.DSoilModel.Setup/WtiSos.wxs
===================================================================
diff -u -r1096 -r1110
--- src/Deltares.DSoilModel.Setup/WtiSos.wxs	(.../WtiSos.wxs)	(revision 1096)
+++ src/Deltares.DSoilModel.Setup/WtiSos.wxs	(.../WtiSos.wxs)	(revision 1110)
@@ -2,41 +2,41 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="WTISOSFOLDER">
-            <Component Id="cmp0400BE1FBF602FBA824D36D2A362447D" Guid="{46497E08-B048-4E7D-876C-650AA1BB3631}">
+            <Component Id="cmp0400BE1FBF602FBA824D36D2A362447D" Guid="{BAE68EE7-E8A6-4B59-85BD-EB4B9B1E056D}">
                 <File Id="fil42C69E9431126B3AA4CA4A01469BFEE4" KeyPath="yes" Source="$(var.WtiSosFolder)\Leesmij.txt" />
             </Component>
-            <Component Id="cmp071469927CA289BC71BFEE28AEF5F9A1" Guid="{0486DFEA-6D3B-4B6F-93C1-B083210576FC}">
+            <Component Id="cmp071469927CA289BC71BFEE28AEF5F9A1" Guid="{8A004ABD-7D71-4C69-BBDE-1CE9F477A529}">
                 <File Id="filB92418A993E0D62AB3851D307F21DAE5" KeyPath="yes" Source="$(var.WtiSosFolder)\WTISOS2017_laag_1sep2016.soil" />
             </Component>
-            <Component Id="cmp4D3171AFEA5CDD0CBEB64976C8E64DA0" Guid="{02149E86-679A-4E3D-BADD-6779CAE39F9E}">
+            <Component Id="cmp4D3171AFEA5CDD0CBEB64976C8E64DA0" Guid="{3DEE88CE-E2BD-4415-AC7F-79FCA946B24F}">
                 <File Id="filE0D97B61EC01250771E594D0D783B3E1" KeyPath="yes" Source="$(var.WtiSosFolder)\WTISOS2017_materiaal_1sep2016.soil" />
             </Component>
-            <Component Id="cmpC12BA7CE49BC2FAFA0BE646D8FA09B31" Guid="{9A5A4F6A-10F8-4105-B0CA-20CD9C7D3C9D}">
+            <Component Id="cmpC12BA7CE49BC2FAFA0BE646D8FA09B31" Guid="{3E6A0264-B2E1-4F16-9A28-DF0B2754F06A}">
                 <File Id="fil5EB22EA6D092CCC26F0BB4387470AD61" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.dbf" />
             </Component>
-            <Component Id="cmpA74939F1A3EEE8DAD294470517150149" Guid="{39F106E4-26D7-4BDC-9871-EF7EE8E786CC}">
+            <Component Id="cmpA74939F1A3EEE8DAD294470517150149" Guid="{32468AE4-E931-4E3D-A297-4385747B6A8C}">
                 <File Id="fil317F27797BB22497E54772FA4EB4C659" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.prj" />
             </Component>
-            <Component Id="cmpFD9FCFD80E5F21F81C14F54417124030" Guid="{DC71C658-7FE7-466F-AB20-385A2D3124A4}">
+            <Component Id="cmpFD9FCFD80E5F21F81C14F54417124030" Guid="{6D768AD4-D506-40EF-9D96-96C2B9E72FA2}">
                 <File Id="fil79AECF97C6DA2385B4FE1761C1E5DB40" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.sbn" />
             </Component>
-            <Component Id="cmp7643C53AABE715E9D3FDCC55885B4ACE" Guid="{5FC5C02C-5B7D-489B-AFAA-48BEC98578A8}">
+            <Component Id="cmp7643C53AABE715E9D3FDCC55885B4ACE" Guid="{C5BBE486-2864-4460-9D48-4515B72968C5}">
                 <File Id="fil9F3208ECE6EF7698795CD0F64E77C3E8" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.sbx" />
             </Component>
-            <Component Id="cmpD861475A31C8FA1E6BBE6A600EDC95C0" Guid="{F53B62D6-E37D-4B98-AA8F-0C310B946534}">
+            <Component Id="cmpD861475A31C8FA1E6BBE6A600EDC95C0" Guid="{C74876E7-4950-46F5-B91A-B23F1386AF28}">
                 <File Id="fil7E2265820FC1EC7DE259E68051ECD39B" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.shp" />
             </Component>
-            <Component Id="cmp74520D1E4C938D4812B8E8644DF85B8B" Guid="{71F236FF-1F47-4A30-9344-7ED2F7C47AD0}">
+            <Component Id="cmp74520D1E4C938D4812B8E8644DF85B8B" Guid="{D2B5FD28-0917-40CE-A683-FF5AB15BDC15}">
                 <File Id="fil334F20510CFB60E4E48707D11A4FCE55" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.shp.xml" />
             </Component>
-            <Component Id="cmp7240A9CB674FEC3FC836BDB8FD947CCF" Guid="{97085879-B602-4E68-9EEB-E59D6ACA0FAC}">
+            <Component Id="cmp7240A9CB674FEC3FC836BDB8FD947CCF" Guid="{B579D262-9E23-4FA3-BE30-EFC8C8791387}">
                 <File Id="fil2F1B912BB67D5C493EE15DB1D188E958" KeyPath="yes" Source="$(var.WtiSosFolder)\WTI_SOS_alle_segmenten_def.shx" />
             </Component>
             <Directory Id="dirB9E0DCCBA38EECA843CF95235C0F687F" Name="Defaults">
-                <Component Id="cmpF7D3F805E6D9779BFABB85BFD135C165" Guid="{3BC608CB-0DD0-4F66-9912-E5ACC0FDFA7D}">
+                <Component Id="cmpF7D3F805E6D9779BFABB85BFD135C165" Guid="{05F4A0A4-CEB7-40FD-B707-93C821AD989C}">
                     <File Id="fil7A2EFB7A5A7070AA5843F4D80785A5BB" KeyPath="yes" Source="$(var.WtiSosFolder)\Defaults\WTI_SOS_D70_1sep2016.csv" />
                 </Component>
-                <Component Id="cmp9E88B7FF938CB346B50C1888F919E455" Guid="{9205460A-4609-4311-90CB-8C0860325BCB}">
+                <Component Id="cmp9E88B7FF938CB346B50C1888F919E455" Guid="{E9871C38-52F1-4293-958E-C21A174B53C9}">
                     <File Id="fil42E2D827C91ABCFB3802517C1A406070" KeyPath="yes" Source="$(var.WtiSosFolder)\Defaults\WTI_SOS_VNK_kwaarde_1sep2016.csv" />
                 </Component>
             </Directory>
Index: src/Deltares.DSoilModel.Setup/Tutorials.wxs
===================================================================
diff -u -r1096 -r1110
--- src/Deltares.DSoilModel.Setup/Tutorials.wxs	(.../Tutorials.wxs)	(revision 1096)
+++ src/Deltares.DSoilModel.Setup/Tutorials.wxs	(.../Tutorials.wxs)	(revision 1110)
@@ -2,151 +2,151 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="TUTORIALSFOLDER">
-            <Component Id="cmp8D491A22F176D8B1F95A5EA6D1326EC1" Guid="{D42C7564-83A7-4E68-8982-34DB6696BB6A}">
+            <Component Id="cmp8D491A22F176D8B1F95A5EA6D1326EC1" Guid="{B5395BC0-F089-4E59-AC42-2D7F61E90001}">
                 <File Id="filC42B5A5F48DF0D942E51C6D3CE9B7EC7" KeyPath="yes" Source="$(var.TutorialsFolder)\B45B0013.gef" />
             </Component>
-            <Component Id="cmpCA2D9D702855C36E94E11D2514098B3B" Guid="{B7E7915E-8F81-4BF8-BAD3-89D20EA938B2}">
+            <Component Id="cmpCA2D9D702855C36E94E11D2514098B3B" Guid="{98989838-883E-48A5-A061-A1EBEB77292D}">
                 <File Id="fil010854064C64BE216220C4C648BABF8C" KeyPath="yes" Source="$(var.TutorialsFolder)\Grensspanning.soil" />
             </Component>
-            <Component Id="cmp4F6167D1CA6A3E4A0C549E17A24B1D0D" Guid="{B918DBE5-56F7-4D76-9B1C-7ACFBAB10F19}">
+            <Component Id="cmp4F6167D1CA6A3E4A0C549E17A24B1D0D" Guid="{1D8E8958-57D5-4707-812C-227B6D0C1A10}">
                 <File Id="fil495BD07CEDA8A034CB7B6D8F1E1A3D28" KeyPath="yes" Source="$(var.TutorialsFolder)\LocatieHM3_5.sti" />
             </Component>
-            <Component Id="cmpAB4C1FC74BA269B97304F9A2BBA4F833" Guid="{2AB37F97-BE26-46F0-B707-50F9D1A5F8DD}">
+            <Component Id="cmpAB4C1FC74BA269B97304F9A2BBA4F833" Guid="{17851E57-607A-4632-ADF0-F522FA9F10CC}">
                 <File Id="fil0D752FCBC94BA645E7A8F5ACD1D135ED" KeyPath="yes" Source="$(var.TutorialsFolder)\Sondering_tutorial.soil" />
             </Component>
-            <Component Id="cmp5649B4AF5D53359257D471F6AE302E51" Guid="{75FA537F-0A3D-4E21-8CF3-4DFA7732F0B4}">
+            <Component Id="cmp5649B4AF5D53359257D471F6AE302E51" Guid="{30EBAAA7-C482-43C8-9971-15D41B47C3FE}">
                 <File Id="fil73391FAD6127EA9D30A6794E4F0A5BAE" KeyPath="yes" Source="$(var.TutorialsFolder)\SOSdatabase_tutorial.soil" />
             </Component>
             <Directory Id="dir507E62CB7A56787BFBC6BDAFED2D952A" Name="Grondonderzoek-Boring">
-                <Component Id="cmpC27749E6D326C6D06477312EF21201AB" Guid="{EBF27A86-30FD-4847-AD33-8587EA17B04A}">
+                <Component Id="cmpC27749E6D326C6D06477312EF21201AB" Guid="{C86F50A1-856C-48FA-A69B-8B9EB7810B60}">
                     <File Id="filF55ECB5AAAFEFE4A5F6273D91A3A783F" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0013.gef" />
                 </Component>
-                <Component Id="cmpC13972A2519EAE9606D3AE76F72F2E29" Guid="{3D999140-C227-45FF-AD3F-41ACC8244467}">
+                <Component Id="cmpC13972A2519EAE9606D3AE76F72F2E29" Guid="{231C09A3-D4FA-417C-AB4A-FE1E089E1893}">
                     <File Id="fil128249F22A6A0738AA7815CD057C62D0" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0014.gef" />
                 </Component>
-                <Component Id="cmp6BFA68B6F9E70486EEA649B16CD224E3" Guid="{2B1C47BD-D213-4DD0-966A-7E96B2ED1DE7}">
+                <Component Id="cmp6BFA68B6F9E70486EEA649B16CD224E3" Guid="{3772F273-AAE1-4E99-8DC1-218446E3C7C5}">
                     <File Id="filF8BEC341FFFAC4435861912C0EA97A5D" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0015.gef" />
                 </Component>
-                <Component Id="cmp35514455B03D07B6858B5D3767ACAC6B" Guid="{6B403A14-E0EB-4951-AEB1-8AFA85751B7F}">
+                <Component Id="cmp35514455B03D07B6858B5D3767ACAC6B" Guid="{61DD12CF-CCA2-44EE-83EA-40FEFBD3FF1C}">
                     <File Id="fil2DEF913285D2C8B63575D45D9C56C2FF" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0016.gef" />
                 </Component>
-                <Component Id="cmpD27B328EABB6047F8767A895BF077B5E" Guid="{D226EC5A-7919-4BCF-A9E8-2C303E41305B}">
+                <Component Id="cmpD27B328EABB6047F8767A895BF077B5E" Guid="{1DDC061D-F8D0-4391-B7BF-68D669D28E54}">
                     <File Id="filCA16AE856740DC5CF6186AD303FF3FBD" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0021.gef" />
                 </Component>
-                <Component Id="cmpF18248D47065CEE1DBA0BE0AA8680F2C" Guid="{254F65DC-D752-4DF3-8C6C-F00016501E6F}">
+                <Component Id="cmpF18248D47065CEE1DBA0BE0AA8680F2C" Guid="{6E705316-C488-4BD2-A4F4-B264CF869FAB}">
                     <File Id="fil3E1ED4088233978FCA5F202A3709DF6B" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0044.gef" />
                 </Component>
-                <Component Id="cmpBBE9AF44B9F4B49FE9B0EC11F078FBB7" Guid="{8AD64106-FA3D-4197-8FB3-F6E87822BBFB}">
+                <Component Id="cmpBBE9AF44B9F4B49FE9B0EC11F078FBB7" Guid="{25FE6AB5-55A9-49A9-8475-8A50069D951D}">
                     <File Id="filE1BECDAFFB51E55563D57BCA6BD9927C" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0045.gef" />
                 </Component>
-                <Component Id="cmpE0DADDE0DAB57A5A497A5F068271189C" Guid="{18E9024C-9611-4AC1-8F8E-4C2BEEEA2CB2}">
+                <Component Id="cmpE0DADDE0DAB57A5A497A5F068271189C" Guid="{1A3116B0-9975-4C3C-9F98-EC4EC0DF46BB}">
                     <File Id="fil6E55AF8ACE0F4A91281247FCB94045D6" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0046.gef" />
                 </Component>
-                <Component Id="cmpFAF7B57F4BA511CD1390829150B9867B" Guid="{58B425EC-8B3E-4DBA-B98E-7B37AAE56F2F}">
+                <Component Id="cmpFAF7B57F4BA511CD1390829150B9867B" Guid="{146B3664-3D22-4727-B950-52C972ECBDC3}">
                     <File Id="fil1007EF6D5B437F2E45F432188FCD4C85" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0068.gef" />
                 </Component>
-                <Component Id="cmp949CE8FDAFC04D515B06A4FB40100A46" Guid="{34AFE922-0907-4B2E-8F93-B22492F6D9D5}">
+                <Component Id="cmp949CE8FDAFC04D515B06A4FB40100A46" Guid="{E87AD538-7707-42FA-ACD6-B5B667408A5E}">
                     <File Id="fil1C27699F9498FCB8FD1DCC6B8143861E" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0069.gef" />
                 </Component>
-                <Component Id="cmp87881A3FF5FD8E773D3CA3F36C16BA33" Guid="{DCB7A74F-EB24-41C3-97B1-5D6A16213C91}">
+                <Component Id="cmp87881A3FF5FD8E773D3CA3F36C16BA33" Guid="{25332E36-5A45-48DD-8B8D-9F701F8DB88B}">
                     <File Id="fil9A1281AEFAD9D48DA2367E5C5A77E4EF" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0142.gef" />
                 </Component>
-                <Component Id="cmp42F0B9D7EC30BDFB4337683AA1626606" Guid="{E6683D6F-A96C-4FFF-A087-4A2ADF1FE394}">
+                <Component Id="cmp42F0B9D7EC30BDFB4337683AA1626606" Guid="{028A743F-D587-4D1A-9391-629DD0D111F9}">
                     <File Id="fil3D3CE88BF9B56AB298CB1482285F4E63" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0145.gef" />
                 </Component>
-                <Component Id="cmp63BAC0E7BB910774994BADF44BD139BC" Guid="{744BBC9A-BDCE-4425-A55A-F1EF28D780D9}">
+                <Component Id="cmp63BAC0E7BB910774994BADF44BD139BC" Guid="{8FF15976-2379-4260-A940-AD0B6BEA4132}">
                     <File Id="fil4D33493269226A52062F33E37CEC7D0A" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0231.gef" />
                 </Component>
-                <Component Id="cmpEB3E326624418F0C0E87588F61D543EB" Guid="{3B3C6A7A-363D-41C5-80E4-32491CAAF1C6}">
+                <Component Id="cmpEB3E326624418F0C0E87588F61D543EB" Guid="{6ADEA957-8E9C-4655-8397-CF48F19BF7FF}">
                     <File Id="filE4FE21DCA36D69D110D114C1B8E60A54" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0263.gef" />
                 </Component>
-                <Component Id="cmpCD15C12671095A9DBC13205E0A43D438" Guid="{B179EC49-1BBE-4C35-B462-B6EAEBC3D45E}">
+                <Component Id="cmpCD15C12671095A9DBC13205E0A43D438" Guid="{D4CD5E01-0858-4D18-85D0-1FB282291FF0}">
                     <File Id="filBDC978A98AA758B8438B457C47C3F834" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0340.gef" />
                 </Component>
-                <Component Id="cmp368517CB9A5AFBA717F0A3125A3390DE" Guid="{F503BF5C-861E-4470-94B1-71241CA609FF}">
+                <Component Id="cmp368517CB9A5AFBA717F0A3125A3390DE" Guid="{8B99D112-DBAC-467B-9C51-B7A5B02E9326}">
                     <File Id="filB65966F8AFD0256CC5B5A6829F4FE28F" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0341.gef" />
                 </Component>
-                <Component Id="cmpC2EFF45C0838F30B31448961B0CBA3A0" Guid="{A57704BA-76BD-4932-9159-355282BFA2AD}">
+                <Component Id="cmpC2EFF45C0838F30B31448961B0CBA3A0" Guid="{92AF2A6E-637F-4074-9662-D4681F122E84}">
                     <File Id="fil2ABE57068197A5D82008A0C1454E45B8" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0342.gef" />
                 </Component>
-                <Component Id="cmpE64447370266C7BF14E6EFB4565F9633" Guid="{A00E02A5-3687-4DBB-858D-BF36DDC34ECE}">
+                <Component Id="cmpE64447370266C7BF14E6EFB4565F9633" Guid="{FF9E77AF-EE82-483F-AE17-E14733D9E592}">
                     <File Id="fil34285D65D986A62FABCFBA83F1125E00" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0345.gef" />
                 </Component>
-                <Component Id="cmp6503AE4D0F51EC95877A0EDD72CC5D86" Guid="{7EC78F2A-A688-49A2-965E-FBF0F7C847A1}">
+                <Component Id="cmp6503AE4D0F51EC95877A0EDD72CC5D86" Guid="{245E1374-DB81-4DFD-B9D7-C38ABDB92797}">
                     <File Id="fil8683D77BF6E0D56CD07929C9227BD3C9" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0346.gef" />
                 </Component>
-                <Component Id="cmp21A0CAA8DB07E0D2AA23002EC4997E01" Guid="{7B9F00E4-C555-43CD-8D10-99B7404F349B}">
+                <Component Id="cmp21A0CAA8DB07E0D2AA23002EC4997E01" Guid="{AC97C3CC-72EB-4BCD-9FE8-7C40581197C9}">
                     <File Id="filE0E62AEA023DD65FE9EE6AC8DD23032F" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0396.gef" />
                 </Component>
-                <Component Id="cmp72489334555357DBDE3B782C9C6576FA" Guid="{29E23976-1415-4E5A-B623-7B966E69EBD9}">
+                <Component Id="cmp72489334555357DBDE3B782C9C6576FA" Guid="{242ADAF2-619C-4C85-B54F-D49F2D17FD1E}">
                     <File Id="fil30F00484F4CF396C833C40C4B17FD847" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0417.gef" />
                 </Component>
-                <Component Id="cmpD90D57513902E961B939D684F43EF9EF" Guid="{D96E54E5-F1AD-4582-8D1D-345113B4A923}">
+                <Component Id="cmpD90D57513902E961B939D684F43EF9EF" Guid="{0BC35F61-BEDF-4EBF-B9A0-BD2E23977B06}">
                     <File Id="fil5C9B3D8E151C87F64A11D66008903EFF" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0423.gef" />
                 </Component>
-                <Component Id="cmpC727D045286069BFF1902BB599076EBE" Guid="{552E4E88-3945-4E30-890D-A39ED2948322}">
+                <Component Id="cmpC727D045286069BFF1902BB599076EBE" Guid="{6610FE78-16BC-445F-8FD9-F50BAC1A7D1B}">
                     <File Id="fil74711AD9761296E26D5F1FF10D1A9192" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0455.gef" />
                 </Component>
-                <Component Id="cmpE7D05F624E56AD9B6859D8BEDB652C24" Guid="{828E05F4-3B0A-4A6E-8203-0219BE0D7768}">
+                <Component Id="cmpE7D05F624E56AD9B6859D8BEDB652C24" Guid="{716E8529-747B-4942-A7D7-88792C14F6FB}">
                     <File Id="filBB1B72F2DC8D6864203948854179646E" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0459.gef" />
                 </Component>
-                <Component Id="cmp83C16A72312FE9D2A87357E7C3091C6F" Guid="{7F1AAF0C-61BE-48B2-A91D-C1243139B885}">
+                <Component Id="cmp83C16A72312FE9D2A87357E7C3091C6F" Guid="{8FED10F1-6B5B-4D0E-9976-44CFEC866F0D}">
                     <File Id="fil850AC8B44EBD822C33DE8C7484308998" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0599.gef" />
                 </Component>
-                <Component Id="cmp5272EA51F500CC424D2657781770DC72" Guid="{4CB018FD-1E54-4AF3-9519-D34FAFBE8E35}">
+                <Component Id="cmp5272EA51F500CC424D2657781770DC72" Guid="{534E838F-885D-48D0-9D7E-EA50667DA725}">
                     <File Id="filE237B930790A5B2BE42EBAE8A9B4BCC0" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0600.gef" />
                 </Component>
-                <Component Id="cmp3B8DBC0DE1DF7982A54F8C9026864787" Guid="{470F8EE5-435A-475A-AA9D-F332AE0C5FDB}">
+                <Component Id="cmp3B8DBC0DE1DF7982A54F8C9026864787" Guid="{659722DD-7B23-4EE4-B2A3-EF74E5C630C6}">
                     <File Id="fil745DBE95FCBD4659F4C79F9AA92D9D85" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B0601.gef" />
                 </Component>
-                <Component Id="cmpE1BFFD75B773E70F52786ADAC5AA5873" Guid="{5345308C-F3B2-48D5-BDC8-45945FFC0EEE}">
+                <Component Id="cmpE1BFFD75B773E70F52786ADAC5AA5873" Guid="{A1620472-7494-4532-98A5-284F7DB1E586}">
                     <File Id="fil5884497195C0D2FA388CCF3957D1694A" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1293.gef" />
                 </Component>
-                <Component Id="cmpF8D73989BCEEC8BE258B5C6326EB4DFD" Guid="{71AAD748-6D97-4DDF-8E17-57EEFF6F5B6E}">
+                <Component Id="cmpF8D73989BCEEC8BE258B5C6326EB4DFD" Guid="{9735B369-826B-4BC0-B364-1FD145B9A59B}">
                     <File Id="fil8EC4807D6BD1ED28C21707CFA943C21F" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1337.gef" />
                 </Component>
-                <Component Id="cmp52B0CD5A98562E94C96ACD5460984028" Guid="{6D837490-E9AB-476E-96D5-D4D9BF52FB46}">
+                <Component Id="cmp52B0CD5A98562E94C96ACD5460984028" Guid="{E83C7BF2-0FA8-45F5-A001-0964FE831AD2}">
                     <File Id="filB995A059A7E4C3ACB070541DA88BE719" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1338.gef" />
                 </Component>
-                <Component Id="cmp1882D09385DA26405FA4A1E15707922F" Guid="{2ABF6C71-F381-42D1-B0EB-0B5F3FF7DAB6}">
+                <Component Id="cmp1882D09385DA26405FA4A1E15707922F" Guid="{C396D63A-EC63-4601-9B3F-C79C4C6A9017}">
                     <File Id="fil8D3300F20A918882F2EBFC056C8D1991" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1400.gef" />
                 </Component>
-                <Component Id="cmpC6D5ED06A168949A3BFD82ACE630BA67" Guid="{C0D967FF-B2A8-4A0C-8D31-8122A9425514}">
+                <Component Id="cmpC6D5ED06A168949A3BFD82ACE630BA67" Guid="{99EC5738-B380-4826-A7EB-284B6CEDFDD8}">
                     <File Id="filFFE8A90DB3C902BA15781385681F42BC" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1401.gef" />
                 </Component>
-                <Component Id="cmpD9C5A854BCF2292E6007DBDF8EFADC83" Guid="{7E38516C-7270-48AF-9C77-35D049002EB1}">
+                <Component Id="cmpD9C5A854BCF2292E6007DBDF8EFADC83" Guid="{AA99AA79-450A-42CE-AD81-569A5E7C7BFC}">
                     <File Id="fil9F6D7B377B561599E5DA2473F61563C9" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1402.gef" />
                 </Component>
-                <Component Id="cmpBE8100C680AE7F5EC35F7031C55DB1DE" Guid="{0D9AF945-417A-4C82-80FC-F8F80707748B}">
+                <Component Id="cmpBE8100C680AE7F5EC35F7031C55DB1DE" Guid="{EA96C132-4258-4050-BCDB-040860E93CC3}">
                     <File Id="filABCEB9CD0555A7EAD9D7986ACF66EE6C" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1414.gef" />
                 </Component>
-                <Component Id="cmp713F2A480D1C41C3B994E5EC43E887A7" Guid="{E33FC621-A986-4BEF-9815-4628C3A9F3D7}">
+                <Component Id="cmp713F2A480D1C41C3B994E5EC43E887A7" Guid="{D0AC2347-B699-4BEB-9CF4-0C8FE8128B3A}">
                     <File Id="fil683A8866C27D1DD0EE6FA10F3893F6F9" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-Boring\B45B1544.gef" />
                 </Component>
             </Directory>
             <Directory Id="dir6B10FFD929FA3220803FCD8762DC6C40" Name="Grondonderzoek-CPT">
-                <Component Id="cmp36C73B8FDE726668FE7343FA013E02E4" Guid="{750ED0F9-08A7-4463-97B7-27DA12CDC130}">
+                <Component Id="cmp36C73B8FDE726668FE7343FA013E02E4" Guid="{C194C8BB-7708-4F8B-B00B-AD2C1CBC53F3}">
                     <File Id="filBB5583409A19B558B2565C4042C37042" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00363.gef" />
                 </Component>
-                <Component Id="cmp00EA1304A46B28DE5C5B76A4F93C0155" Guid="{0CEEC819-AE69-4200-884E-4B1AC401730E}">
+                <Component Id="cmp00EA1304A46B28DE5C5B76A4F93C0155" Guid="{B99BAAF9-E55F-4874-BEF9-C2D3FEAFCCDB}">
                     <File Id="filB24E1BCF4DF4D27AFB460E47186ECD41" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00369.gef" />
                 </Component>
-                <Component Id="cmpC0E86BB6CC308200AA745D5083627237" Guid="{112FBD41-1884-40B9-981E-B59772B1CD9B}">
+                <Component Id="cmpC0E86BB6CC308200AA745D5083627237" Guid="{93574D4F-ADBB-48CE-8021-8CA5A39D22D4}">
                     <File Id="fil9D9F16C5A96E8F2E228052319F970954" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00395.gef" />
                 </Component>
-                <Component Id="cmpF5A42D3B9E2439DDE1B905278F03ABE8" Guid="{52E592C1-17FB-496C-B3D8-90D9BC21D20A}">
+                <Component Id="cmpF5A42D3B9E2439DDE1B905278F03ABE8" Guid="{8105CC63-D42B-4A5B-B19A-9E9783084048}">
                     <File Id="fil4956735C17B6270C17512A624139BFFD" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00396.gef" />
                 </Component>
-                <Component Id="cmp762580AC48709404F369AB800023B107" Guid="{BD54050D-15FE-4B63-9A3A-E08D1C9D524D}">
+                <Component Id="cmp762580AC48709404F369AB800023B107" Guid="{37BF1FA6-6CF4-4BD0-9E1D-54F73154D815}">
                     <File Id="fil1B74B284F7E001BD81C514E9E6929C42" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00397.gef" />
                 </Component>
-                <Component Id="cmp1FD3044863AA4FE69D861F8918BB5C6B" Guid="{CF20FC39-2A88-4E45-B4AB-082A9AFE89BE}">
+                <Component Id="cmp1FD3044863AA4FE69D861F8918BB5C6B" Guid="{0011F190-A4D4-484C-BACB-CA9EE5CA2EAC}">
                     <File Id="fil729A119C6B5B72A61DE05A3176CA2161" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00398.gef" />
                 </Component>
-                <Component Id="cmp29130CB3022A8EC62A2A13A19DC38D49" Guid="{A01D3BF4-BB12-4B21-BD04-80A9F7D36A34}">
+                <Component Id="cmp29130CB3022A8EC62A2A13A19DC38D49" Guid="{4316CC22-1433-406B-A344-71B653CB3A62}">
                     <File Id="filA94D83448542194CA541C1E062BE691E" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00399.gef" />
                 </Component>
-                <Component Id="cmpC4C0392445D928B13F3280E3B35A9A0A" Guid="{C744AC0F-545B-4E30-8570-5591E42EA650}">
+                <Component Id="cmpC4C0392445D928B13F3280E3B35A9A0A" Guid="{9F053A75-173A-4534-83F3-F0AD4ED4FA6F}">
                     <File Id="filC7D121EE1BAF6CA822DEEC05DDA4BFC0" KeyPath="yes" Source="$(var.TutorialsFolder)\Grondonderzoek-CPT\S45B00400.gef" />
                 </Component>
             </Directory>
Index: release/DSoilModel/DSoilModel.exe
===================================================================
diff -u -r1096 -r1110
Binary files differ
Index: release/DSoilModel/Deltares.DSoilModel.Forms.dll
===================================================================
diff -u -r1096 -r1110
Binary files differ
Index: release/DSoilModel/System.Buffers.dll
===================================================================
diff -u
Binary files differ
Index: release/DSoilModel/System.Memory.dll
===================================================================
diff -u
Binary files differ