Index: Application/Riskeer/src/Application.Riskeer.Migration.Console/app.config
===================================================================
diff -u -r1b53b144acc8a3a2826b63f0d841e4c123a8b461 -r5815488962126164812435881c1eb3ba786ffbc6
--- Application/Riskeer/src/Application.Riskeer.Migration.Console/app.config	(.../app.config)	(revision 1b53b144acc8a3a2826b63f0d841e4c123a8b461)
+++ Application/Riskeer/src/Application.Riskeer.Migration.Console/app.config	(.../app.config)	(revision 5815488962126164812435881c1eb3ba786ffbc6)
@@ -27,7 +27,7 @@
     </startup>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <probing privatePath="Application;Application\Built-in;Application\Built-in\Managed;Application\Built-in\Managed\Core;Application\Built-in\Managed\Deltares;Application\Built-in\Managed\Deltares\AssemblyTool-1.2.0.0;Application\Built-in\Managed\Deltares\D-Stability-20.2.1;Application\Built-in\Managed\Deltares\Macrostability-20.3.1.10489;Application\Built-in\Managed\Deltares\Piping-16.2.1.4574;Application\Built-in\Managed\Third-party;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\de;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\es;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\fr;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\hu;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\it;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\nl;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\pt-BR;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ro;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ru;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\sv;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\zh-Hans;Application\Built-in\Managed\Third-party\BruTile-2.1.2;Application\Built-in\Managed\Third-party\BruTile.Desktop-2.1.2;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Data-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Extensions-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.GeoAPI-1.7.4.3;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-MO;Application\Built-in\Managed\Third-party\DotSpatial.Mono-1.9.0;Application\Built-in\Managed\Third-party\DotSpatial.NetTopologySuite-1.14.4;Application\Built-in\Managed\Third-party\DotSpatial.NTSExtension-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\el;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ja-JP;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\lt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\nl;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ro;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\th;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\vi-VN;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Serialization-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\en-US;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Topology-1.9.0;Application\Built-in\Managed\Third-party\EntityFramework-6.2.0;Application\Built-in\Managed\Third-party\GeoAPI-1.7.4;Application\Built-in\Managed\Third-party\GraphSharp-1.1.0;Application\Built-in\Managed\Third-party\Log4net-2.0.12;Application\Built-in\Managed\Third-party\MathNet.Numerics-3.19.0;Application\Built-in\Managed\Third-party\MathNet.Spatial-0.3.0;Application\Built-in\Managed\Third-party\NetTopologySuite-1.14.0;Application\Built-in\Managed\Third-party\OxyPlot.Core-1.0.0;Application\Built-in\Managed\Third-party\OxyPlot.WindowsForms-1.0.0;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7\CodeContracts;Application\Built-in\Managed\Third-party\SmartThreadPool.dll-2.2.4;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x64;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x86;Application\Built-in\Managed\Third-party\System.Data.SQLite.EF6-1.0.109;Application\Built-in\Managed\Third-party\WPFExtensions-1.0.0;" />
+            <probing privatePath="Application;Application\Built-in;Application\Built-in\Managed;Application\Built-in\Managed\Core;Application\Built-in\Managed\Deltares;Application\Built-in\Managed\Deltares\AssemblyTool-1.2.0.0;Application\Built-in\Managed\Deltares\D-Stability-20.2.1;Application\Built-in\Managed\Deltares\Macrostability-20.3.1.10489;Application\Built-in\Managed\Deltares\Piping-16.2.1.4574;Application\Built-in\Managed\Third-party;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\de;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\es;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\fr;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\hu;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\it;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\nl;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\pt-BR;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ro;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ru;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\sv;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\zh-Hans;Application\Built-in\Managed\Third-party\BruTile-2.1.2;Application\Built-in\Managed\Third-party\BruTile.Desktop-2.1.2;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Data-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Extensions-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.GeoAPI-1.7.4.3;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-MO;Application\Built-in\Managed\Third-party\DotSpatial.Mono-1.9.0;Application\Built-in\Managed\Third-party\DotSpatial.NetTopologySuite-1.14.4;Application\Built-in\Managed\Third-party\DotSpatial.NTSExtension-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\el;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ja-JP;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\lt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\nl;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ro;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\th;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\vi-VN;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Serialization-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\en-US;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Topology-1.9.0;Application\Built-in\Managed\Third-party\EntityFramework-6.2.0;Application\Built-in\Managed\Third-party\GeoAPI-1.7.4;Application\Built-in\Managed\Third-party\GraphSharp-1.1.0;Application\Built-in\Managed\Third-party\Log4net-2.0.12;Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4;Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4\de;Application\Built-in\Managed\Third-party\MathNet.Numerics-3.19.0;Application\Built-in\Managed\Third-party\MathNet.Spatial-0.3.0;Application\Built-in\Managed\Third-party\NetTopologySuite-1.14.0;Application\Built-in\Managed\Third-party\OxyPlot.Core-1.0.0;Application\Built-in\Managed\Third-party\OxyPlot.WindowsForms-1.0.0;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7\CodeContracts;Application\Built-in\Managed\Third-party\SmartThreadPool.dll-2.2.4;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x64;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x86;Application\Built-in\Managed\Third-party\System.Data.SQLite.EF6-1.0.109;Application\Built-in\Managed\Third-party\WPFExtensions-1.0.0;" />
         </assemblyBinding>
     </runtime>
 </configuration>
