Index: Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj
===================================================================
diff -u -rb8f28b43208d1dac612347e750f26cd29ffd50e3 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj	(.../Core.Components.BruTile.Data.csproj)	(revision b8f28b43208d1dac612347e750f26cd29ffd50e3)
+++ Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj	(.../Core.Components.BruTile.Data.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj
===================================================================
diff -u -r42ca5fa567ea7172e3ecd027038501909d4dbbe1 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision 42ca5fa567ea7172e3ecd027038501909d4dbbe1)
+++ Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -29,7 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="SmartThreadPool.dll">
       <Version>2.2.4</Version>
Index: Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj
===================================================================
diff -u -r42ca5fa567ea7172e3ecd027038501909d4dbbe1 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision 42ca5fa567ea7172e3ecd027038501909d4dbbe1)
+++ Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -38,9 +38,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BruTile" Version="0.20.0" />
+    <PackageReference Include="BruTile" Version="2.1.2" />
     <PackageReference Include="BruTile.Desktop">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r42ca5fa567ea7172e3ecd027038501909d4dbbe1 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 42ca5fa567ea7172e3ecd027038501909d4dbbe1)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -72,7 +72,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj
===================================================================
diff -u -r5a01931c71be1b1f5fb2f001a92cf392356648de -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision 5a01931c71be1b1f5fb2f001a92cf392356648de)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj
===================================================================
diff -u -r54113c55ccaef90896863af6ef09624e41c0646e -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj	(.../Core.Components.BruTile.IO.Test.csproj)	(revision 54113c55ccaef90896863af6ef09624e41c0646e)
+++ Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj	(.../Core.Components.BruTile.IO.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj
===================================================================
diff -u -r772b84d8702289bae514cf0be67736ea219b22b6 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj	(.../Core.Components.BruTile.Test.csproj)	(revision 772b84d8702289bae514cf0be67736ea219b22b6)
+++ Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj	(.../Core.Components.BruTile.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile.Desktop">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj
===================================================================
diff -u -r16bc3df2bffef7abd3ffaed4276c70ae0f9db71c -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj	(.../Core.Components.BruTile.TestUtil.Test.csproj)	(revision 16bc3df2bffef7abd3ffaed4276c70ae0f9db71c)
+++ Core/Components/test/Core.Components.BruTile.TestUtil.Test/Core.Components.BruTile.TestUtil.Test.csproj	(.../Core.Components.BruTile.TestUtil.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -11,16 +11,16 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
-    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
-    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj" />
+    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj" />
+    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj
===================================================================
diff -u -rc673059c4f36262a5da769de272d4c2e43325772 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision c673059c4f36262a5da769de272d4c2e43325772)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -27,13 +27,13 @@
     <None Include="Resources\stubTile.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj
===================================================================
diff -u -rbfb956191b2e88be47fa35fa20b2fcee13d91846 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision bfb956191b2e88be47fa35fa20b2fcee13d91846)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -34,22 +34,22 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile.IO\Core.Components.BruTile.IO.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
-    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
-    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.BruTile.IO\Core.Components.BruTile.IO.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.BruTile\Core.Components.BruTile.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj" />
+    <ProjectReference Include="..\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj" />
+    <ProjectReference Include="..\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -rc1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision c1e511b5e815ddcc0ff7b6f510e8ab7cd5c29531)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -98,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -r3c68d9701768ce98d61169df243f791d22050fee -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 3c68d9701768ce98d61169df243f791d22050fee)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -28,7 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.Gis.TestUtil/WmtsMapDataTestHelper.cs
===================================================================
diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Core/Components/test/Core.Components.Gis.TestUtil/WmtsMapDataTestHelper.cs	(.../WmtsMapDataTestHelper.cs)	(revision df4b8185584046d57926f8be9b6e8fc86cda1711)
+++ Core/Components/test/Core.Components.Gis.TestUtil/WmtsMapDataTestHelper.cs	(.../WmtsMapDataTestHelper.cs)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -35,7 +35,7 @@
         public static WmtsMapData CreateDefaultPdokMapData()
         {
             return new WmtsMapData("PDOK achtergrondkaart",
-                                   "https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities",
+                                   "http://geodata.nationaalgeoregister.nl/tiles/service/wmts?request=GetCapabilities&service=WMTS ",
                                    "brtachtergrondkaart(EPSG:28992)",
                                    "image/png");
         }
Index: Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs
===================================================================
diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs	(.../MapDataView.cs)	(revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b)
+++ Demo/Riskeer/src/Demo.Riskeer/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Windows.Forms;
+using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 
@@ -36,6 +37,11 @@
         public MapDataView()
         {
             InitializeComponent();
+
+            ((MapControl)Map).BackgroundMapData = new WmtsMapData("Test",
+                                                                  "http://geodata.nationaalgeoregister.nl/tiles/service/wmts?request=GetCapabilities&service=WMTS",
+                                                                  "brtachtergrondkaart(EPSG:28992)",
+                                                                  "image/png");
         }
 
         public object Data
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj
===================================================================
diff -u -rade3ebb721cc2123f866ed78fe37e496dfef475b -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision ade3ebb721cc2123f866ed78fe37e496dfef475b)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -16,50 +16,50 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.BruTile\Core.Components.BruTile.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
-    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\ClosingStructures\src\Riskeer.ClosingStructures.Data\Riskeer.ClosingStructures.Data.csproj"/>
-    <ProjectReference Include="..\..\..\ClosingStructures\test\Riskeer.ClosingStructures.Data.TestUtil\Riskeer.ClosingStructures.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\DuneErosion\src\Riskeer.DuneErosion.Data\Riskeer.DuneErosion.Data.csproj"/>
-    <ProjectReference Include="..\..\..\GrassCoverErosionInwards\test\Riskeer.GrassCoverErosionInwards.Data.TestUtil\Riskeer.GrassCoverErosionInwards.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\HeightStructures\test\Riskeer.HeightStructures.Data.TestUtil\Riskeer.HeightStructures.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj"/>
-    <ProjectReference Include="..\..\..\MacroStabilityInwards\test\Riskeer.MacroStabilityInwards.Data.TestUtil\Riskeer.MacroStabilityInwards.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Piping\test\Riskeer.Piping.Data.TestUtil\Riskeer.Piping.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj"/>
-    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\GrassCoverErosionInwards\src\Riskeer.GrassCoverErosionInwards.Data\Riskeer.GrassCoverErosionInwards.Data.csproj"/>
-    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Riskeer.GrassCoverErosionOutwards.Data\Riskeer.GrassCoverErosionOutwards.Data.csproj"/>
-    <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Data\Riskeer.HeightStructures.Data.csproj"/>
-    <ProjectReference Include="..\..\..\Piping\src\Riskeer.Piping.Data\Riskeer.Piping.Data.csproj"/>
-    <ProjectReference Include="..\..\..\StabilityPointStructures\src\Riskeer.StabilityPointStructures.Data\Riskeer.StabilityPointStructures.Data.csproj"/>
-    <ProjectReference Include="..\..\..\StabilityPointStructures\test\Riskeer.StabilityPointStructures.Data.TestUtil\Riskeer.StabilityPointStructures.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\..\..\StabilityStoneCover\src\Riskeer.StabilityStoneCover.Data\Riskeer.StabilityStoneCover.Data.csproj"/>
-    <ProjectReference Include="..\..\..\WaveImpactAsphaltCover\src\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.Integration.Data\Riskeer.Integration.Data.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.Integration.Forms\Riskeer.Integration.Forms.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.Integration.Plugin\Riskeer.Integration.Plugin.csproj"/>
-    <ProjectReference Include="..\..\src\Riskeer.Integration.Util\Riskeer.Integration.Util.csproj"/>
-    <ProjectReference Include="..\Riskeer.Integration.Data.TestUtil\Riskeer.Integration.Data.TestUtil.csproj"/>
-    <ProjectReference Include="..\Riskeer.Integration.Forms.TestUtil\Riskeer.Integration.Forms.TestUtil.csproj"/>
-    <ProjectReference Include="..\Riskeer.Integration.TestUtil\Riskeer.Integration.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Base.TestUtil\Core.Common.Base.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.Util.TestUtil\Core.Common.Util.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.BruTile\Core.Components.BruTile.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Gis\Core.Components.Gis.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.BruTile.TestUtil\Core.Components.BruTile.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.Forms\Riskeer.AssemblyTool.Forms.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
+    <ProjectReference Include="..\..\..\AssemblyTool\test\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\ClosingStructures\src\Riskeer.ClosingStructures.Data\Riskeer.ClosingStructures.Data.csproj" />
+    <ProjectReference Include="..\..\..\ClosingStructures\test\Riskeer.ClosingStructures.Data.TestUtil\Riskeer.ClosingStructures.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Forms.TestUtil\Riskeer.Common.Forms.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\DuneErosion\src\Riskeer.DuneErosion.Data\Riskeer.DuneErosion.Data.csproj" />
+    <ProjectReference Include="..\..\..\GrassCoverErosionInwards\test\Riskeer.GrassCoverErosionInwards.Data.TestUtil\Riskeer.GrassCoverErosionInwards.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\HeightStructures\test\Riskeer.HeightStructures.Data.TestUtil\Riskeer.HeightStructures.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Riskeer.MacroStabilityInwards.Data\Riskeer.MacroStabilityInwards.Data.csproj" />
+    <ProjectReference Include="..\..\..\MacroStabilityInwards\test\Riskeer.MacroStabilityInwards.Data.TestUtil\Riskeer.MacroStabilityInwards.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Piping\test\Riskeer.Piping.Data.TestUtil\Riskeer.Piping.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Forms\Riskeer.Common.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Common\test\Riskeer.Common.Data.TestUtil\Riskeer.Common.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\GrassCoverErosionInwards\src\Riskeer.GrassCoverErosionInwards.Data\Riskeer.GrassCoverErosionInwards.Data.csproj" />
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Riskeer.GrassCoverErosionOutwards.Data\Riskeer.GrassCoverErosionOutwards.Data.csproj" />
+    <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Data\Riskeer.HeightStructures.Data.csproj" />
+    <ProjectReference Include="..\..\..\Piping\src\Riskeer.Piping.Data\Riskeer.Piping.Data.csproj" />
+    <ProjectReference Include="..\..\..\StabilityPointStructures\src\Riskeer.StabilityPointStructures.Data\Riskeer.StabilityPointStructures.Data.csproj" />
+    <ProjectReference Include="..\..\..\StabilityPointStructures\test\Riskeer.StabilityPointStructures.Data.TestUtil\Riskeer.StabilityPointStructures.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\StabilityStoneCover\src\Riskeer.StabilityStoneCover.Data\Riskeer.StabilityStoneCover.Data.csproj" />
+    <ProjectReference Include="..\..\..\WaveImpactAsphaltCover\src\Riskeer.WaveImpactAsphaltCover.Data\Riskeer.WaveImpactAsphaltCover.Data.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Integration.Data\Riskeer.Integration.Data.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Integration.Forms\Riskeer.Integration.Forms.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Integration.Plugin\Riskeer.Integration.Plugin.csproj" />
+    <ProjectReference Include="..\..\src\Riskeer.Integration.Util\Riskeer.Integration.Util.csproj" />
+    <ProjectReference Include="..\Riskeer.Integration.Data.TestUtil\Riskeer.Integration.Data.TestUtil.csproj" />
+    <ProjectReference Include="..\Riskeer.Integration.Forms.TestUtil\Riskeer.Integration.Forms.TestUtil.csproj" />
+    <ProjectReference Include="..\Riskeer.Integration.TestUtil\Riskeer.Integration.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -74,7 +74,7 @@
       <Version>3.6.1</Version>
     </PackageReference>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="log4net">
       <Version>2.0.8</Version>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj
===================================================================
diff -u -rbfc6cb5bd6fbe03ebcf7abae66fdac10bd298fd8 -r1a8132ab6f6474bee45bcdddee8ca116cdbacc5b
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision bfc6cb5bd6fbe03ebcf7abae66fdac10bd298fd8)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 1a8132ab6f6474bee45bcdddee8ca116cdbacc5b)
@@ -98,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>0.20.0</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
     <PackageReference Include="Fluent.Ribbon">
       <Version>3.4.0</Version>