Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r7 -r26
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 7)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs	(.../BinFolder.wxs)	(revision 26)
@@ -2,166 +2,181 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{3BD401AA-265D-4D1F-ABE4-C35F08FC3048}">
+            <Component Id="cmpF5517DEC00BA1D51988E63365079AC2F" Guid="{93D84029-54D4-461C-86ED-3E480126E306}">
                 <File Id="fil4F2F84FF87942002C8948E87F05D7778" KeyPath="yes" Source="$(var.BinFolder)\borlndmm.dll" />
             </Component>
-            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{671BDBAD-55ED-46A1-AC2E-755B9076A53F}">
+            <Component Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" Guid="{4F41B120-E451-4DDC-89A5-CFD1C6783BA7}">
+                <File Id="filF6F8D425085FF74F926B9D6CC8C495EA" KeyPath="yes" Source="$(var.BinFolder)\BruTile.Desktop.dll" />
+            </Component>
+            <Component Id="cmp54A3E473E12DBBE26AFD115B65907661" Guid="{C17CE615-1584-4E6A-8C9E-B14550D321A3}">
+                <File Id="filA1A79E623D117F91354458DC3D241736" KeyPath="yes" Source="$(var.BinFolder)\BruTile.dll" />
+            </Component>
+            <Component Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" Guid="{AAAF6EE3-9E08-4134-BE8D-3CFB9330CE34}">
                 <File Id="fil91D9F542E01E16BA0EF901B13142A8E1" KeyPath="yes" Source="$(var.BinFolder)\D-SoilModel.ico" />
             </Component>
-            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{2A73BA65-E942-46BC-92DA-43CE6947AEC0}">
+            <Component Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" Guid="{E20984F5-7F0F-4519-888E-FC927D3FF0A1}">
                 <File Id="fil10BD73AB0BB296E6DFEAA7D72CC26003" KeyPath="yes" Source="$(var.BinFolder)\Deltares.AssessmentMechanism.dll" />
             </Component>
-            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{A142F82C-E423-444C-911D-DB8AA01C9654}">
+            <Component Id="cmp24791F26CC4DDB494AC6266585560906" Guid="{099522CB-DA81-42C3-B645-DD6854098437}">
                 <File Id="fil1992AA5619D465310A20205E7D1B118B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DeltaModel.dll" />
             </Component>
-            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{0A455B26-FFF1-4830-899D-1B1EDAF5C4EA}">
+            <Component Id="cmp5FAC71E9DDCD0EFC083F6780B4D7DC89" Guid="{2A31AB10-11B3-4D09-9109-2D4E9E93AF64}">
                 <File Id="fil830BBEF28A818FF7484F117C8F4D9FD9" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Data.dll" />
             </Component>
-            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{DB1881B2-CA7B-4DBF-8CED-FA61D9A4D3F9}">
+            <Component Id="cmpD207EBEAA696BC90C7F71BB2598428EB" Guid="{835A363F-5216-4B41-9B6D-DBF4E64119B3}">
                 <File Id="fil5F82F57C4DC68136D0AA96686BDC9EA1" KeyPath="yes" Source="$(var.BinFolder)\Deltares.DSoilModel.Forms.dll" />
             </Component>
-            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{DDC17409-9312-427A-B91B-436EA52D077D}">
+            <Component Id="cmpF7D126D1F8D47CDA4F7FA381EBBCAB26" Guid="{0C56AE30-DB97-46FA-8BB6-AEBCFD19B601}">
                 <File Id="filF58BF540C920CCF88B65E501DCFB6B4C" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geographic.dll" />
             </Component>
-            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{7AD3B94F-509A-4330-85DD-5331F726B5A4}">
+            <Component Id="cmp8F02543F5A177E07008D465661BE6810" Guid="{E88F4D0A-B99E-4E7E-A7CC-5B10361A1801}">
                 <File Id="filA7DD37798AA8266B91004255DD8B8A5B" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.dll" />
             </Component>
-            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{92A5A76C-5520-4CA4-A787-F7FAE1ECFA42}">
+            <Component Id="cmp846E665755E74A31C4115F7E2CE4EB8C" Guid="{B41EE18D-101A-42B6-B9D2-A14782357668}">
                 <File Id="filA863E0BA8ED734C9127D6BCD52E05F67" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geometry.Forms.dll" />
             </Component>
