Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r251 -r301
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 251)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 301)
@@ -2,184 +2,190 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{A8D23178-369D-46A8-B307-9548E15E4B45}">
+            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{1EE36971-3BCE-443F-BB38-20F6170F0FBF}">
                 <File Id="fil4F2F84FF87942002C8948E87F05D7778" KeyPath="yes" Source="$(var.BinFolder)\borlndmm.dll" />
             </Component>
-            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{A7F011CA-3BD9-45A2-B04F-43716408D756}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{E07C7826-3BC7-4CD4-90DA-5661B08BF732}">
                 <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
             </Component>
-            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{401B32F7-5AAE-43FB-80E8-1EA0CEA732B8}">
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{CAB3EB53-269C-45E0-91E3-245FFA037F87}">
                 <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
             </Component>
-            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{D90060A2-911F-48B1-8D01-BCB05CE4AA34}">
+            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{71676498-B6A3-4689-BC57-7E468D2EF41B}">
                 <File Id="fil91D9F542E01E16BA0EF901B13142A8E1" KeyPath="yes" Source="$(var.BinFolder)\D-SoilModel.ico" />
             </Component>
-            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{FC8A0E02-F36F-4F55-8C29-2805AFBBC592}">
+            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{95F7652C-FEC8-4327-BD0C-684B0ABFBB3A}">
                 <File Id="fil1992AA5619D465310A20205E7D1B118B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DeltaModel.dll" />
             </Component>
-            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{CD3E0617-97D9-42A9-A1F9-C7F7308CE55E}">
+            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{DFA11346-3EB8-48D5-84AB-A39E2EB8F30A}">
                 <File Id="fil830BBEF28A818FF7484F117C8F4D9FD9" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Data.dll" />
             </Component>
-            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{2A2B2A37-2F08-4C2C-A9A7-6AA53AD76AFC}">
+            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{FDD2CB61-C306-4A3F-8249-620BFD18FBA3}">
                 <File Id="fil5F82F57C4DC68136D0AA96686BDC9EA1" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Forms.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{3B179EE0-5DDB-4BDC-8A7F-A15B25C6F3FE}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{66C2EE0B-F574-48C3-95A6-C0A8C4A8D588}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{660B8F5B-EDF3-483B-AC5F-F0ED5D0ACBC0}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{9E0C43AF-FE2C-4021-AE6B-1BDE01DD2818}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{5444F4F9-B5F6-44BC-95DE-57B08CD82E86}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{79D73A1A-6A23-4EB0-9481-67FD1B25FF1C}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{706B2994-BDB0-4263-B595-03B705771977}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{227CCE55-BC14-4CFC-8F41-4E7219AA13D8}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{B18EB34C-B283-4992-9B45-641641444BD1}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{5C77610E-F753-411E-BF96-48FE8E2A67D6}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{DCCFF147-FA3C-469A-9267-6244A94E19BB}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{5CDC2A72-EFE2-457C-9EB5-A17C32F320ED}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{EF65261E-0AA8-4437-8794-20AC206361C4}">
+            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{99056BE5-296A-425A-A3AC-45A6412581E7}">
                 <File Id="filD609F583F9120C092011AFCFCCC2CA2A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.WaternetCreator.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{5AD77A15-60B7-41ED-AA2B-C6F698B94294}">
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{610B7D07-12B7-4082-BACD-7CC51B9196B8}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{4BBCD013-A983-4664-9CAE-7D89AD635D52}">
+            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{65D72B66-AF69-450A-88F7-07CA1FE64E0B}">
                 <File Id="fil9A91397F5BD956AB1251C9635BA53B48" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.IO.Classic.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{3EB0250B-78A7-4641-87B2-1C625C897E0B}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{6B15CABB-538B-4B63-B51E-15C184735124}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{5E18B096-E594-4CAF-ABE0-5A755F599D38}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{8929C893-0114-4B46-8267-1159377AFBD0}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{1644EDD3-3C39-4954-8AB9-EA9CD86B0E4C}">
+            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{AC4C9601-9ECF-4AE3-BEBB-28966951358F}">
                 <File Id="fil8D6B9C2156EADA1AAD9A42D76A95873D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{5035E3DF-A824-47AD-B512-942F68FBFA05}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{CD389938-4CE9-4A9A-823E-6A32D16CF192}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{938F0EEF-0060-4A7C-A809-AEF2EB634D58}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{DCC45885-8E0F-4B76-AACA-7B82A49DC4B8}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{ACDA06DA-2092-485D-8B2A-9771B350814F}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{3656FFF6-D087-4A4F-8A43-240E9EBFB3A8}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{F1ADAA69-E12D-46EA-A6AB-A4ABAFC4CD1D}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{58DABDDE-0C66-44EB-966F-88D281FB2D60}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{0707C7E6-8315-42A6-B5B1-51E367F8C302}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{A6930000-EBEF-4E74-8CE6-8D3C71098A15}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{52C60550-9A4F-4ECD-8CFD-558FD74B9BC6}">
