diff --git a/FreePIE.Console/FreePIE.Console.csproj b/FreePIE.Console/FreePIE.Console.csproj
index 17a8c2fb..73ee43f4 100644
--- a/FreePIE.Console/FreePIE.Console.csproj
+++ b/FreePIE.Console/FreePIE.Console.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreePIE.Console</RootNamespace>
     <AssemblyName>FreePIE.Console</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -39,9 +39,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
+    <Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/FreePIE.Console/app.config b/FreePIE.Console/app.config
index fcd0c937..ff995010 100644
--- a/FreePIE.Console/app.config
+++ b/FreePIE.Console/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/FreePIE.Console/packages.config b/FreePIE.Console/packages.config
index a3097361..4a524441 100644
--- a/FreePIE.Console/packages.config
+++ b/FreePIE.Console/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Ninject" version="3.3.6" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/FreePIE.Core.Contracts/FreePIE.Core.Contracts.csproj b/FreePIE.Core.Contracts/FreePIE.Core.Contracts.csproj
index 087e6913..e880f886 100644
--- a/FreePIE.Core.Contracts/FreePIE.Core.Contracts.csproj
+++ b/FreePIE.Core.Contracts/FreePIE.Core.Contracts.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreePIE.Core.Contracts</RootNamespace>
     <AssemblyName>FreePIE.Core.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/FreePIE.Core/FreePIE.Core.csproj b/FreePIE.Core/FreePIE.Core.csproj
index 69c8a2d9..ff236191 100644
--- a/FreePIE.Core/FreePIE.Core.csproj
+++ b/FreePIE.Core/FreePIE.Core.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreePIE.Core</RootNamespace>
     <AssemblyName>FreePIE.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -53,9 +53,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\IronPython\Microsoft.Scripting.dll</HintPath>
     </Reference>
-    <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
+    <Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/FreePIE.Core/Services/ServiceBootstrapper.cs b/FreePIE.Core/Services/ServiceBootstrapper.cs
index 548b45db..27e0bded 100644
--- a/FreePIE.Core/Services/ServiceBootstrapper.cs
+++ b/FreePIE.Core/Services/ServiceBootstrapper.cs
@@ -154,7 +154,7 @@ public Func<T, TCast> Create()
             }
         }
 
-        private sealed class PathsProvider : IProvider<IPaths>
+        private sealed class PathsProvider : IProvider
         {
             private readonly IPortable portable;
             private readonly Func<PortablePaths> portablePaths;
diff --git a/FreePIE.Core/packages.config b/FreePIE.Core/packages.config
index a3097361..4a524441 100644
--- a/FreePIE.Core/packages.config
+++ b/FreePIE.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Ninject" version="3.3.6" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/FreePIE.GUI.CodeCompletion/FreePIE.GUI.CodeCompletion.csproj b/FreePIE.GUI.CodeCompletion/FreePIE.GUI.CodeCompletion.csproj
index 577a31e7..37ec1148 100644
--- a/FreePIE.GUI.CodeCompletion/FreePIE.GUI.CodeCompletion.csproj
+++ b/FreePIE.GUI.CodeCompletion/FreePIE.GUI.CodeCompletion.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreePIE.GUI.CodeCompletion</RootNamespace>
     <AssemblyName>FreePIE.GUI.CodeCompletion</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/FreePIE.GUI.CodeCompletion/packages.config b/FreePIE.GUI.CodeCompletion/packages.config
index d145f5a9..187284e5 100644
--- a/FreePIE.GUI.CodeCompletion/packages.config
+++ b/FreePIE.GUI.CodeCompletion/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
-  <package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
-  <package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
+  <package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" />
+  <package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/FreePIE.GUI/FreePIE.GUI.csproj b/FreePIE.GUI/FreePIE.GUI.csproj
index 791b3976..1ae793bb 100644
--- a/FreePIE.GUI/FreePIE.GUI.csproj
+++ b/FreePIE.GUI/FreePIE.GUI.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FreePIE.GUI</RootNamespace>
     <AssemblyName>FreePIE</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -44,6 +44,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -74,9 +75,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\AvalonEdit.5.0.2\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
-    <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
+    <Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/FreePIE.GUI/app.config b/FreePIE.GUI/app.config
index fcd0c937..ff995010 100644
--- a/FreePIE.GUI/app.config
+++ b/FreePIE.GUI/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/FreePIE.GUI/packages.config b/FreePIE.GUI/packages.config
index ec81c64b..cef0b824 100644
--- a/FreePIE.GUI/packages.config
+++ b/FreePIE.GUI/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
-  <package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
-  <package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
-  <package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" />
+  <package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" />
+  <package id="Ninject" version="3.3.6" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/FreePIE.sln b/FreePIE.sln
index 3b3f7d83..10ab86e2 100644
--- a/FreePIE.sln
+++ b/FreePIE.sln
@@ -13,12 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Core.Plugins", "Fre
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Core.Plugins", "FreePIE.Tests.Core.Plugins\FreePIE.Tests.Core.Plugins.csproj", "{AB8FED7B-DCC4-4985-A031-BB97351C24E6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Core", "FreePIE.Tests.Core\FreePIE.Tests.Core.csproj", "{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Test", "FreePIE.Tests.Test\FreePIE.Tests.Test.csproj", "{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.GUI", "FreePIE.GUI\FreePIE.GUI.csproj", "{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB} = {65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}
@@ -95,36 +89,6 @@ Global
 		{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|x86.ActiveCfg = Release|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|x86.ActiveCfg = Release|Any CPU
 		{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -151,9 +115,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D0368562-09D1-4E6E-8BD3-C1138764971E} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
-		{AB8FED7B-DCC4-4985-A031-BB97351C24E6} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
-		{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
-		{DFBE147A-E57B-42AC-A560-B69C6FAC1C38} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
 	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = FreePIE.vsmdi