-            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{1B038BF8-711D-4FE4-9AEF-151CE119EC6D}">
+            <Component Id="cmp47320FABBCEC7CB30E200DC70C25B49D" Guid="{E6C8C78D-9827-462C-B99B-3CECC5E324CB}">
                 <File Id="filD9CE646D943931633DFA5796BDB4CAA6" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.dll" />
             </Component>
-            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{6EA6C8A5-1900-48DD-93ED-3D967876BC53}">
+            <Component Id="cmpDEDC9982F4F16DB2666CA200F6905509" Guid="{D5FA5E72-2834-48C2-BF33-2463B64AD4D4}">
                 <File Id="fil752D455EF949ECF337DDA3E26765A9B0" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.Forms.dll" />
             </Component>
-            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{854B856C-8D98-4296-B42C-BA07D8BD5D5D}">
+            <Component Id="cmp583C9725DA10A33056818F01A7058161" Guid="{D58E2956-A7C7-484D-8D16-99F5C1E5C10C}">
                 <File Id="fil73E1BEB42310ADB6CE87A583123DECD5" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.IO.dll" />
             </Component>
-            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{6DED3915-80E2-41F3-AC9D-6BC3EE08D66C}">
+            <Component Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" Guid="{7A69A4BB-C096-4A83-BDE7-C2D2763A9724}">
+                <File Id="filD609F583F9120C092011AFCFCCC2CA2A" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Geotechnics.WaternetCreator.dll" />
+            </Component>
+            <Component Id="cmp142E814CD559E72BE075552B024E95E1" Guid="{35B1D37B-AAE6-49CE-B9D3-81A2BD15BD65}">
                 <File Id="fil2465D685D3FEC60224C7831BBFA4FB94" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Mathematics.dll" />
             </Component>
-            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{A3B7F62D-B08A-4E57-84AB-EEFD8C3C2C97}">
+            <Component Id="cmpAB6353B86E37B66F258CB44FD793D6EC" Guid="{83E5BE79-36E3-4C1C-81B4-33F0815E6302}">
                 <File Id="fil9A91397F5BD956AB1251C9635BA53B48" KeyPath="yes" Source="$(var.BinFolder)\Deltares.MStab.IO.Classic.dll" />
             </Component>
-            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{6B78A63E-2EC4-4FD5-80E9-DF24CF73098C}">
+            <Component Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" Guid="{E8117A79-AEBB-4AAB-8D80-F508322146CB}">
                 <File Id="filE5592BB6738BBDCE69B114AF5CF76D87" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Probabilistic.dll" />
             </Component>
-            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{B1989CA6-0EC5-432E-9679-B7B2CC4C6B3C}">
+            <Component Id="cmpDCA2EFC71AF34B9C6D0FB81D8CBED404" Guid="{529F4F24-779A-4147-87DA-A4269D686CF2}">
                 <File Id="fil526AA9AE0BE0AC023B0F474FB7A7829F" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Soilbase.dll" />
             </Component>
-            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{4D471196-96C6-4A2B-BC87-F18ADB6E8102}">
+            <Component Id="cmp448082357768C8DDE6FCBCBB52E3BA2A" Guid="{9E2FA74C-15AB-4AA8-B8A1-7AAA8508DC1E}">
                 <File Id="fil8D6B9C2156EADA1AAD9A42D76A95873D" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Stability.dll" />
             </Component>
-            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{95C2132C-23C0-4728-B859-DAF384B8DDF9}">
+            <Component Id="cmp8EED61AE915F0CCD8C1851BE522A1BCD" Guid="{454257B9-3EE5-4D3A-B493-2AE81F575B8F}">
                 <File Id="filACB76FF5040E1CE5916354F73FFD79FD" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.dll" />
             </Component>
-            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{DBA16D31-F90E-4ECF-A57D-E661839D16B6}">
+            <Component Id="cmp60CFB06A4EB4DDC8003384C5D3623CB6" Guid="{717141CA-5F12-4AEB-87AF-65150369B5F5}">
                 <File Id="filA03E1477F2EC4D82F67AF45FE6F36FCB" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.DExpress.dll" />
             </Component>