\ No newline at end of file
Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -r1b53b144acc8a3a2826b63f0d841e4c123a8b461 -r5815488962126164812435881c1eb3ba786ffbc6
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 1b53b144acc8a3a2826b63f0d841e4c123a8b461)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 5815488962126164812435881c1eb3ba786ffbc6)
@@ -64,6 +64,11 @@
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="MahApps.Metro">
+      <Version>2.4.4</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="System.Data.SQLite.Core">
       <Version>1.0.109.2</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
@@ -77,6 +82,7 @@
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="xcopy /d/s/y &quot;$(Pkglog4net)\lib\net45\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\Log4net-2.0.12\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgMahApps_Metro)\lib\net47\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4\*&quot;" />
     <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Data_Sqlite_Core)\lib\net46\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\*&quot;" />
     <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Data_Sqlite_Core)\build\net46\x64\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x64\*&quot;" />
     <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Data_Sqlite_Core)\build\net46\x86\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x86\*&quot;" />
Index: Application/Riskeer/src/Application.Riskeer/app.config
===================================================================
diff -u -r1b53b144acc8a3a2826b63f0d841e4c123a8b461 -r5815488962126164812435881c1eb3ba786ffbc6
--- Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 1b53b144acc8a3a2826b63f0d841e4c123a8b461)
+++ Application/Riskeer/src/Application.Riskeer/app.config	(.../app.config)	(revision 5815488962126164812435881c1eb3ba786ffbc6)
@@ -58,7 +58,7 @@
   </system.data>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="Application;Application\Built-in;Application\Built-in\Managed;Application\Built-in\Managed\Core;Application\Built-in\Managed\Deltares;Application\Built-in\Managed\Deltares\AssemblyTool-1.2.0.0;Application\Built-in\Managed\Deltares\D-Stability-20.2.1;Application\Built-in\Managed\Deltares\Macrostability-20.3.1.10489;Application\Built-in\Managed\Deltares\Piping-16.2.1.4574;Application\Built-in\Managed\Third-party;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\de;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\es;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\fr;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\hu;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\it;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\nl;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\pt-BR;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ro;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ru;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\sv;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\zh-Hans;Application\Built-in\Managed\Third-party\BruTile-2.1.2;Application\Built-in\Managed\Third-party\BruTile.Desktop-2.1.2;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Data-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Extensions-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.GeoAPI-1.7.4.3;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-MO;Application\Built-in\Managed\Third-party\DotSpatial.Mono-1.9.0;Application\Built-in\Managed\Third-party\DotSpatial.NetTopologySuite-1.14.4;Application\Built-in\Managed\Third-party\DotSpatial.NTSExtension-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\el;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ja-JP;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\lt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\nl;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ro;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\th;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\vi-VN;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Serialization-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\en-US;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Topology-1.9.0;Application\Built-in\Managed\Third-party\EntityFramework-6.2.0;Application\Built-in\Managed\Third-party\GeoAPI-1.7.4;Application\Built-in\Managed\Third-party\GraphSharp-1.1.0;Application\Built-in\Managed\Third-party\Log4net-2.0.12;Application\Built-in\Managed\Third-party\MathNet.Numerics-3.19.0;Application\Built-in\Managed\Third-party\MathNet.Spatial-0.3.0;Application\Built-in\Managed\Third-party\NetTopologySuite-1.14.0;Application\Built-in\Managed\Third-party\OxyPlot.Core-1.0.0;Application\Built-in\Managed\Third-party\OxyPlot.WindowsForms-1.0.0;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7\CodeContracts;Application\Built-in\Managed\Third-party\SmartThreadPool.dll-2.2.4;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x64;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x86;Application\Built-in\Managed\Third-party\System.Data.SQLite.EF6-1.0.109;Application\Built-in\Managed\Third-party\WPFExtensions-1.0.0;" />
