Index: Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{4163B996-3455-4324-A38A-9F2F0E6FCB52}</ProjectGuid>
-    <RootNamespace>Core.Plugins.Chart</RootNamespace>
-    <AssemblyName>Core.Plugins.Chart</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -21,67 +11,25 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChartingRibbon.xaml.cs">
-      <DependentUpon>ChartingRibbon.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Commands\ToggleLegendViewCommand.cs" />
-    <Compile Include="Legend\ChartLegendView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Legend\ChartLegendView.Designer.cs">
-      <DependentUpon>ChartLegendView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Legend\ChartLegendController.cs" />
-    <Compile Include="ChartPlugin.cs" />
-    <Compile Include="PresentationObjects\ChartDataContext.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyClasses\ChartAreaDataProperties.cs" />
-    <Compile Include="PropertyClasses\ChartDataCollectionProperties.cs" />
-    <Compile Include="PropertyClasses\ChartDataProperties.cs" />
-    <Compile Include="PropertyClasses\ChartLineDataProperties.cs" />
-    <Compile Include="PropertyClasses\ChartMultipleAreaDataProperties.cs" />
-    <Compile Include="PropertyClasses\ChartMultipleLineDataProperties.cs" />
-    <Compile Include="PropertyClasses\ChartPointDataProperties.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj">
-      <Project>{2465cca1-c505-4827-9454-4fd5fd9194cd}</Project>
-      <Name>Core.Components.Chart.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
-      <Name>Core.Components.Chart</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -92,17 +40,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Legend\ChartLegendView.resx">
-      <DependentUpon>ChartLegendView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\chart.png" />
     <None Include="Resources\area.png" />
     <None Include="Resources\document.png" />
@@ -116,6 +53,23 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Chart/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Chart/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj
===================================================================
diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj	(.../Core.Plugins.CommonTools.csproj)	(revision 9bba38e3ebe3fe261e7c97c338b016681e07c140)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj	(.../Core.Plugins.CommonTools.csproj)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -1,34 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}</ProjectGuid>
-    <RootNamespace>Core.Plugins.CommonTools</RootNamespace>
-    <AssemblyName>Core.Plugins.CommonTools</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommonToolsPlugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{610E0A9C-1997-4C43-A10E-39D4C66ADA93}</ProjectGuid>
-    <RootNamespace>Core.Plugins.Map</RootNamespace>
-    <AssemblyName>Core.Plugins.Map</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -21,96 +11,38 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Commands\ToggleMapLegendViewCommand.cs" />
-    <Compile Include="Helpers\MapDataContextHelper.cs" />
-    <Compile Include="MapPlugin.cs" />
-    <Compile Include="Legend\MapLegendController.cs" />
-    <Compile Include="Legend\MapLegendView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Legend\MapLegendView.Designer.cs">
-      <DependentUpon>MapLegendView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MapRibbon.xaml.cs">
-      <DependentUpon>MapRibbon.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PresentationObjects\FeatureBasedMapDataContext.cs" />
-    <Compile Include="PresentationObjects\MapDataCollectionContext.cs" />
-    <Compile Include="PresentationObjects\MapDataContext.cs" />
-    <Compile Include="PresentationObjects\MapLineDataContext.cs" />
-    <Compile Include="PresentationObjects\MapPointDataContext.cs" />
-    <Compile Include="PresentationObjects\MapPolygonDataContext.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyClasses\CategoryThemeProperties.cs" />
-    <Compile Include="PropertyClasses\FeatureBasedMapDataProperties.cs" />
-    <Compile Include="PropertyClasses\IHasMetaData.cs" />
-    <Compile Include="PropertyClasses\LineCategoryThemeProperties.cs" />
-    <Compile Include="PropertyClasses\MapDataCollectionProperties.cs" />
-    <Compile Include="PropertyClasses\MapLineDataProperties.cs" />
-    <Compile Include="PropertyClasses\MapPointDataProperties.cs" />
-    <Compile Include="PropertyClasses\MapPolygonDataProperties.cs" />
-    <Compile Include="PropertyClasses\PointCategoryThemeProperties.cs" />
-    <Compile Include="PropertyClasses\PolygonCategoryThemeProperties.cs" />
-    <Compile Include="UITypeEditors\MetaDataAttributeEditor.cs" />
-    <Compile Include="UITypeEditors\SelectableMetaDataAttribute.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj">
-      <Project>{5a91174a-fb95-4c9d-9ca5-81c0b8d4361a}</Project>
-      <Name>Core.Components.DotSpatial.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj">
-      <Project>{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}</Project>
-      <Name>Core.Components.Gis.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.IO\Core.Components.Gis.IO.csproj">
-      <Project>{fd264fad-e6f9-47cc-97cd-770199a8e629}</Project>
-      <Name>Core.Components.Gis.IO</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj">
-      <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
-      <Name>Core.Components.Gis</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="MapRibbon.xaml">
@@ -119,16 +51,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Legend\MapLegendView.resx">
-      <DependentUpon>MapLegendView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="Resources\map.png" />
   </ItemGroup>
   <ItemGroup>