-            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{463A5B1D-0C7A-4105-865C-C552C8065CBF}">
+            <Component Id="cmpED9BC5761F5C1E9EB3A335E708EF36E0" Guid="{E99AFBF8-3F31-45C7-B28A-6487FCF0CF4E}">
                 <File Id="filBCFD0AFC655FAF059DAB71A78DD340FA" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.dll" />
             </Component>
-            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{B0E3F603-FA07-4260-9BFE-FB4DB890918D}">
+            <Component Id="cmp0349193C60319F06835040E18EF2B3EB" Guid="{A590D08F-6B18-4326-A565-B0243D50B153}">
                 <File Id="fil90A24F951D0CA4F0849D4F1132902AF2" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Forms.Maps.dll" />
             </Component>
-            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{298AF164-ED17-489D-AECC-1D40368752E1}">
+            <Component Id="cmp9F65D24DCEA734BB58B33A078C6B1EF4" Guid="{55292186-4D8E-4052-98DF-C964BE3F5DE4}">
                 <File Id="fil6E31E187D604DCC574208AC9949F8D98" KeyPath="yes" Source="$(var.BinFolder)\Deltares.Standard.Maps.dll" />
             </Component>
-            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{50D68DAF-9CD4-4E3A-9896-15FEE4B95947}">
+            <Component Id="cmpA2BC53C18CFB29172D3425E319E645B8" Guid="{BA04A18F-266C-472F-A7EC-7D2C698AAA46}">
                 <File Id="filABE4682BE5464D6FBA20B56403F5A5DB" KeyPath="yes" Source="$(var.BinFolder)\DGSGEF.dll" />
             </Component>
-            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{346A1199-B6A1-4F52-9289-16AFE1A7F2C6}">
+            <Component Id="cmpC2A65296DB08B0B525C2AC82D1F806C7" Guid="{85AF8C35-C7FE-4648-A6CE-26562B2A375A}">
                 <File Id="filBEA5E161DDC438A31EA77F1BF1916C48" KeyPath="yes" Source="$(var.BinFolder)\DGSMStabSerializer.dll" />
             </Component>
-            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{56828714-FED0-47B2-B4A2-BE82A01C0415}">
+            <Component Id="cmp19841C10C857DFCDC8107E742C3E9AB5" Guid="{51CAA9D0-FCA3-4173-B418-0A1E5B67ADEF}">
                 <File Id="fil9520B1B9A5AFC3FDB971A10F03EC8CB8" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Controls.dll" />
             </Component>
-            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{5FD2EE9D-DE8A-4E71-ABDE-995C70DD325C}">
+            <Component Id="cmpAED9076B02DA9ED90E368F5DB3D1C276" Guid="{DDD149BE-3FB3-47D2-B0E5-D49B59EFC36E}">
                 <File Id="filD0C467F1DF28BF727E39F7C10430F474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.dll" />
             </Component>
-            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{AE08544B-7B10-41AA-B1A6-44C90A076D3A}">
+            <Component Id="cmp24EBCB901CDC2155D82D2B4B1261F570" Guid="{D243F636-19B1-432E-AB04-7E8B3EF51576}">
                 <File Id="fil2F9A79508558F53BD2343DC5C118A4EB" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Data.Forms.dll" />
             </Component>
-            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{A6C6289F-89CE-4193-BC6E-281D8FDD0952}">
+            <Component Id="cmpC5950FF1FCD98B330EE3E2B6612C6FE3" Guid="{3A6403BF-AF8C-4256-9E55-BDE914E1FA67}">
                 <File Id="filC72E3D7BC7E19BAF1B3D8B6EAD78881A" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Extensions.dll" />
             </Component>
-            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{19B428D0-248E-47E8-B654-CE1670D05B85}">
+            <Component Id="cmpB2DD75DCC3588842729CB37CD7FDB677" Guid="{E9EF2BE6-CF93-46C3-B669-475C6BE27BD2}">
                 <File Id="filB3E0D08FBE5254C0F088A8C621CCD4E5" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Modeling.Forms.dll" />
             </Component>
