diff --git a/mRemoteNG.Specs/mRemoteNG.Specs.csproj b/mRemoteNG.Specs/mRemoteNG.Specs.csproj
index 953efb1f..f9e93dba 100644
--- a/mRemoteNG.Specs/mRemoteNG.Specs.csproj
+++ b/mRemoteNG.Specs/mRemoteNG.Specs.csproj
@@ -58,7 +58,7 @@
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -73,7 +73,7 @@
       <HintPath>..\packages\SpecFlow.NUnit.3.0.225\lib\net45\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll</HintPath>
     </Reference>
     <Reference Include="Utf8Json, Version=1.3.7.0, Culture=neutral, PublicKeyToken=8a73d3ba7e392e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.dll</HintPath>
+      <HintPath>..\packages\Utf8Json.1.3.7\lib\net47\Utf8Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/mRemoteNG.Specs/packages.config b/mRemoteNG.Specs/packages.config
index f9b9b276..05726520 100644
--- a/mRemoteNG.Specs/packages.config
+++ b/mRemoteNG.Specs/packages.config
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BoDi" version="1.4.1" targetFramework="net46" />
-  <package id="Gherkin" version="6.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
-  <package id="NUnit" version="3.12.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
+  <package id="BoDi" version="1.4.1" targetFramework="net472" />
+  <package id="Gherkin" version="6.0.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+  <package id="NUnit.Console" version="3.10.0" targetFramework="net472" />
+  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net472" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.7" targetFramework="net472" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
-  <package id="NUnit.Runners" version="3.10.0" targetFramework="net46" />
+  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net472" />
+  <package id="NUnit.Runners" version="3.10.0" targetFramework="net472" />
   <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net472" />
   <package id="SpecFlow" version="3.0.225" targetFramework="net472" />
   <package id="SpecFlow.NUnit" version="3.0.225" targetFramework="net472" />
@@ -20,6 +20,6 @@
   <package id="System.Reflection.Emit.Lightweight" version="4.6.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net46" requireReinstallation="true" />
-  <package id="Utf8Json" version="1.3.7" targetFramework="net46" requireReinstallation="true" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Utf8Json" version="1.3.7" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/mRemoteNGTests/packages.config b/mRemoteNGTests/packages.config
index 4806d37f..58b364c7 100644
--- a/mRemoteNGTests/packages.config
+++ b/mRemoteNGTests/packages.config
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net46" />
-  <package id="Castle.Core" version="4.4.0" targetFramework="net46" />
-  <package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
-  <package id="log4net" version="2.0.8" targetFramework="net46" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
+  <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
+  <package id="DockPanelSuite" version="3.0.6" targetFramework="net472" />
+  <package id="log4net" version="2.0.8" targetFramework="net472" />
   <package id="NSubstitute" version="4.2.1" targetFramework="net472" />
-  <package id="NUnit" version="3.12.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+  <package id="NUnit.Console" version="3.10.0" targetFramework="net472" />
+  <package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net472" />
+  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net472" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.7" targetFramework="net472" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
+  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net472" />
   <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net472" />
-  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net46" />
-  <package id="OpenCover" version="4.7.922" targetFramework="net46" />
+  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net472" />
+  <package id="OpenCover" version="4.7.922" targetFramework="net472" />
   <package id="ReportGenerator" version="4.3.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 25c15e45..0f89ec52 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props')" />
   <Import Project="..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props')" />
   <Import Project="..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props')" />
   <Import Project="..\packages\cef.redist.x64.79.1.35\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.79.1.35\build\cef.redist.x64.props')" />
-  <Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -1170,9 +1170,9 @@
     <None Include="Documentation\user_interface\screenshot_manager.rst" />
     <None Include="Documentation\user_interface\port_scan.rst" />
     <None Include="Documentation\user_interface\quick_connect.rst" />
+    <None Include="Documentation\howtos\vmrdp.rst" />
     <None Include="Firefox\omni.ja" />
     <None Include="packages.config" />
-    <None Include="Documentation\howtos\vmrdp.rst" />
     <None Include="Resources\Templates\AppIcon.psd" />
     <None Include="Resources\Templates\Header_dark.psd" />
     <None Include="Resources\Templates\Header_light.psd" />
@@ -1754,20 +1754,20 @@ powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mrem
   <PropertyGroup>
     <PreBuildEvent>echo $(ConfigurationName) &gt; buildenv.tmp</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets" Condition="Exists('..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\packages\cef.redist.x64.79.1.35\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.79.1.35\build\cef.redist.x64.props'))" />
     <Error Condition="!Exists('..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props'))" />
     <Error Condition="!Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props'))" />
     <Error Condition="!Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets'))" />
     <Error Condition="!Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props'))" />
     <Error Condition="!Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets'))" />
+    <Error Condition="!Exists('..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
   <Import Project="..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets')" />
   <Import Project="..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets')" />
+  <Import Project="..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets" Condition="Exists('..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets')" />
 </Project>
\ No newline at end of file
diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config
index fdca8906..ab054a94 100644
--- a/mRemoteV1/packages.config
+++ b/mRemoteV1/packages.config
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net46" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="cef.redist.x64" version="79.1.35" targetFramework="net472" />
   <package id="cef.redist.x86" version="79.1.35" targetFramework="net472" />
   <package id="CefSharp.Common" version="79.1.350" targetFramework="net472" />
   <package id="CefSharp.WinForms" version="79.1.350" targetFramework="net472" />
-  <package id="ConsoleControl" version="1.2.1" targetFramework="net46" />
-  <package id="ConsoleControlAPI" version="1.2.1" targetFramework="net46" />
-  <package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
-  <package id="DockPanelSuite.ThemeVS2003" version="3.0.6" targetFramework="net46" />
-  <package id="DockPanelSuite.ThemeVS2012" version="3.0.6" targetFramework="net46" />
-  <package id="DockPanelSuite.ThemeVS2013" version="3.0.6" targetFramework="net46" />
-  <package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net46" />
+  <package id="ConsoleControl" version="1.2.1" targetFramework="net472" />
+  <package id="ConsoleControlAPI" version="1.2.1" targetFramework="net472" />
+  <package id="DockPanelSuite" version="3.0.6" targetFramework="net472" />
+  <package id="DockPanelSuite.ThemeVS2003" version="3.0.6" targetFramework="net472" />
+  <package id="DockPanelSuite.ThemeVS2012" version="3.0.6" targetFramework="net472" />
+  <package id="DockPanelSuite.ThemeVS2013" version="3.0.6" targetFramework="net472" />
+  <package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net472" />
   <package id="Geckofx60.32" version="60.0.39" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.9.2" targetFramework="net472" />
-  <package id="log4net" version="2.0.8" targetFramework="net46" />
+  <package id="log4net" version="2.0.8" targetFramework="net472" />
   <package id="Markdig" version="0.17.1" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.17" targetFramework="net472" />
   <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net472" />
-  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net46" />
-  <package id="SSH.NET" version="2016.1.0" targetFramework="net46" />
+  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net472" />
+  <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
 </packages>
\ No newline at end of file