diff --git a/mRemoteV1.sln b/mRemoteV1.sln
index 5ebe3242f..7b2713ae2 100644
--- a/mRemoteV1.sln
+++ b/mRemoteV1.sln
@@ -1,8 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
+MinimumVisualStudioVersion = 14.0.25420.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRemoteV1.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs
index c2e8ee054..dd9b05650 100644
--- a/mRemoteV1/Properties/Settings.Designer.cs
+++ b/mRemoteV1/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace mRemoteNG {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/mRemoteV1/References/log4net.dll b/mRemoteV1/References/log4net.dll
deleted file mode 100644
index 9a653d6c5..000000000
Binary files a/mRemoteV1/References/log4net.dll and /dev/null differ
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 35d267fb7..d11cb28bc 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <log4net>
@@ -22,10 +22,10 @@
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
       <file value="${APPDATA}\mRemoteNG\mRemoteNG.log"/>
       <appendToFile value="true"/>
-      <rollingStyle value="Size" />
-      <maxSizeRollBackups value="5" />
-      <maximumFileSize value="10MB" />
-      <staticLogFileName value="true" />
+      <rollingStyle value="Size"/>
+      <maxSizeRollBackups value="5"/>
+      <maximumFileSize value="10MB"/>
+      <staticLogFileName value="true"/>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date [%thread] %-6level- %message%newline"/>
       </layout>
@@ -50,7 +50,7 @@
         <value>True</value>
       </setting>
       <setting name="CustomPuttyPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SwitchToMCOnInformation" serializeAs="String">
         <value>True</value>
@@ -68,7 +68,7 @@
         <value>False</value>
       </setting>
       <setting name="CustomConsPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SaveConsOnExit" serializeAs="String">
         <value>True</value>
@@ -95,13 +95,13 @@
         <value>noinfo</value>
       </setting>
       <setting name="DefaultUsername" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultPassword" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultDomain" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="UseCustomPuttyPath" serializeAs="String">
         <value>False</value>
@@ -119,7 +119,7 @@
         <value>False</value>
       </setting>
       <setting name="UpdateProxyAddress" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="UpdateProxyPort" serializeAs="String">
         <value>80</value>
@@ -128,13 +128,13 @@
         <value>False</value>
       </setting>
       <setting name="UpdateProxyAuthUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="UpdateProxyAuthPass" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultDescription" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultProtocol" serializeAs="String">
         <value>RDP</value>
@@ -221,13 +221,13 @@
         <value>False</value>
       </setting>
       <setting name="SQLHost" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SQLUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SQLPass" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultCacheBitmaps" serializeAs="String">
         <value>False</value>
@@ -299,10 +299,10 @@
         <value>False</value>
       </setting>
       <setting name="ConDefaultPreExtApp" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultPostExtApp" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultPreExtApp" serializeAs="String">
         <value>False</value>
@@ -341,10 +341,10 @@
         <value>EncHextile</value>
       </setting>
       <setting name="ConDefaultVNCProxyIP" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultVNCProxyPassword" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultVNCProxyPort" serializeAs="String">
         <value>0</value>
@@ -353,7 +353,7 @@
         <value>ProxyNone</value>
       </setting>
       <setting name="ConDefaultVNCProxyUsername" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultVNCAuthMode" serializeAs="String">
         <value>False</value>
@@ -407,7 +407,7 @@
         <value>False</value>
       </setting>
       <setting name="XULRunnerPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultRenderingEngine" serializeAs="String">
         <value>IE</value>
@@ -416,7 +416,7 @@
         <value>False</value>
       </setting>
       <setting name="ConDefaultMacAddress" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultMacAddress" serializeAs="String">
         <value>False</value>
@@ -425,13 +425,13 @@
         <value>False</value>
       </setting>
       <setting name="ConDefaultUserField" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultUserField" serializeAs="String">
         <value>False</value>
       </setting>
       <setting name="ConDefaultExtApp" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InhDefaultExtApp" serializeAs="String">
         <value>False</value>
@@ -479,19 +479,19 @@
         <value>5</value>
       </setting>
       <setting name="OverrideUICulture" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultRDGatewayHostname" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultRDGatewayUsername" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultRDGatewayPassword" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultRDGatewayDomain" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultEnableFontSmoothing" serializeAs="String">
         <value>False</value>
@@ -533,22 +533,22 @@
         <value>release</value>
       </setting>
       <setting name="ThemeName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ShowConfigHelpText" serializeAs="String">
         <value>True</value>
       </setting>
       <setting name="PuttySavedSessionsName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="PuttySavedSessionsPanel" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="CompatibilityWarnLenovoAutoScrollUtility" serializeAs="String">
         <value>True</value>
       </setting>
       <setting name="ConDefaultLoadBalanceInfo" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="ConDefaultAutomaticResize" serializeAs="String">
         <value>True</value>
@@ -608,7 +608,7 @@
         <value>00000000-0000-0000-0000-000000000000</value>
       </setting>
       <setting name="LogFilePath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="TextLogMessageWriterWriteDebugMsgs" serializeAs="String">
         <value>False</value>
@@ -665,4 +665,4 @@
   <runtime>
   	<generatePublisherEvidence enabled="false"/>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 34a61736f..d8fee11a6 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -25,8 +25,11 @@
     <ManifestKeyFile>mRemoteV1_TemporaryKey.pfx</ManifestKeyFile>
     <GenerateManifests>true</GenerateManifests>
     <SignManifests>false</SignManifests>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <ResolveComReferenceSilent>True</ResolveComReferenceSilent>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -42,9 +45,6 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <ResolveComReferenceSilent>True</ResolveComReferenceSilent>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
@@ -59,15 +59,14 @@
       <HintPath>..\packages\Geckofx45.45.0.22\lib\net40\Geckofx-Winforms.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="ADTree, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\ADTree.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="MagicLibrary, Version=1.7.4.0, Culture=neutral, PublicKeyToken=3a6eb82f876a49bc">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\MagicLibrary.dll</HintPath>
@@ -1377,7 +1376,17 @@
   </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>powershell -noprofile -command "sleep 2"
-call "$(DevEnvDir)..\tools\vsvars32.bat"
+
+rem VS 2015
+IF EXIST "$(DevEnvDir)..\tools\vsvars32.bat" (
+ call "$(DevEnvDir)..\tools\vsvars32.bat"
+)
+
+rem VS 2017
+IF EXIST "$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars32.bat" (
+call "$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars32.bat"
+)
+
 set /p buildenv=&lt;buildenv.tmp
 
 echo Copy PUTTYNG to correct directory
@@ -1426,6 +1435,7 @@ IF %25buildenv: =%25==ReleasePortable (
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DebugSymbols>false</DebugSymbols>
@@ -1437,6 +1447,7 @@ IF %25buildenv: =%25==ReleasePortable (
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>1</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x86'">
     <DebugSymbols>false</DebugSymbols>
@@ -1448,6 +1459,7 @@ IF %25buildenv: =%25==ReleasePortable (
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -1460,6 +1472,7 @@ IF %25buildenv: =%25==ReleasePortable (
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config
index aae3df548..3b0867545 100644
--- a/mRemoteV1/packages.config
+++ b/mRemoteV1/packages.config
@@ -4,6 +4,7 @@
   <package id="DockPanelSuite" version="2.10.0" targetFramework="net40" />
   <package id="DockPanelSuite.ThemeVS2012Light" version="2.10.0" targetFramework="net40" />
   <package id="Geckofx45" version="45.0.22" targetFramework="net40" />
+  <package id="log4net" version="2.0.7" targetFramework="net45" />
   <package id="ObjectListView.Official" version="2.9.1" targetFramework="net40" />
   <package id="SSH.NET" version="2016.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file