-            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{9FA52B04-6CC7-4FBF-A4A2-BB4943C1A9A6}">
+            <Component Id="cmpECBE45B42E727E67EB6AE92EA8A0EFBA" Guid="{E13E68BF-3ECF-493B-AADF-3500EC17192F}">
                 <File Id="filDB65EB11731F9F6C9F2577DA7EB72B02" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Mono.dll" />
             </Component>
-            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{A153ECDA-37C9-4E5A-AFBB-BBFAB284AA30}">
+            <Component Id="cmpC8D4C98D08906115B795D9C070B38770" Guid="{9ACADFFB-6333-4F8F-93BD-04A41D0A444B}">
                 <File Id="fil4F36B405D36414D50469C1B930CD5F41" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Plugins.BruTileLayer.dll" />
             </Component>
-            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{C5D2007B-A556-4DAA-9A04-524A148F2DEA}">
+            <Component Id="cmpBD5AD0AFFF05F6C210A3038F09E2C899" Guid="{D1080B24-2DC1-486E-ABF5-19C0CA883B02}">
                 <File Id="fil633A635CD1999CA278E4CAF66737F1BE" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.dll" />
             </Component>
-            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{74BA30A0-F70F-4F4A-B3EF-3F393B8447E8}">
+            <Component Id="cmpBCC4CB702609F993F4806324CC67AE8F" Guid="{0424D1E8-552A-4B78-AC9E-3647876CDD61}">
                 <File Id="fil77520A9338FE58511FFA1BE8685DF474" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Projections.Forms.dll" />
             </Component>
-            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{0FFFFFCA-27C4-40F3-88F8-7E909E2BDC1D}">
+            <Component Id="cmp1C5912C0EE2DD6B78439E8F04D7C01B5" Guid="{1D500CB3-6A94-4732-9EC9-7BD7EBC78AC1}">
                 <File Id="fil05F11F140B2B59A85D38669DA41E8816" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Serialization.dll" />
             </Component>
-            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{5FFE36A6-7B62-40D4-B5FB-1AC8EB5722BF}">
+            <Component Id="cmp7C7E095C40888A8558099167192DFB37" Guid="{F3EDED46-38C5-457F-AE2F-3D31922885DE}">
                 <File Id="fil3271680B2C8E226D1D2CDD194F77FFA1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.dll" />
             </Component>
-            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{5698EA5A-3672-4D2F-943D-AAA7CD3E12BD}">
+            <Component Id="cmp972DE5A7C553DCDD39145EDA06C78BC4" Guid="{9E8FA0F3-FEFC-4E8D-9655-9D33B9254107}">
                 <File Id="fil82F207E2AC29239FD761F230254FCFB1" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Symbology.Forms.dll" />
             </Component>
-            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{1BB37E70-4270-4B95-9BF1-0B08A8A6B69E}">
+            <Component Id="cmpB251EF50D6C0F805C68F87E4CF088230" Guid="{6E072CB1-2A2C-43ED-914A-888D9ECD240B}">
                 <File Id="filEA078EED09626E9475CF9C0FE6B9581D" KeyPath="yes" Source="$(var.BinFolder)\DotSpatial.Topology.dll" />
             </Component>
-            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{40D26441-F4CF-4740-8C96-57C84B84613A}">
+            <Component Id="cmpFA0A6D5EE9E89B67CAE6F9102D5C06EB" Guid="{34136B5D-1866-461C-8496-7B84CC52D9C5}">
                 <File Id="fil8DA35DDFF0E2AC0DB7FA57B1646391F7" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe" />
             </Component>
-            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{1F1BC3FD-E0AF-4BC4-AB43-BED9F825518B}">
+            <Component Id="cmpBA06C710F59D50E61B11AB47AEAB839B" Guid="{8B8C7E38-F57C-40F8-8C68-88294443AAF7}">
                 <File Id="filCFC4E6C5AFB193A5D309B16CDF1EE3DE" KeyPath="yes" Source="$(var.BinFolder)\DSoilModel.exe.config" />
             </Component>