+            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{38CC5F28-E337-432E-889F-B113C36EC7D5}">
                 <File Id="filABE4682BE5464D6FBA20B56403F5A5DB" KeyPath="yes" Source="$(var.BinFolder)\DGSGEF.dll" />
             </Component>
-            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{AAC02283-876B-4E75-8B38-246E588F0EC0}">
+            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{6F5038C9-2B59-4E25-85C0-2A381C9F9D5D}">
                 <File Id="filBEA5E161DDC438A31EA77F1BF1916C48" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabSerializer.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{8C5079E8-5E2B-4C6C-BD68-E212176D7C99}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{1A296E98-DA20-47DF-9E12-DA7BC2900AAA}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{3621414F-1A97-48C1-A66E-C5334BB05401}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{77650B66-3D65-47AB-B014-899C1EF6E683}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{FBF139A4-0637-427B-9345-EEA4061F54AD}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{D91099B4-16AD-4D0F-841F-8D3011AF5BA6}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{59E1D557-1A88-4574-B198-37AE7B5A549C}">
+            <Component Id="cmpEEF21AC7D292805806520DA05D6BFF1F" Guid="{8B794627-E5B3-4EB0-A34D-5A3AF774EF03}">
                 <File Id="filC95772BD906C6022EF697886806A5DCD" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Rasters.GdalExtension.dll" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{B792B9AB-F027-4174-B94E-AC2769609B8B}">
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{20094089-64FF-426C-9E9E-D4C8F86E0300}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{E65FC54C-95EA-4C21-907D-320404646F31}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{517A2C22-21EF-4646-8702-0E0EDA14AB9A}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{C39EF556-29B5-479E-9256-BF191DA2C229}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{D4E91A76-FED2-4A99-854F-FCFB487D04EE}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{AC2050DC-3800-4E7A-AC24-DC1938D80ACB}">
+            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{8234406B-0E64-42DD-8A13-F87D3EFA6DEB}">
                 <File Id="fil4F36B405D36414D50469C1B930CD5F41" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Plugins.BruTileLayer.dll" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{E1AE80B0-3FA8-4A5B-918B-1172634D64AF}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{847D151B-CA1E-49D9-A7C7-76241BB9E9E7}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{448C5F4E-4EC2-4DEB-B724-DC65D801932F}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{6110549B-5B47-487D-9EBD-2CF9C7F67E74}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{C98110CA-E98F-49AB-802E-BEEAE5298396}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{C2C53995-1A79-4952-963E-CBA832227200}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{7844BB00-E895-42ED-BE05-1E3D6697015B}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{27B7485B-5F18-4EF0-8A07-2FBE4A66AA10}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{CBFFAAEA-1A5E-4B65-93FC-31EB79366464}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{9F0D9B16-45EB-487D-BE04-80613CC06FDD}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{8063B444-A500-4388-BF21-6A73CBA22BC2}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{F971AB79-26B2-483F-B3D4-181464C812E6}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{FA7E2563-84B7-46F7-A56C-C6D61CDC5BE0}">
+            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{00B5B243-A1C1-4C51-91BB-FF1FBCF0FBDF}">
                 <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe" />
             </Component>
-            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{BB906E83-C1D5-4493-B2DA-9D8D4F1465CA}">
+            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{AEE3A5D7-FA04-465C-B88A-9C38EE7A99D7}">
                 <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe.config" />
             </Component>
-            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{B675DD74-2214-4ECA-9E12-629E4A3FDEA8}">
+            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{168F6451-FECB-4958-8725-FD6AE5A379A9}">
                 <File Id="filA80D8C7C88FEA11402E41B4F0A597F13" KeyPath="yes" Source="$(var.BinFolder)\fbembed.dll" />
             </Component>
-            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{8D633BE0-033B-4EEE-829B-7079801327CF}">
+            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{3DAAE772-EDC0-410C-8F8F-CD8F7A7B9A39}">
                 <File Id="fil5AD82B318E8DD2E38581B3708F19B820" KeyPath="yes" Source="$(var.BinFolder)\firebird.msg" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{53C81E90-F038-4D95-A77A-F502D61960F9}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{71931E46-2644-4C69-B250-16C7ED7B86E4}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{BF0D20F9-B28C-4330-8E9A-2E07EE34BF55}">
+            <Component Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" Guid="{1BC7248B-7820-4D6C-B3FC-1A2E4C001383}">
                 <File Id="filDD73F351863FEF37BD9EA1EDA68D49A6" KeyPath="yes" Source="$(var.BinFolder)\gdal_csharp.dll" />
             </Component>