@@ -155,4 +77,22 @@
   <ItemGroup>
     <None Include="Resources\map--plus.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -1,16 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ED20DBA9-D577-423F-A68D-A0A8130FB10B}</ProjectGuid>
-    <RootNamespace>Core.Plugins.ProjectExplorer</RootNamespace>
-    <AssemblyName>Core.Plugins.ProjectExplorer</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="Fluent, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e436e32a8c5546f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net45\Fluent.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -21,77 +11,52 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Commands\ToggleProjectExplorerCommand.cs" />
-    <Compile Include="Exceptions\PluginActivationException.cs" />
-    <Compile Include="ProjectExplorer.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ProjectExplorer.Designer.cs">
-      <DependentUpon>ProjectExplorer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ProjectExplorerViewController.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Ribbon.xaml.cs">
-      <DependentUpon>Ribbon.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ProjectExplorerPlugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
-      <Project>{1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}</Project>
-      <Name>Core.Common.Controls.TreeView</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
-      <Name>Core.Common.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Util</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\folder_wrench.png" />
-    <EmbeddedResource Include="ProjectExplorer.resx">
-      <DependentUpon>ProjectExplorer.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Ribbon.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fluent.Ribbon">
+      <Version>3.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs
===================================================================
diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2019. All rights reserved.
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -40,10 +40,10 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
+    internal class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -57,7 +57,7 @@
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Plugins.ProjectExplorer.Properties.Resources", typeof(Resources).Assembly);
@@ -72,7 +72,7 @@
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -84,7 +84,7 @@
         /// <summary>
         ///   Looks up a localized string similar to Projectverkenner.
         /// </summary>
-        public static string General_ProjectExplorer {
+        internal static string General_ProjectExplorer {
             get {
                 return ResourceManager.GetString("General_ProjectExplorer", resourceCulture);
             }
@@ -93,7 +93,7 @@
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        public static System.Drawing.Bitmap ProjectExplorerIcon {
+        internal static System.Drawing.Bitmap ProjectExplorerIcon {
             get {
                 object obj = ResourceManager.GetObject("ProjectExplorerIcon", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -103,7 +103,7 @@
         /// <summary>
         ///   Looks up a localized string similar to Het starten van de {0} is mislukt..
         /// </summary>
-        public static string ProjectExplorerPlugin_Activation_of_0_failed {
+        internal static string ProjectExplorerPlugin_Activation_of_0_failed {
             get {
                 return ResourceManager.GetString("ProjectExplorerPlugin_Activation_of_0_failed", resourceCulture);
             }
@@ -112,7 +112,7 @@
         /// <summary>
         ///   Looks up a localized string similar to Kan {0} niet twee keer activeren..
         /// </summary>
-        public static string ProjectExplorerPlugin_Cannot_activate_0_twice {
+        internal static string ProjectExplorerPlugin_Cannot_activate_0_twice {
             get {
                 return ResourceManager.GetString("ProjectExplorerPlugin_Cannot_activate_0_twice", resourceCulture);
             }
@@ -121,7 +121,7 @@
         /// <summary>
         ///   Looks up a localized string similar to Weergeven/Verbergen.
         /// </summary>
-        public static string Ribbon_GroupBox_ShowHide {
+        internal static string Ribbon_GroupBox_ShowHide {
             get {
                 return ResourceManager.GetString("Ribbon_GroupBox_ShowHide", resourceCulture);
             }
@@ -130,7 +130,7 @@
         /// <summary>
         ///   Looks up a localized string similar to Beeld.
         /// </summary>
-        public static string Ribbon_TabItem_View {
+        internal static string Ribbon_TabItem_View {
             get {
                 return ResourceManager.GetString("Ribbon_TabItem_View", resourceCulture);
             }
Fisheye: Tag 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.ProjectExplorer/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs
===================================================================
diff -u -r6ad1923251c39f361b8ba43addbcfdf148bbaf57 -r9a8c9eafdf80fa4b1d10fdebf4e17626699f5627
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs	(.../ProjectExplorerPluginTest.cs)	(revision 6ad1923251c39f361b8ba43addbcfdf148bbaf57)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs	(.../ProjectExplorerPluginTest.cs)	(revision 9a8c9eafdf80fa4b1d10fdebf4e17626699f5627)
@@ -63,7 +63,7 @@
 
                 // Assert
                 string message = Assert.Throws<PluginActivationException>(test).Message;
-                string expected = string.Format(Resources.ProjectExplorerPlugin_Activation_of_0_failed, Resources.General_ProjectExplorer);
+                const string expected = "Het starten van de Projectverkenner is mislukt.";
                 Assert.AreEqual(expected, message);
             }
         }
@@ -133,7 +133,7 @@
 
                 // Assert
                 string message = Assert.Throws<PluginActivationException>(test).Message;
-                string expected = string.Format(Resources.ProjectExplorerPlugin_Cannot_activate_0_twice, Resources.General_ProjectExplorer);
+                const string expected = "Kan Projectverkenner niet twee keer activeren.";
                 Assert.AreEqual(expected, message);
             }