-            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{78182B4F-4990-483A-BAD2-0B5A2BFA6BDE}">
+            <Component Id="cmp80712E9CCA92E22C396220732AED9BA3" Guid="{5205C48A-25ED-49EF-BC7E-574A64C1F427}">
                 <File Id="filA80D8C7C88FEA11402E41B4F0A597F13" KeyPath="yes" Source="$(var.BinFolder)\fbembed.dll" />
             </Component>
-            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{E4E3B9FD-02D3-44F0-8231-30DCDC53BC07}">
+            <Component Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" Guid="{12684144-4C83-4885-A443-F21C71B0E869}">
                 <File Id="fil5AD82B318E8DD2E38581B3708F19B820" KeyPath="yes" Source="$(var.BinFolder)\firebird.msg" />
             </Component>
-            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{DDB3FC85-21DA-4167-A389-D67124CF71D6}">
+            <Component Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" Guid="{C1AFD442-DCD6-4689-A5BE-CBBB09049E01}">
                 <File Id="fil234C916FCD1D852EC8438002B8BAEDEA" KeyPath="yes" Source="$(var.BinFolder)\FirebirdSql.Data.FirebirdClient.dll" />
             </Component>
-            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{9495C304-6A21-41FB-B989-1DD1C90D125F}">
+            <Component Id="cmp41854AF6C9F928B540998D5517BB62C6" Guid="{CF6D01DD-C467-465F-A1E1-C35778DE7281}">
                 <File Id="filCA1B93B1E04F9E859706929F4AB3CFAE" KeyPath="yes" Source="$(var.BinFolder)\Gef2.dll" />
             </Component>
-            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{16CECBBE-E942-437D-BFE7-65EF0D840418}">
+            <Component Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" Guid="{F15723BE-6787-4929-992D-0A0755F8F967}">
+                <File Id="filA57D83131128C8DF0624B91B5BCB404A" KeyPath="yes" Source="$(var.BinFolder)\GefBoreNL.dat" />
+            </Component>
+            <Component Id="cmp2CF79882141672A94EAF05B498ED9029" Guid="{CAF31FE1-ABBF-48EC-9A84-507DF0A5FD31}">
+                <File Id="fil7E670CDE16A03B5EF9F1D974C818A5FF" KeyPath="yes" Source="$(var.BinFolder)\GefBoreUK.dat" />
+            </Component>
+            <Component Id="cmp8AA6CD076A02D9492C231BDF24A98A54" Guid="{0F45BA91-D586-40DB-B2C9-D56F51C45BD6}">
                 <File Id="fil55A495EE2A8C0D1AC7E4625A9332454F" KeyPath="yes" Source="$(var.BinFolder)\ib_util.dll" />
             </Component>
-            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{A4DC4F4D-1AFF-47CA-9A74-370909BAF637}">
+            <Component Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" Guid="{57C6F0AA-1883-4AD1-9F4A-81ADB3512A7E}">
                 <File Id="fil8500BA131F16F61959822A95B67A257C" KeyPath="yes" Source="$(var.BinFolder)\icudt30.dll" />
             </Component>
-            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{35028D79-6463-4334-8853-70A5D0745005}">
+            <Component Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" Guid="{B64444FE-EF6A-49A7-ADE8-9DFE1F7A5CF3}">
                 <File Id="fil19B3813E023D34D2E651155522C0E83A" KeyPath="yes" Source="$(var.BinFolder)\icuin30.dll" />
             </Component>
-            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{88D68012-CC8F-4FD4-A248-8FE9348B2C1F}">
+            <Component Id="cmp30C1802BC382DE5E0C8F33B33B275D88" Guid="{2141E4F7-6E54-4F28-B36D-5A6BDC240831}">
                 <File Id="filEB52BFF83606A0185E8CC52B28A4FC43" KeyPath="yes" Source="$(var.BinFolder)\icuuc30.dll" />
             </Component>
-            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{C2E09DFD-7A47-4935-8E52-BD08AFD1FA7D}">
+            <Component Id="cmp9DD47D0347AE254D923E22047764B092" Guid="{97D63CAD-86CD-4E73-B80B-29430D75B679}">
                 <File Id="fil14B37B6F117880072CC8B3DD806A47D6" KeyPath="yes" Source="$(var.BinFolder)\LumenWorks.Framework.IO.dll" />
             </Component>