+      <probing privatePath="Application;Application\Built-in;Application\Built-in\Managed;Application\Built-in\Managed\Core;Application\Built-in\Managed\Deltares;Application\Built-in\Managed\Deltares\AssemblyTool-1.2.0.0;Application\Built-in\Managed\Deltares\D-Stability-20.2.1;Application\Built-in\Managed\Deltares\Macrostability-20.3.1.10489;Application\Built-in\Managed\Deltares\Piping-16.2.1.4574;Application\Built-in\Managed\Third-party;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\de;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\es;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\fr;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\hu;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\it;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\nl;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\pt-BR;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ro;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\ru;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\sv;Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\zh-Hans;Application\Built-in\Managed\Third-party\BruTile-2.1.2;Application\Built-in\Managed\Third-party\BruTile.Desktop-2.1.2;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Controls-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Data-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Data.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Extensions-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.GeoAPI-1.7.4.3;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Modeling.Forms-2.0.0-rc1\zh-MO;Application\Built-in\Managed\Third-party\DotSpatial.Mono-1.9.0;Application\Built-in\Managed\Third-party\DotSpatial.NetTopologySuite-1.14.4;Application\Built-in\Managed\Third-party\DotSpatial.NTSExtension-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\el;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ja-JP;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\lt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\nl;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\ro;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\th;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\vi-VN;Application\Built-in\Managed\Third-party\DotSpatial.Projections.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Serialization-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\cs;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\de-DE;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\en-US;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\it-IT;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\pt-BR;Application\Built-in\Managed\Third-party\DotSpatial.Symbology.Forms-2.0.0-rc1\zh-CN;Application\Built-in\Managed\Third-party\DotSpatial.Topology-1.9.0;Application\Built-in\Managed\Third-party\EntityFramework-6.2.0;Application\Built-in\Managed\Third-party\GeoAPI-1.7.4;Application\Built-in\Managed\Third-party\GraphSharp-1.1.0;Application\Built-in\Managed\Third-party\Log4net-2.0.12;Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4;Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4\de;Application\Built-in\Managed\Third-party\MathNet.Numerics-3.19.0;Application\Built-in\Managed\Third-party\MathNet.Spatial-0.3.0;Application\Built-in\Managed\Third-party\NetTopologySuite-1.14.0;Application\Built-in\Managed\Third-party\OxyPlot.Core-1.0.0;Application\Built-in\Managed\Third-party\OxyPlot.WindowsForms-1.0.0;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7;Application\Built-in\Managed\Third-party\QuickGraph-3.6.61119.7\CodeContracts;Application\Built-in\Managed\Third-party\SmartThreadPool.dll-2.2.4;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x64;Application\Built-in\Managed\Third-party\System.Data.SQLite.Core-1.0.109.2\x86;Application\Built-in\Managed\Third-party\System.Data.SQLite.EF6-1.0.109;Application\Built-in\Managed\Third-party\WPFExtensions-1.0.0;" />
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r1b53b144acc8a3a2826b63f0d841e4c123a8b461 -r5815488962126164812435881c1eb3ba786ffbc6
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 1b53b144acc8a3a2826b63f0d841e4c123a8b461)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 5815488962126164812435881c1eb3ba786ffbc6)
@@ -96,6 +96,11 @@
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="MahApps.Metro">
+      <Version>2.4.4</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -114,5 +119,6 @@
     <Exec Command="xcopy /d/s/y &quot;$(PkgAvalonDock)\lib\net40\*&quot; &quot;$(SolutionDir)bin\$(Configuration)\Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\*&quot;" />
     <Exec Command="xcopy /d/s/y &quot;$(ProjectDir)\nl\*&quot; &quot;$(SolutionDir)bin\$(Configuration)\Application\Built-in\Managed\Third-party\AvalonDock-2.0.2000\nl\*&quot;" />
     <Exec Command="xcopy /d/s/y &quot;$(Pkglog4net)\lib\net45\*&quot; &quot;$(SolutionDir)bin\$(Configuration)\Application\Built-in\Managed\Third-party\Log4net-2.0.12\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgMahApps_Metro)\lib\net47\*&quot; &quot;$(SolutionDir)bin\$(Configuration)\Application\Built-in\Managed\Third-party\MahApps.Metro-2.4.4\*&quot;" />
   </Target>
 </Project>
\ No newline at end of file