-            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{2827BBA1-A56A-436D-A47D-D9174A39495F}">
+            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{4B93BFBC-7EBA-4F2F-9231-879028D425EE}">
                 <File Id="filCA1B93B1E04F9E859706929F4AB3CFAE" KeyPath="yes" Source="$(var.BinFolder)\Gef2.dll" />
             </Component>
-            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{B9561CFE-2084-484D-BF30-74F09AB8E0DE}">
+            <Component Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" Guid="{56E9D2E0-6FB2-43FD-AE72-F82FA7AB4691}">
+                <File Id="filA57D83131128C8DF0624B91B5BCB404A" KeyPath="yes" Source="$(var.BinFolder)\GefBoreNL.dat" />
+            </Component>
+            <Component Id="cmp2CF79882141672A94EAF05B498ED9029" Guid="{CCA5CE2B-8D90-45DF-A96D-249D7545DD20}">
+                <File Id="fil7E670CDE16A03B5EF9F1D974C818A5FF" KeyPath="yes" Source="$(var.BinFolder)\GefBoreUK.dat" />
+            </Component>
+            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{02A9D591-8864-4D0B-8C2D-B36663CF76F7}">
                 <File Id="fil55A495EE2A8C0D1AC7E4625A9332454F" KeyPath="yes" Source="$(var.BinFolder)\ib_util.dll" />
             </Component>
-            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{48CE50D3-4794-4E0C-B507-0AA06A9B090D}">
+            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{F7E89791-6625-442D-BC6F-7CA475C5BB05}">
                 <File Id="fil8500BA131F16F61959822A95B67A257C" KeyPath="yes" Source="$(var.BinFolder)\icudt30.dll" />
             </Component>
-            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{91ADB72D-B291-4ECE-8018-22C7B382DA30}">
+            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{45BDF90B-A8B5-4014-B4DF-CF00053584A0}">
                 <File Id="fil19B3813E023D34D2E651155522C0E83A" KeyPath="yes" Source="$(var.BinFolder)\icuin30.dll" />
             </Component>
-            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{BAE36700-60C2-4DC2-B75F-4D9BFE7E5F24}">
+            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{C4B69E02-8729-41C6-9BBD-40B43015E379}">
                 <File Id="filEB52BFF83606A0185E8CC52B28A4FC43" KeyPath="yes" Source="$(var.BinFolder)\icuuc30.dll" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{891BBA5B-3C84-40CC-95AD-3F34763C80DB}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{281DAEF8-8D47-4C33-8C4C-447CBE4375FA}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{B7C4B30C-0992-45A1-ADB3-D8BBA3324621}">
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{F01069C0-278A-4D3E-B2C3-78D7ADF907CD}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{039A5327-4956-4271-8EC1-8AD369B80CDA}">
+            <Component Id="cmp5DFC015EA413F3AF6D3748FA2AA84A37" Guid="{65079FCA-A9E4-4527-BB11-3E5DB2AFD72C}">
                 <File Id="fil58FA97A82C74E7C028484557C2E9031F" KeyPath="yes" Source="$(var.BinFolder)\ogr_csharp.dll" />
             </Component>
-            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{62EB8D96-D91D-4724-9063-EACD184E5A37}">
+            <Component Id="cmp64B07C2C6F6CDE11E4C7735791A3C045" Guid="{6619E146-4EA7-4496-81CF-985A153FF888}">
                 <File Id="fil85F845F2C104287D16405A9C5D4DD89C" KeyPath="yes" Source="$(var.BinFolder)\osr_csharp.dll" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{DDE846D1-5876-43F5-AF5D-138CAF67317E}">
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{39339232-0B55-45CA-B3E5-FB6CBE2F5845}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
-            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{816ECE02-6DBB-4AE6-A2FD-00F7BCF39150}">
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{5E4DF581-C949-47A8-A99C-6B06C677C6A6}">
                 <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
             </Component>
             <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl">
-                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{0BF4C9BC-DFEF-418C-BC62-9E3C747E86DF}">
+                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{C2CE1973-A06F-4D80-8BFE-1C2F5B5D03FA}">
                     <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="{5A2C4EC0-8503-4399-83D5-996918176E3A}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{CCAB5895-C33D-4A66-B40F-DDA9A98588FB}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>
@@ -234,6 +240,8 @@
             <ComponentRef Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" />
             <ComponentRef Id="cmp7C95A690FCCE09BF7BBAAAF7899510D8" />
             <ComponentRef Id="cmp41854AF6C9F928B540998D5517BB62C6" />
+            <ComponentRef Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" />
+            <ComponentRef Id="cmp2CF79882141672A94EAF05B498ED9029" />
             <ComponentRef Id="cmp8AA6CD076A02D9492C231BDF24A98A54" />
             <ComponentRef Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" />
             <ComponentRef Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" />