-            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{F7C47086-D740-440B-8ED0-F7B2C5E06719}">
+            <Component Id="cmp3ED5A0A4D782A8BF371C8403342D615B" Guid="{8C7306D2-B0C0-45C0-B3E8-A5AAD2A48834}">
                 <File Id="fil7074B34CCDD7ABC6B6FDB40762FB4CF9" KeyPath="yes" Source="$(var.BinFolder)\MathNet.Numerics.dll" />
             </Component>
-            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{64BE59A4-FCEE-4E2E-8C4A-061D843923B5}">
+            <Component Id="cmp20B8D4726881994439470FFC8B08FD93" Guid="{7DFEE7D4-8C6A-4DA2-B8A7-989F4AF885CC}">
                 <File Id="fil5A492671E7E6729B61DA592709A368FE" KeyPath="yes" Source="$(var.BinFolder)\SmartThreadPool.dll" />
             </Component>
-            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{42AF405D-DBA0-4AEE-BB2B-75E82BA461F6}">
+            <Component Id="cmp6B7CE49F5F3A518047B74FB6AC2251C5" Guid="{05394B11-D9E0-461F-BB8A-574CD01107B1}">
                 <File Id="fil86030949C08D40073D1F77D572C14B0D" KeyPath="yes" Source="$(var.BinFolder)\System.Data.SQLite.dll" />
             </Component>
             <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl">
-                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{0FFC6508-4BD3-443B-935D-69A53308660E}">
+                <Component Id="cmp47A7C52FB8D1722DBE91C8F28CF2763B" Guid="{6D2D7DD4-29DC-4D87-812B-E6690737CF08}">
                     <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="{1338ECD6-B32C-43D6-A0D0-F4AC4357D5B5}">
+                <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Guid="{18C397C1-A684-4CBD-B478-0BC1F58FE1E3}">
                     <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source="$(var.BinFolder)\x86\SQLite.Interop.dll" />
                 </Component>
             </Directory>
@@ -170,6 +185,8 @@
     <Fragment>
         <ComponentGroup Id="ProductComponents">
             <ComponentRef Id="cmpF5517DEC00BA1D51988E63365079AC2F" />
+            <ComponentRef Id="cmp6BFD207393B9C8D21EABD98B94E7D57D" />
+            <ComponentRef Id="cmp54A3E473E12DBBE26AFD115B65907661" />
             <ComponentRef Id="cmp8F052C051E4BBF59E0AA0C252C9108DC" />
             <ComponentRef Id="cmpF1F0E1A3827E3B8D5282E869FDD6A2BD" />
             <ComponentRef Id="cmp24791F26CC4DDB494AC6266585560906" />
@@ -181,6 +198,7 @@
             <ComponentRef Id="cmp47320FABBCEC7CB30E200DC70C25B49D" />
             <ComponentRef Id="cmpDEDC9982F4F16DB2666CA200F6905509" />
             <ComponentRef Id="cmp583C9725DA10A33056818F01A7058161" />
+            <ComponentRef Id="cmpAF41521B6E3BD86EE1BB9D8B21D380DC" />
             <ComponentRef Id="cmp142E814CD559E72BE075552B024E95E1" />
             <ComponentRef Id="cmpAB6353B86E37B66F258CB44FD793D6EC" />
             <ComponentRef Id="cmp6B6C2AD32DAA8A14FB095AD39DE3910A" />
@@ -212,6 +230,8 @@
             <ComponentRef Id="cmp4A737AB30B1DB2BFAAAFE1CB8EA02176" />
             <ComponentRef Id="cmp7E55C2676F6B4969AF91A68F8D16EC88" />
             <ComponentRef Id="cmp41854AF6C9F928B540998D5517BB62C6" />
+            <ComponentRef Id="cmp8389AAA3AEDCAF264423E3BBA89143D4" />
+            <ComponentRef Id="cmp2CF79882141672A94EAF05B498ED9029" />
             <ComponentRef Id="cmp8AA6CD076A02D9492C231BDF24A98A54" />
             <ComponentRef Id="cmp18FB4504610326CA8D47C9CB9DD9EBA3" />
             <ComponentRef Id="cmp40DED8CE4AB94D9AA322903FEE5BFE2E" />