Index: Application/Riskeer/src/Application.Riskeer/App.xaml
===================================================================
diff -u -rcb6d0d0e0260d373f0ade513d28e6ffcfc28a138 -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Application/Riskeer/src/Application.Riskeer/App.xaml	(.../App.xaml)	(revision cb6d0d0e0260d373f0ade513d28e6ffcfc28a138)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml	(.../App.xaml)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -27,7 +27,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Fluent;Component/Themes/generic.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj	(.../Application.Riskeer.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -125,7 +125,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\Application\Built-in\Managed\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -123,7 +123,7 @@
     <Exec Command="xcopy &quot;$(ProjectDir)nl&quot; &quot;$(OutDir)\nl\*&quot; /D /S /Y" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -75,7 +75,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -98,7 +98,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -62,7 +62,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj	(.../Demo.Riskeer.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Demo/Riskeer/src/Demo.Riskeer/Demo.Riskeer.csproj	(.../Demo.Riskeer.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -98,7 +98,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj	(.../Riskeer.Integration.Plugin.csproj)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -185,7 +185,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent\*</PostBuildEvent>
+    <PostBuildEvent>xcopy /d/s/y $(PkgFluent_Ribbon)\lib\net45\* $(OutDir)\..\Externals\Fluent-3.4.0\*</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\build\PreBuild.targets" />
 </Project>
\ No newline at end of file
Index: build/Source.targets
===================================================================
diff -u -r2793e9b8529bbf0c59a5cea559e1b3f1efe9765b -rf9ad6aa27e2c71c187325e65c98d0f4ae6873e0d
--- build/Source.targets	(.../Source.targets)	(revision 2793e9b8529bbf0c59a5cea559e1b3f1efe9765b)
+++ build/Source.targets	(.../Source.targets)	(revision f9ad6aa27e2c71c187325e65c98d0f4ae6873e0d)
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <OutputPath Condition="$(OutputPath) == ''">$(SolutionDir)\bin\$(Configuration)\Application\</OutputPath>
+    <OutputPath Condition="$(OutputPath) == ''">$(SolutionDir)\bin\$(Configuration)\Application\Built-in\Managed\Core</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
     <Platforms>x86</Platforms>
     <PlatformTarget>x86</PlatformTarget>