Switch to SHA-256 signing of final MSI files

This breaks support for Windows Vista.
Import translations from Transifex
2018-07-04 11:15:43 +02:00 · 2018-07-04 10:25:13 +02:00 · 2018-07-04 10:25:05 +02:00 · 2018-06-20 15:33:24 +02:00 · 2018-06-20 14:53:47 +02:00 · 2018-06-20 14:40:22 +02:00
123 changed files with 1860 additions and 7376 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-/.vs
+/*.opensdf
+/*.suo
+/*.sdf
 /doc
+/ipch
--- a/CredWrite/CredWrite.rc
+++ b/CredWrite/CredWrite.rc
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CredWrite</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="CredWrite.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="CredWrite.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,9 +91,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -156,7 +110,7 @@
    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/1
+++ b/1
@@ -794,7 +794,6 @@ EXCLUDE                = \
 	EventMonitor\res \
 	lib\EAPBase_UI\res \
 	lib\EapHost_UI\res \
-	lib\GTC_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
 	lib\WinStd \
--- a/EAPMethods/EAPTTLS/EAPTTLS.rc
+++ b/EAPMethods/EAPTTLS/EAPTTLS.rc
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
    <RootNamespace>EAPTTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -129,9 +87,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -147,9 +103,6 @@
    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
      <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
    </ProjectReference>
@@ -162,7 +115,7 @@
    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
    <RootNamespace>EAPTTLSUI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLSUI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLSUI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -129,9 +87,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -153,12 +109,6 @@
    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC_UI\build\GTC_UI.vcxproj">
-      <Project>{34680813-3a52-46fb-b5a8-1e4bbf770855}</Project>
-    </ProjectReference>
    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
      <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
    </ProjectReference>
@@ -183,10 +133,10 @@
    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EAPMethods/MSIBuild/Makefile
+++ b/EAPMethods/MSIBuild/Makefile
--- a/EAPMethods/locale/ko_KR.po
+++ b/EAPMethods/locale/ko_KR.po
@@ -439,7 +439,7 @@ msgid "Use my true user name"
 msgstr ""

 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-msgid "Use &empty outer identity"
+msgid "Use &empty outer identity (RFC 4822)"
 msgstr ""

 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -51,11 +51,6 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
 #endif
        g_peer.m_instance = hinstDLL;

-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-        // Declare our DllHost process as DPI-aware.
-        SetProcessDPIAware();
-#endif
-
        // Save current activation context, as proper activation context is set at this time only (LoadLibrary() call).
        GetCurrentActCtx(&g_act_ctx);
    } else if (fdwReason == DLL_PROCESS_DETACH) {
--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -168,11 +168,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
    m_rec_idx(wxETWEVENT_RECORDS_MAX),
    wxListCtrl(parent, id, pos, size, style, validator, name)
 {
-    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, FromDIP(160));
-    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT, FromDIP( 80));
-    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, FromDIP(350));
+    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 160);
+    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT,  80);
+    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, 350);

    // Maximum expected column widths for pre-formatted row display
    m_col_format_width[0] = 26;
@@ -204,11 +204,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
    ULONG ulResult;
    for (unsigned int i = 0; ; i++) {
        //tstring log_file(tstring_printf(i ? _T("test.etl") : _T("test %u.etl"), i));
-        tstring session_name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));
+        tstring name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));

        // Allocate session properties.
        ULONG
-            ulSizeName    = (ULONG)((session_name.length() + 1)*sizeof(TCHAR)),
+            ulSizeName    = (ULONG)((name    .length() + 1)*sizeof(TCHAR)),
            //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)),
            ulSize        = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/;
        unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize]));
@@ -226,13 +226,13 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
        //properties->LogFileNameOffset   = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName;
        //memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile);

-        if ((ulResult = m_session.create(session_name.c_str(), properties.get())) == ERROR_SUCCESS) {
+        if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) {
            break;
        } else if (ulResult == ERROR_ACCESS_DENIED) {
            wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."));
            return;
        } else if (ulResult == ERROR_ALREADY_EXISTS) {
-            wxLogDebug(_("The %s event session already exists."), session_name);
+            wxLogDebug(_("The %s event session already exists."), name);
            // Do not despair... Retry with a new session name and ID.
            continue;
        } else {
--- a/EventMonitor/EventMonitor.rc
+++ b/EventMonitor/EventMonitor.rc
--- a/EventMonitor/EventMonitor.vcxproj
+++ b/EventMonitor/EventMonitor.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>EventMonitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="EventMonitor.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="EventMonitor.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ResourceCompile Include="EventMonitor.rc" />
  </ItemGroup>
@@ -146,9 +102,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="res\wxEventMonitor_UI.cpp" />
  </ItemGroup>
@@ -156,10 +110,10 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EventMonitor/Frame.cpp
+++ b/EventMonitor/Frame.cpp
@@ -26,10 +26,10 @@
 //////////////////////////////////////////////////////////////////////////


-wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name) :
-    wxFrame(parent, id, title, pos, parent->FromDIP(wxSize(600,400)), style, name)
+wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
+    wxFrame(parent, id, title, pos, size, style, name)
 {
-    this->SetSizeHints(FromDIP(wxSize(150,150)), wxDefaultSize);
+    this->SetSizeHints(wxSize(150,150), wxDefaultSize);
    m_mgr.SetManagedWindow(this);
    m_mgr.SetFlags(wxAUI_MGR_DEFAULT);

--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@@ -72,7 +72,7 @@ public:
    /// \param[in] style   The window style. See `wxFrame` class description.
    /// \param[in] name    The name of the window. This parameter is used to associate a name with the item, allowing the application user to set Motif resource values for individual windows.
    ///
-    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));
+    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,400), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));

    ///
    /// Destructor
--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/locale/EventMonitor.pot
+++ b/EventMonitor/locale/EventMonitor.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -16,12 +16,10 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-1: ver1.0/EventMonitor\n"

 #: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
+#: master/EventMonitor/Frame.h:75 ver1.0/EventMonitor/Frame.h:75
 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
@@ -30,57 +28,44 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
 msgid "Time"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
 msgid "PID"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
 msgid "TID"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
 msgid "Source"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
 msgid "Event"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
@@ -88,8 +73,6 @@ msgstr ""
 #: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
 #: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
 #: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -99,157 +82,128 @@ msgstr ""
 #: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
 #: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
 #: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
 msgid "E&xit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
 msgid "Quits this program"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
 msgid "&Program"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
 msgid "&Copy"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
 #: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
 #: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
 #: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
 msgid "Clear"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
 #: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
 msgid "Select &All"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Select &None"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
 #: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
 msgid "&Edit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
 #: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
 #: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
 msgid "Verbose"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
 #: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
 #: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
 msgid "Informational"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
 #: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
 #: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
 msgid "Warning"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
 #: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
 #: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
 msgid "Error"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
 #: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
@@ -257,39 +211,31 @@ msgstr ""
 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
 #: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
 msgid "View"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
 #: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
 msgid "&View"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copy"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copy All"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
 msgid "Edit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
 msgstr ""

@@ -309,14 +255,6 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
 msgstr ""

@@ -328,9 +266,5 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""
--- a/EventMonitor/res/wxEventMonitor_UI.cpp
+++ b/EventMonitor/res/wxEventMonitor_UI.cpp
@@ -19,7 +19,7 @@ wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWind
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 	
 	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("EventMonitorLog") );
-	bSizerMain->Add( m_log, 1, wxEXPAND, FromDIP(5) );
+	bSizerMain->Add( m_log, 1, wxEXPAND, 5 );
 	
 	
 	this->SetSizer( bSizerMain );
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@@ -1,382 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-		include\Version.h = include\Version.h
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase_UI", "lib\EAPBase_UI\build\EAPBase_UI.vcxproj", "{D4B54856-BE1F-4937-A8F7-495125BE76BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP", "lib\PAP\build\PAP.vcxproj", "{36B0CF8A-7794-46C3-8099-825BA962B4C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS", "lib\TLS\build\TLS.vcxproj", "{4D40CB8A-812E-4F12-B23A-31AF743878E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS", "lib\TTLS\build\TTLS.vcxproj", "{EE0EF0D9-A475-4038-8637-5754724F65B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP_UI", "lib\PAP_UI\build\PAP_UI.vcxproj", "{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS_UI", "lib\TLS_UI\build\TLS_UI.vcxproj", "{9A25C261-8ADE-4938-8393-E857EF0E37E9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS_UI", "lib\TTLS_UI\build\TTLS_UI.vcxproj", "{42F0F0F4-C928-4860-A4E4-94991C2C3D90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeature\MsiUseFeature.vcxproj", "{679D03C5-CD70-4FFA-93F8-A4AB3637509B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\build\MSCHAPv2.vcxproj", "{86A6D6A0-4B7D-4134-BE81-A5755C77584D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC", "lib\GTC\build\GTC.vcxproj", "{114A70BB-8698-4A0C-8C90-58F22EDD8129}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC_UI", "lib\GTC_UI\build\GTC_UI.vcxproj", "{34680813-3A52-46FB-B5A8-1E4BBF770855}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.ActiveCfg = Debug|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.Build.0 = Debug|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.ActiveCfg = Debug|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.Build.0 = Debug|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.Build.0 = Release|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.ActiveCfg = Release|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.Build.0 = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.ActiveCfg = Debug|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.Build.0 = Debug|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.Build.0 = Release|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.ActiveCfg = Release|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.Build.0 = Release|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.ActiveCfg = Debug|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.Build.0 = Debug|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.Build.0 = Release|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.ActiveCfg = Release|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.Build.0 = Release|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.ActiveCfg = Debug|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.ActiveCfg = Debug|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.Build.0 = Debug|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.Build.0 = Release|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.ActiveCfg = Release|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.ActiveCfg = Release|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.Build.0 = Release|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.ActiveCfg = Debug|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.ActiveCfg = Debug|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.Build.0 = Debug|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.Build.0 = Release|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.ActiveCfg = Release|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.ActiveCfg = Release|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.Build.0 = Release|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.ActiveCfg = Debug|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.ActiveCfg = Debug|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.Build.0 = Debug|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.Build.0 = Release|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.ActiveCfg = Release|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.ActiveCfg = Release|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.Build.0 = Release|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.ActiveCfg = Debug|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.ActiveCfg = Debug|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.Build.0 = Debug|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.Build.0 = Release|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.ActiveCfg = Release|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.ActiveCfg = Release|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.Build.0 = Release|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.ActiveCfg = Debug|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.ActiveCfg = Debug|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.Build.0 = Debug|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.Build.0 = Release|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.ActiveCfg = Release|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.ActiveCfg = Release|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.Build.0 = Release|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.ActiveCfg = Debug|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.ActiveCfg = Debug|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.Build.0 = Debug|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.Build.0 = Release|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.ActiveCfg = Release|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.ActiveCfg = Release|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.Build.0 = Release|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.ActiveCfg = Debug|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.ActiveCfg = Debug|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.Build.0 = Debug|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.Build.0 = Release|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.ActiveCfg = Release|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.ActiveCfg = Release|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.Build.0 = Release|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.ActiveCfg = Debug|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.ActiveCfg = Debug|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.Build.0 = Debug|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.Build.0 = Release|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.ActiveCfg = Release|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.ActiveCfg = Release|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.Build.0 = Release|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.Build.0 = Debug|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.ActiveCfg = Debug|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.ActiveCfg = Debug|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.Build.0 = Debug|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.ActiveCfg = Release|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.Build.0 = Release|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.ActiveCfg = Release|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.ActiveCfg = Release|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.Build.0 = Release|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.ActiveCfg = Debug|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.ActiveCfg = Debug|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.Build.0 = Debug|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.Build.0 = Release|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.ActiveCfg = Release|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.ActiveCfg = Release|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.Build.0 = Release|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.ActiveCfg = Debug|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.ActiveCfg = Debug|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.Build.0 = Debug|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.Build.0 = Release|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.ActiveCfg = Release|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.ActiveCfg = Release|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.Build.0 = Release|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.Build.0 = Debug|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.ActiveCfg = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.Build.0 = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.Build.0 = Release|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.ActiveCfg = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.Build.0 = Release|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.ActiveCfg = Debug|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.ActiveCfg = Debug|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.Build.0 = Debug|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.Build.0 = Release|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.ActiveCfg = Release|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.ActiveCfg = Release|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.Build.0 = Release|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.ActiveCfg = Debug|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.ActiveCfg = Debug|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.Build.0 = Debug|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.Build.0 = Release|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.ActiveCfg = Release|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.Build.0 = Release|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.ActiveCfg = Debug|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.Build.0 = Debug|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.Build.0 = Release|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.ActiveCfg = Release|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.Build.0 = Release|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.Build.0 = Debug|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.ActiveCfg = Debug|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.Build.0 = Debug|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.ActiveCfg = Release|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.Build.0 = Release|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.ActiveCfg = Release|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.Build.0 = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.Build.0 = Debug|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.ActiveCfg = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.Build.0 = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.ActiveCfg = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.Build.0 = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.ActiveCfg = Release|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.Build.0 = Release|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.ActiveCfg = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.Build.0 = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.ActiveCfg = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.Build.0 = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.Build.0 = Debug|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.ActiveCfg = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.Build.0 = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.ActiveCfg = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.Build.0 = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.ActiveCfg = Release|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.Build.0 = Release|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.ActiveCfg = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.Build.0 = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.ActiveCfg = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{EE0EF0D9-A475-4038-8637-5754724F65B0} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{34680813-3A52-46FB-B5A8-1E4BBF770855} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E52A6A8F-2AF5-43C7-8E01-9808E865BCF0}
-	EndGlobalSection
-EndGlobal
--- a/MSI/Base/Main/Makefile
+++ b/MSI/Base/Main/Makefile
--- a/MSI/Base/locale/MSIBase.pot
+++ b/MSI/Base/locale/MSIBase.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/MSI/Base/Main\n"
-"X-Poedit-SearchPath-1: ver1.1/MSI/Base/Main\n"
-"X-Poedit-SearchPath-2: ver1.0/MSI/Base/Main\n"
+"X-Poedit-SearchPath-1: ver1.0/MSI/Base/Main\n"

 #: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
 #: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
@@ -27,10 +26,6 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""

@@ -50,14 +45,6 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
 msgstr ""

@@ -69,9 +56,5 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSILocal.mak
+++ b/MSILocal.mak
--- a/BIN
+++ b/BIN
--- a/MakefileLang.mak
+++ b/MakefileLang.mak
--- a/MakefileLangPlatCfg.mak
+++ b/MakefileLangPlatCfg.mak
--- a/MakefilePlat.mak
+++ b/MakefilePlat.mak
--- a/MakefilePlatCfg.mak
+++ b/MakefilePlatCfg.mak
--- a/MsiUseFeature/MsiUseFeature.rc
+++ b/MsiUseFeature/MsiUseFeature.rc
--- a/MsiUseFeature/MsiUseFeature.vcxproj
+++ b/MsiUseFeature/MsiUseFeature.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{679D03C5-CD70-4FFA-93F8-A4AB3637509B}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>MsiUseFeature</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="MsiUseFeature.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="MsiUseFeature.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,9 +91,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -147,7 +101,7 @@
    <ResourceCompile Include="MsiUseFeature.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
    - PAP
    - MSCHAPv2
    - EAP-MSCHAPv2
-    - EAP-GTC: Challenge/Response and Password authentication modes
    - System-installed EAP method chaining (experimental)

 ### Security
@@ -32,17 +31,14 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
 - Lockable network profile configuration

 ### Deployment
- Released as multi-lingual x86, x64, and ARM64 MSI packages; Group Policy deployment supported
- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/master/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/master/CredWrite) for automated user credential import to Credential Manager
- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/master/WLANManager) to allow network profile configuration dialog shortcuts
+- Released as multi-lingual 32 and 64-bit MSI packages; Group Policy deployment supported
+- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
+- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/CredWrite) for automated user credential import to Credential Manager
+- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/WLANManager) to allow network profile configuration dialog shortcuts

 ### Supported operating systems
 - Windows Vista, Windows Server 2008
 - Windows 7, Windows Server 2008 R2
- Windows 8 Desktop, Windows Server 2012
- Windows 8.1 Desktop, Windows Server 2012 R2
- Windows 10 Desktop, Windows Server 2016

 ## Download
 Binaries are available for download [here](https://github.com/Amebis/GEANTLink/releases).
@@ -51,36 +47,29 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r

 ### Building Environment Requirements
 - Microsoft Windows Vista or later
- Microsoft Visual Studio 2017
+- Microsoft Visual Studio 2010 SP1
 - _msgfmt.exe_ from [gettext](https://www.gnu.org/software/gettext/);
  Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add `GettextTools\bin` folder to the system path.
 - _sed.exe_ and _grep.exe_
 - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.

 ### wxWidgets
-GÉANTLink is using wxWidgets static libraries. Since upstream wxWidgets libraries don't support ARM64 yet, a clone with ARM64 support was prepared at [GitHub](https://github.com/Amebis/wxWidgets.git).
+GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).

-#### Compiling wxWidgets x86 static libraries
-1. Start _x86 Native Tools Command Prompt for VS 2017_
+#### Compiling wxWidgets Win32 static libraries
+1. Start _Visual Studio Command Prompt (2010)_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release`

 #### Compiling wxWidgets x64 static libraries
-1. Start _x64 Native Tools Command Prompt for VS 2017_
+1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
-
-#### Compiling wxWidgets ARM64 static libraries
-1. Start command prompt
-2. Change working folder to `build\msw`
-3. Run: `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release`

 #### Specifying wxWidgets path
-GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`).
+GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.0.2`).

 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
@@ -100,7 +89,7 @@ GÉANTLink has some submodules. When cloning Git repository, make sure to use `-

 After clone is complete, grant _Users_ local group read and execute permissions to `output` subfolder (when working folder is private). This allows _EapHost_ service to load GÉANTLink's DLL, and Event Viewer to display GÉANTLink events.

-GÉANTLink can be build and debugged opening _GEANTLink.sln_ in Visual C++ IDE.
+GÉANTLink can be build and debugged opening _VS10Solution.sln_ in Visual C++ 2010 IDE.

 Before one can attempt to debug EAP DLLs, you should run `nmake register` from an elevated command prompt. See _Building in command line_ chapter below.

@@ -109,7 +98,7 @@ Next, one must configure a network profile actually using GÉANTLink for the aut
 GÉANTLink EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).

 ##### Backend DLL
-The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _GEANTLink.sln_, and attach to the running _Eap3Host.exe_ process.
+The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to the running _Eap3Host.exe_ process.

 On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. To release our DLL (i.e. for rebuild) you have to restart _EapHost_ service manually or run `nmake register` again.

@@ -123,7 +112,7 @@ A few seconds after desired function call has finished, _DllHost.exe_ terminates
 To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts.

 #### Building in command line
-Open _x64 Native Tools Command Prompt for VS 2017_ for building.
+Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the system path.

 Use Microsoft NMAKE to build the project.

--- a/VS10Solution.sln
+++ b/VS10Solution.sln
@@ -0,0 +1,261 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+		include\Version.h = include\Version.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase_UI", "lib\EAPBase_UI\build\EAPBase_UI.vcxproj", "{D4B54856-BE1F-4937-A8F7-495125BE76BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP", "lib\PAP\build\PAP.vcxproj", "{36B0CF8A-7794-46C3-8099-825BA962B4C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS", "lib\TLS\build\TLS.vcxproj", "{4D40CB8A-812E-4F12-B23A-31AF743878E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS", "lib\TTLS\build\TTLS.vcxproj", "{EE0EF0D9-A475-4038-8637-5754724F65B0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP_UI", "lib\PAP_UI\build\PAP_UI.vcxproj", "{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS_UI", "lib\TLS_UI\build\TLS_UI.vcxproj", "{9A25C261-8ADE-4938-8393-E857EF0E37E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS_UI", "lib\TTLS_UI\build\TTLS_UI.vcxproj", "{42F0F0F4-C928-4860-A4E4-94991C2C3D90}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeature\MsiUseFeature.vcxproj", "{679D03C5-CD70-4FFA-93F8-A4AB3637509B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\build\MSCHAPv2.vcxproj", "{86A6D6A0-4B7D-4134-BE81-A5755C77584D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.Build.0 = Debug|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.ActiveCfg = Debug|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.Build.0 = Debug|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.ActiveCfg = Release|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.Build.0 = Debug|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.ActiveCfg = Debug|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.ActiveCfg = Release|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.Build.0 = Release|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.Build.0 = Debug|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.ActiveCfg = Release|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.Build.0 = Release|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.Build.0 = Debug|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.ActiveCfg = Debug|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.ActiveCfg = Release|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.Build.0 = Release|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.ActiveCfg = Release|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.Build.0 = Debug|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.ActiveCfg = Debug|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.ActiveCfg = Release|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.Build.0 = Release|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.ActiveCfg = Release|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.Build.0 = Debug|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.ActiveCfg = Debug|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.ActiveCfg = Release|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.Build.0 = Release|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.ActiveCfg = Release|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.Build.0 = Debug|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.ActiveCfg = Debug|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.ActiveCfg = Release|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.Build.0 = Release|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.ActiveCfg = Release|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.Build.0 = Debug|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.ActiveCfg = Debug|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.ActiveCfg = Release|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.Build.0 = Release|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.ActiveCfg = Release|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.Build.0 = Debug|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.ActiveCfg = Debug|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.ActiveCfg = Release|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.Build.0 = Release|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.ActiveCfg = Release|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.Build.0 = Debug|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.ActiveCfg = Debug|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.ActiveCfg = Release|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.Build.0 = Release|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.ActiveCfg = Release|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.Build.0 = Debug|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.ActiveCfg = Debug|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.ActiveCfg = Release|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.Build.0 = Release|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.ActiveCfg = Release|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.Build.0 = Debug|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.ActiveCfg = Debug|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.ActiveCfg = Release|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.Build.0 = Release|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.ActiveCfg = Release|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.Build.0 = Debug|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.ActiveCfg = Debug|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.ActiveCfg = Release|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.Build.0 = Release|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.ActiveCfg = Release|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.Build.0 = Debug|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.ActiveCfg = Debug|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.ActiveCfg = Release|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.Build.0 = Release|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.ActiveCfg = Release|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.Build.0 = Debug|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.ActiveCfg = Release|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.Build.0 = Release|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.Build.0 = Debug|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.ActiveCfg = Debug|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.ActiveCfg = Release|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.Build.0 = Release|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.ActiveCfg = Release|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.Build.0 = Debug|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.ActiveCfg = Debug|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.ActiveCfg = Release|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.Build.0 = Release|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.Build.0 = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.ActiveCfg = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.Build.0 = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.Build.0 = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.ActiveCfg = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.Build.0 = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{EE0EF0D9-A475-4038-8637-5754724F65B0} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+	EndGlobalSection
+EndGlobal
--- a/WLANManager/MSIBuild/Makefile
+++ b/WLANManager/MSIBuild/Makefile
--- a/WLANManager/README.md
+++ b/WLANManager/README.md
@@ -1,13 +1,12 @@
-# WLANManager
+#WLANManager
 Invokes standard Windows Wireless Network Properties dialog

-## Usage
+##Usage
 ```
-WLANManager profile <profile name> [interface <interface name>]
+WLANManager profile <name> [interface <name>]
 ```

- `profile name`   - The name of the network profile (not neccessarely the same as SSID)
- `interface name` - The name of the specific network interface to search the profile at
+- `name` - The name of the network profile (not neccessarely the same as SSID)

 Return codes:
 - -1 = Invalid parameters
--- a/WLANManager/WLANManager.rc
+++ b/WLANManager/WLANManager.rc
--- a/WLANManager/WLANManager.vcxproj
+++ b/WLANManager/WLANManager.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>WLANManager</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="WLANManager.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="WLANManager.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,16 +91,14 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="WLANManager.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/WLANManager/locale/WLANManager.pot
+++ b/WLANManager/locale/WLANManager.pot
@@ -16,8 +16,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/WLANManager\n"
-"X-Poedit-SearchPath-1: ver1.1/WLANManager\n"
-"X-Poedit-SearchPath-2: ver1.0/WLANManager\n"
+"X-Poedit-SearchPath-1: ver1.0/WLANManager\n"

 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
--- a/include/ARM64.props
+++ b/include/ARM64.props
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2016-2018 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>wxNO_GL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineARM64</TargetMachine>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalDependencies>advapi32.lib;ole32.lib;oleaut32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
--- a/include/Common.props
+++ b/include/Common.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2018 Amebis
+    Copyright 2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -28,12 +28,11 @@
    <OutDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
    <IncludePath>$(WXWIN)\include\msvc;$(WXWIN)\include;$(IncludePath)</IncludePath>
    <SourcePath>$(WXWIN)\src\aui;$(WXWIN)\src\cocoa;$(WXWIN)\src\common;$(WXWIN)\src\dfb;$(WXWIN)\src\expat;$(WXWIN)\src\generic;$(WXWIN)\src\gtk;$(WXWIN)\src\gtk1;$(WXWIN)\src\html;$(WXWIN)\src\jpeg;$(WXWIN)\src\motif;$(WXWIN)\src\msdos;$(WXWIN)\src\msw;$(WXWIN)\src\os2;$(WXWIN)\src\osx;$(WXWIN)\src\png;$(WXWIN)\src\propgrid;$(WXWIN)\src\regex;$(WXWIN)\src\ribbon;$(WXWIN)\src\richtext;$(WXWIN)\src\stc;$(WXWIN)\src\tiff;$(WXWIN)\src\univ;$(WXWIN)\src\unix;$(WXWIN)\src\x11;$(WXWIN)\src\xml;$(WXWIN)\src\xrc;$(WXWIN)\src\zlib;$(SourcePath)</SourcePath>
-    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;wxMSVC_VERSION=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -47,9 +46,6 @@
    <POCompile>
      <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
    </POCompile>
-    <Manifest>
-      <EnableDpiAwareness>true</EnableDpiAwareness>
-    </Manifest>
  </ItemDefinitionGroup>
  <ItemGroup />
 </Project>
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2018 Amebis
+    Copyright 2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -26,6 +26,7 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <SmallerTypeCheck>true</SmallerTypeCheck>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    </ClCompile>
    <ResourceCompile>
--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/Version.h
+++ b/include/Version.h
@@ -29,7 +29,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01020900
+#define PRODUCT_VERSION          0x01010800

 //
 // Product version by components
@@ -38,27 +38,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      1
-#define PRODUCT_VERSION_MIN      2
-#define PRODUCT_VERSION_REV      9
+#define PRODUCT_VERSION_MIN      1
+#define PRODUCT_VERSION_REV      8
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.2e"
+#define PRODUCT_VERSION_STR      "1.1e"
 #define PRODUCT_BUILD_YEAR_STR   "2018"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.2.9"
+#define PRODUCT_VERSION_INST     "1.1.8"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{81CC33C6-8914-4D56-9568-5B8409ADCA64}"
+#define PRODUCT_VERSION_GUID     "{D8433722-C547-4CFC-B625-4351B0E90BBA}"

 //
 // Product vendor
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -24,7 +24,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc_lib;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Lib>
--- a/include/x64.props
+++ b/include/x64.props
@@ -24,7 +24,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc_x64_lib;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Lib>
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+/GTC
+/GTC_UI
--- a/lib/EAPBase/build/EAPBase.vcxproj
+++ b/lib/EAPBase/build/EAPBase.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{AD6816A0-9600-4E01-8C49-39D03D1E791F}</ProjectGuid>
    <RootNamespace>EAPBase</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Credentials.h" />
@@ -127,7 +85,6 @@
    <ClInclude Include="..\include\EAPXML.h" />
    <ClInclude Include="..\include\Method.h" />
    <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\UIContext.h" />
    <ClInclude Include="..\src\StdAfx.h" />
  </ItemGroup>
  <ItemGroup>
@@ -140,11 +97,8 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
--- a/lib/EAPBase/build/EAPBase.vcxproj.filters
+++ b/lib/EAPBase/build/EAPBase.vcxproj.filters
@@ -32,9 +32,6 @@
    <ClInclude Include="..\include\Credentials.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\include\UIContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\StdAfx.cpp">
@@ -55,8 +52,5 @@
    <ClCompile Include="..\src\EAP.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
 </Project>
--- a/lib/EAPBase/include/Credentials.h
+++ b/lib/EAPBase/include/Credentials.h
@@ -226,98 +226,6 @@ namespace eap
    };


-    ///
-    /// Identity-only based method credentials
-    ///
-    class credentials_identity : public credentials
-    {
-    public:
-        ///
-        /// Constructs credentials
-        ///
-        /// \param[in] mod  EAP module to use for global services
-        ///
-        credentials_identity(_In_ module &mod);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        credentials_identity(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        credentials_identity(_Inout_ credentials_identity &&other);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_Inout_ credentials_identity &&other);
-
-        virtual config* clone() const;
-
-        /// \name XML management
-        /// @{
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        /// @}
-
-        /// \name Storage
-        /// @{
-        virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
-        virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
-
-        ///
-        /// @copydoc eap::credentials::target_suffix()
-        /// \returns This implementation always returns `_T("pass")`
-        ///
-        virtual LPCTSTR target_suffix() const;
-        /// @}
-
-        ///
-        /// Combine credentials in the following order:
-        ///
-        /// 1. Cached credentials
-        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
-        /// 3. Stored credentials
-        ///
-        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
-        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
-        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
-        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
-        ///
-        /// \returns
-        /// - \c source_cache   Credentials were obtained from EapHost cache
-        /// - \c source_config  Credentials were set by method configuration
-        /// - \c source_storage Credentials were loaded from Windows Credential Manager
-        ///
-        virtual source_t combine(
-            _In_             DWORD         dwFlags,
-            _In_             HANDLE        hTokenImpersonateUser,
-            _In_opt_   const credentials   *cred_cached,
-            _In_       const config_method &cfg,
-            _In_opt_z_       LPCTSTR       pszTargetName);
-    };
-
-
    ///
    /// Password based method credentials
    ///
--- a/lib/EAPBase/include/EAP.h
+++ b/lib/EAPBase/include/EAP.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -651,7 +651,7 @@ namespace eap
    ///
    /// Sanitizing BLOB of fixed size
    ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f<N>
    {
        unsigned char data[N]; ///< BLOB data

@@ -672,16 +672,6 @@ namespace eap
            memcpy(data, other.data, N);
        }

-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        inline sanitizing_blob_f(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            memcpy(data, other.data, N);
-        }
-
        ///
        /// Moves the BLOB
        ///
@@ -718,21 +708,7 @@ namespace eap
        ///
        /// Moves the BLOB
        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_f& operator=(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  Zero-initialized BLOB to move from
+        /// \param[inout] other  Zero-initialized BLOB to copy from
        ///
        /// \returns Reference to this object
        ///
@@ -802,7 +778,7 @@ namespace eap
    ///
    /// Sanitizing BLOB of fixed size (zero initialized)
    ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf : sanitizing_blob_f<N>
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf<N> : sanitizing_blob_f<N>
    {
        ///
        /// Constructor
@@ -812,27 +788,6 @@ namespace eap
            memset(data, 0, N);
        }

-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  Zero-initialized BLOB to copy from
-        ///
-        inline sanitizing_blob_zf(_In_ const sanitizing_blob_zf<N> &other) :
-            sanitizing_blob_f<N>(other)
-        {
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  Zero-initialized BLOB to move from
-        ///
-        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
-            sanitizing_blob_f<N>(std::move(other))
-        {
-            memset(other.data, 0, N);
-        }
-
        ///
        /// Copies a BLOB
        ///
@@ -843,72 +798,14 @@ namespace eap
        {
        }

-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_f<N> &&other) :
-            sanitizing_blob_f<N>(std::move(other))
-        {
-        }
-
-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  Zero-initialized BLOB to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_zf<N> &other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
        ///
        /// Moves the BLOB
        ///
        /// \param[inout] other  Zero-initialized BLOB to move from
        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_zf<N> &&other)
+        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
+            sanitizing_blob_f<N>(std::move(other))
        {
-            if (this != std::addressof(other)) {
-                memcpy(data, other.data, N);
-                memset(other.data, 0, N);
-            }
-            return *this;
-        }
-
-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  BLOB to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_f<N> &other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
        }
    };
 #pragma pack(pop)
--- a/lib/EAPBase/include/UIContext.h
+++ b/lib/EAPBase/include/UIContext.h
@@ -1,102 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class ui_context;
-}
-
-#pragma once
-
-#include "Config.h"
-#include "Credentials.h"
-#include "Module.h"
-
-#include "../../../include/Version.h"
-
-
-namespace eap
-{
-    ///
-    /// \defgroup EAPBaseUICtx  UI Context
-    /// Back and front-end inter-process data exchange
-    ///
-    /// @{
-
-    ///
-    /// UI context
-    ///
-    class ui_context : public packable
-    {
-    public:
-        ///
-        /// Constructs context
-        ///
-        /// \param[in] cfg   Connection configuration
-        /// \param[in] cred  Connection credentials
-        ///
-        ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        ui_context(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        ui_context(_Inout_ ui_context &&other);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_Inout_ ui_context &&other);
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-    public:
-        config_connection &m_cfg;       ///< Connection configuration
-        credentials_connection &m_cred; ///< Connection credentials
-    };
-
-    /// @}
-}
--- a/lib/EAPBase/src/Credentials.cpp
+++ b/lib/EAPBase/src/Credentials.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -163,183 +163,6 @@ tstring eap::credentials::get_name() const
 }


-//////////////////////////////////////////////////////////////////////
-// eap::credentials_identity
-//////////////////////////////////////////////////////////////////////
-
-eap::credentials_identity::credentials_identity(_In_ module &mod) : credentials(mod)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_In_ const credentials_identity &other) : credentials(other)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_Inout_ credentials_identity &&other) : credentials(std::move(other))
-{
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_In_ const credentials_identity &other)
-{
-    if (this != &other)
-        (credentials&)*this = other;
-
-    return *this;
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_Inout_ credentials_identity &&other)
-{
-    if (this != &other)
-        (credentials&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::credentials_identity::clone() const
-{
-    return new credentials_identity(*this);
-}
-
-
-void eap::credentials_identity::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    // We could have used credentials::save() to save identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::save(pDoc, pConfigRoot);
-
-    HRESULT hr;
-
-    // <UserName>
-    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), namespace_eapmetadata, bstr(m_identity))))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
-}
-
-
-void eap::credentials_identity::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-
-    // We could have used credentials::load() to load identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::load(pConfigRoot);
-
-    wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:UserName"), m_identity)))
-        throw com_runtime_error(hr, __FUNCTION__ " Error reading <UserName> element.");
-
-    m_module.log_config((xpath + L"/UserName").c_str(), m_identity.c_str());
-}
-
-
-void eap::credentials_identity::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const
-{
-    assert(pszTargetName);
-
-    tstring target(target_name(pszTargetName, level));
-
-    // Write credentials.
-    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH);
-    CREDENTIAL cred = {
-        0,                                     // Flags
-        CRED_TYPE_GENERIC,                     // Type
-        const_cast<LPTSTR>(target.c_str()),    // TargetName
-        _T(""),                                // Comment
-        { 0, 0 },                              // LastWritten
-        0,                                     // CredentialBlobSize
-        NULL,                                  // CredentialBlob
-        CRED_PERSIST_ENTERPRISE,               // Persist
-        0,                                     // AttributeCount
-        NULL,                                  // Attributes
-        NULL,                                  // TargetAlias
-        const_cast<LPTSTR>(m_identity.c_str()) // UserName
-    };
-    if (!CredWrite(&cred, 0))
-        throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
-}
-
-
-void eap::credentials_identity::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level)
-{
-    assert(pszTargetName);
-
-    // Read credentials.
-    unique_ptr<CREDENTIAL, CredFree_delete<CREDENTIAL> > cred;
-    if (!CredRead(target_name(pszTargetName, level).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
-        throw win_runtime_error(__FUNCTION__ " CredRead failed.");
-
-    if (cred->UserName)
-        m_identity = cred->UserName;
-    else
-        m_identity.clear();
-
-    wstring xpath(pszTargetName);
-    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
-}
-
-
-LPCTSTR eap::credentials_identity::target_suffix() const
-{
-    return _T("id");
-}
-
-
-eap::credentials::source_t eap::credentials_identity::combine(
-    _In_             DWORD         dwFlags,
-    _In_             HANDLE        hTokenImpersonateUser,
-    _In_opt_   const credentials   *cred_cached,
-    _In_       const config_method &cfg,
-    _In_opt_z_       LPCTSTR       pszTargetName)
-{
-    UNREFERENCED_PARAMETER(dwFlags);
-
-    if (cred_cached) {
-        // Using EAP service cached credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_cache;
-    }
-
-    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
-    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
-        // Using configured credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cfg_with_cred->m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_config;
-    }
-
-    if (pszTargetName) {
-        // Switch user context.
-        user_impersonator impersonating(hTokenImpersonateUser);
-
-        try {
-            credentials_identity cred_loaded(m_module);
-            cred_loaded.retrieve(pszTargetName, cfg.m_level);
-
-            // Using stored credentials.
-            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-            return source_storage;
-        } catch (...) {
-            // Not actually an error.
-        }
-    }
-
-    return source_unknown;
-}
-
-
 //////////////////////////////////////////////////////////////////////
 // eap::credentials_pass
 //////////////////////////////////////////////////////////////////////
@@ -919,8 +742,8 @@ inline static basic_string<_Elem, _Traits, _Ax> kph_encode(_In_ unsigned char da
 {
    // Encode one byte of data.
    _Elem str[3] = {
-        static_cast<_Elem>('A' + (data >> 4       )),
-        static_cast<_Elem>('a' + (data      & 0x0f)),
+        'A' + (data >> 4       ),
+        'a' + (data      & 0x0f),
    };
    return str;
 } 
--- a/lib/EAPBase/src/StdAfx.h
+++ b/lib/EAPBase/src/StdAfx.h
@@ -24,7 +24,6 @@
 #include "../include/Credentials.h"
 #include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/UIContext.h"

 #include "../include/EAP.h"
 #include "../include/EAPXML.h"
--- a/lib/EAPBase/src/UIContext.cpp
+++ b/lib/EAPBase/src/UIContext.cpp
@@ -1,100 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::ui_context
-//////////////////////////////////////////////////////////////////////
-
-eap::ui_context::ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred) :
-    m_cfg(cfg),
-    m_cred(cred)
-{
-}
-
-
-eap::ui_context::ui_context(_In_ const ui_context &other) :
-    m_cfg   (other.m_cfg ),
-    m_cred  (other.m_cred),
-    packable(other       )
-{
-}
-
-
-eap::ui_context::ui_context(_Inout_ ui_context &&other) :
-    m_cfg   (          other.m_cfg  ),
-    m_cred  (          other.m_cred ),
-    packable(std::move(other       ))
-{
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_In_ const ui_context &other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Copy context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Copy context within same credentials only!
-        (packable&)*this = other;
-    }
-
-    return *this;
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_Inout_ ui_context &&other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move context within same credentials only!
-        (packable&)*this = std::move(other);
-    }
-
-    return *this;
-}
-
-
-void eap::ui_context::operator<<(_Inout_ cursor_out &cursor) const
-{
-    packable::operator<<(cursor);
-    cursor << m_cfg ;
-    cursor << m_cred;
-}
-
-
-size_t eap::ui_context::get_pk_size() const
-{
-    return
-        packable::get_pk_size() +
-        pksizeof(m_cfg ) +
-        pksizeof(m_cred);
-}
-
-
-void eap::ui_context::operator>>(_Inout_ cursor_in &cursor)
-{
-    packable::operator>>(cursor);
-    cursor >> m_cfg ;
-    cursor >> m_cred;
-}
--- a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj
+++ b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{D4B54856-BE1F-4937-A8F7-495125BE76BE}</ProjectGuid>
    <RootNamespace>EAPBase_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\EAP_UI.h" />
    <ClInclude Include="..\include\Module.h" />
@@ -135,9 +93,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -43,7 +43,6 @@ class wxEAPProviderIDPanel;
 class wxEAPConfigProvider;
 template <class _Tcred, class _wxT> class wxEAPCredentialsConfigPanel;
 template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
-template <class _Tcred, class _Tbase> class wxIdentityCredentialsPanel;
 template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
 class wxEAPProviderSelectDialog;

@@ -918,7 +917,7 @@ public:
        if (!is_config && !m_cfg.m_use_cred && m_cfg.m_allow_save) {
            m_remember = new wxCheckBox(m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"));
            m_remember->SetHelpText(_("Check if you would like to save credentials"));
-            m_sb_credentials_vert->Add(m_remember, 0, wxALL|wxEXPAND, FromDIP(5));
+            m_sb_credentials_vert->Add(m_remember, 0, wxALL|wxEXPAND, 5);
        } else
            m_remember = NULL;
    }
@@ -954,14 +953,14 @@ protected:


 ///
-/// Generic identity credential entry panel
+/// Generic password credential entry panel
 ///
 template <class _Tcred, class _Tbase>
-class wxIdentityCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
+class wxPasswordCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
 {
 public:
    ///
-    /// Constructs a identity credentials panel
+    /// Constructs a password credentials panel
    ///
    /// \param[in]    prov       Provider configuration data
    /// \param[in]    cfg        Method configuration data
@@ -969,18 +968,19 @@ public:
    /// \param[in]    parent     Parent window
    /// \param[in]    is_config  Is this panel used to config credentials?
    ///
-    wxIdentityCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+        m_password_set(false),
        wxEAPCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
    {
        // Load and set icon.
        winstd::library lib_shell32;
-        if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(/*16770*/269)));
+        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));

        bool layout = false;
        if (!m_prov.m_lbl_alt_credential.empty()) {
            m_credentials_label->SetLabel(m_prov.m_lbl_alt_credential);
-            m_credentials_label->Wrap( FromDIP(440) );
+            m_credentials_label->Wrap( 440 );
            layout = true;
        }

@@ -989,6 +989,11 @@ public:
            layout = true;
        }

+        if (!m_prov.m_lbl_alt_password.empty()) {
+            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
+            layout = true;
+        }
+
        if (layout)
            this->Layout();
    }
@@ -1000,85 +1005,26 @@ protected:
    {
        m_identity->SetValue(m_cred.m_identity);
        m_identity->SetSelection(0, -1);
-
-        if (!m_is_config && m_cfg.m_use_cred) {
-            // Credential prompt mode & Using configured credentials
-            m_identity_label->Enable(false);
-            m_identity      ->Enable(false);
-        }
-
-        return wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
-    }
-
-    virtual bool TransferDataFromWindow()
-    {
-        if (!wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
-            return false;
-
-        m_cred.m_identity = m_identity->GetValue();
-
-        return true;
-    }
-
-    /// \endcond
-};
-
-/// @}
-
-
-///
-/// Generic password credential entry panel
-///
-template <class _Tcred, class _Tbase>
-class wxPasswordCredentialsPanel : public wxIdentityCredentialsPanel<_Tcred, _Tbase>
-{
-public:
-    ///
-    /// Constructs a password credentials panel
-    ///
-    /// \param[in]    prov       Provider configuration data
-    /// \param[in]    cfg        Method configuration data
-    /// \param[inout] cred       Credentials data
-    /// \param[in]    parent     Parent window
-    /// \param[in]    is_config  Is this panel used to config credentials?
-    ///
-    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
-        m_password_set(false),
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
-    {
-        // Load and set icon.
-        winstd::library lib_shell32;
-        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));
-
-        if (!m_prov.m_lbl_alt_password.empty()) {
-            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
-            this->Layout();
-        }
-    }
-
-protected:
-    /// \cond internal
-
-    virtual bool TransferDataToWindow()
-    {
        m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : wxT("dummypass"));
        m_password_set = false;

        if (!m_is_config && m_cfg.m_use_cred) {
            // Credential prompt mode & Using configured credentials
+            m_identity_label->Enable(false);
+            m_identity      ->Enable(false);
            m_password_label->Enable(false);
            m_password      ->Enable(false);
        }

-        return wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
+        return wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataToWindow();
    }

    virtual bool TransferDataFromWindow()
    {
-        if (!wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
+        if (!wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataFromWindow())
            return false;

+        m_cred.m_identity = m_identity->GetValue();
        if (m_password_set)
            m_cred.m_password = m_password->GetValue();

@@ -1087,7 +1033,7 @@ protected:

    virtual void OnPasswordText(wxCommandEvent& event)
    {
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);
+        wxEAPCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);

        m_password_set = true;
    }
--- a/lib/EAPBase_UI/res/wxEAP_UI.cpp
+++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp
--- a/lib/EAPBase_UI/res/wxEAP_UI.fbp
+++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp
--- a/lib/EAPBase_UI/res/wxEAP_UI.h
+++ b/lib/EAPBase_UI/res/wxEAP_UI.h
@@ -1,339 +1,319 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Aug  8 2018)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO *NOT* EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXEAP_UI_H__
-#define __WXEAP_UI_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include "../include/wxEAP_UIBase.h"
-class wxEAPBannerPanel;
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/string.h>
-#include <wx/notebook.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/dialog.h>
-#include <wx/stattext.h>
-#include <wx/panel.h>
-#include <wx/statbmp.h>
-#include <wx/radiobut.h>
-#include <wx/statbox.h>
-#include <wx/timer.h>
-#include <wx/textctrl.h>
-#include <wx/choice.h>
-#include <wx/checkbox.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPConfigDialogBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPConfigDialogBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxEAPBannerPanel *m_banner;
-		wxNotebook* m_providers;
-		wxButton* m_prov_add;
-		wxButton* m_prov_remove;
-		wxButton* m_prov_advanced;
-		wxStdDialogButtonSizer* m_buttons;
-		wxButton* m_buttonsOK;
-		wxButton* m_buttonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~wxEAPConfigDialogBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPGeneralDialogBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPGeneralDialogBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxEAPBannerPanel *m_banner;
-		wxBoxSizer* m_panels;
-		wxStdDialogButtonSizer* m_buttons;
-		wxButton* m_buttonsOK;
-		wxButton* m_buttonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~wxEAPGeneralDialogBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPCredentialsConnectionDialogBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPCredentialsConnectionDialogBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxEAPBannerPanel *m_banner;
-		wxStdDialogButtonSizer* m_buttons;
-		wxButton* m_buttonsOK;
-		wxButton* m_buttonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxNotebook* m_providers;
-		
-		wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~wxEAPCredentialsConnectionDialogBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPBannerPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPBannerPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-	
-	public:
-		wxStaticText* m_title;
-		
-		wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0, const wxString& name = wxEmptyString ); 
-		~wxEAPBannerPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPNotePanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPNotePanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_note_icon;
-		wxBoxSizer* m_note_vert;
-		wxStaticText* m_note_label;
-	
-	public:
-		
-		wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL|wxBORDER_SIMPLE, const wxString& name = wxEmptyString ); 
-		~wxEAPNotePanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPCredentialsConfigPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPCredentialsConfigPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_credentials;
-		wxStaticBitmap* m_credentials_icon;
-		wxStaticText* m_credentials_label;
-		wxRadioButton* m_storage;
-		wxStaticText* m_storage_identity_label;
-		wxStaticText* m_storage_identity;
-		wxButton* m_storage_clear;
-		wxButton* m_storage_set;
-		wxRadioButton* m_config;
-		wxStaticText* m_config_identity_label;
-		wxStaticText* m_config_identity;
-		wxButton* m_config_set;
-		wxTimer m_timer_storage;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxEAPCredentialsConfigPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxPasswordCredentialsPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_credentials;
-		wxStaticBitmap* m_credentials_icon;
-		wxBoxSizer* m_sb_credentials_vert;
-		wxStaticText* m_credentials_label;
-		wxStaticText* m_identity_label;
-		wxTextCtrl* m_identity;
-		wxStaticText* m_password_label;
-		wxTextCtrl* m_password;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxPasswordCredentialsPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxIdentityCredentialsPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_credentials;
-		wxStaticBitmap* m_credentials_icon;
-		wxBoxSizer* m_sb_credentials_vert;
-		wxStaticText* m_credentials_label;
-		wxStaticText* m_identity_label;
-		wxTextCtrl* m_identity;
-	
-	public:
-		
-		wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxIdentityCredentialsPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPProviderContactInfoPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPProviderContactInfoPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_provider_contact_icon;
-		wxStaticText* m_provider_contact_label;
-		wxStaticText* m_provider_name_label;
-		wxTextCtrl* m_provider_name;
-		wxStaticText* m_provider_name_note;
-		wxStaticText* m_provider_helpdesk_label;
-		wxStaticText* m_provider_web_icon;
-		wxTextCtrl* m_provider_web;
-		wxStaticText* m_provider_email_icon;
-		wxTextCtrl* m_provider_email;
-		wxStaticText* m_provider_phone_icon;
-		wxTextCtrl* m_provider_phone;
-	
-	public:
-		
-		wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxEAPProviderContactInfoPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPProviderIDPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPProviderIDPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_provider_id_icon;
-		wxStaticText* m_provider_id_label_outer;
-		wxStaticText* m_provider_namespace_label;
-		wxChoice* m_provider_namespace;
-		wxStaticText* m_provider_id_label;
-		wxTextCtrl* m_provider_id;
-	
-	public:
-		
-		wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxEAPProviderIDPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPProviderLockPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPProviderLockPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_provider_lock_icon;
-		wxStaticText* m_provider_lock_label;
-		wxCheckBox* m_provider_lock;
-		wxStaticText* m_provider_lock_note;
-	
-	public:
-		
-		wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); 
-		~wxEAPProviderLockPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxEAPProviderSelectDialogBase
-///////////////////////////////////////////////////////////////////////////////
-class wxEAPProviderSelectDialogBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxEAPBannerPanel *m_banner;
-		wxBoxSizer* m_providers;
-		wxStdDialogButtonSizer* m_buttons;
-		wxButton* m_buttonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~wxEAPProviderSelectDialogBase();
-	
-};
-
-#endif //__WXEAP_UI_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __WXEAP_UI_H__
+#define __WXEAP_UI_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+class wxEAPCredentialsPanelBase;
+
+#include "../include/wxEAP_UIBase.h"
+class wxEAPBannerPanel;
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/string.h>
+#include <wx/notebook.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/dialog.h>
+#include <wx/stattext.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/statbmp.h>
+#include <wx/radiobut.h>
+#include <wx/statbox.h>
+#include <wx/timer.h>
+#include <wx/textctrl.h>
+#include <wx/choice.h>
+#include <wx/checkbox.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPConfigDialogBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPConfigDialogBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxEAPBannerPanel *m_banner;
+		wxNotebook* m_providers;
+		wxButton* m_prov_add;
+		wxButton* m_prov_remove;
+		wxButton* m_prov_advanced;
+		wxStdDialogButtonSizer* m_buttons;
+		wxButton* m_buttonsOK;
+		wxButton* m_buttonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxEAPConfigDialogBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPGeneralDialogBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPGeneralDialogBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxEAPBannerPanel *m_banner;
+		wxBoxSizer* m_panels;
+		wxStdDialogButtonSizer* m_buttons;
+		wxButton* m_buttonsOK;
+		wxButton* m_buttonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxEAPGeneralDialogBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPCredentialsConnectionDialogBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPCredentialsConnectionDialogBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxEAPBannerPanel *m_banner;
+		wxStdDialogButtonSizer* m_buttons;
+		wxButton* m_buttonsOK;
+		wxButton* m_buttonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxNotebook* m_providers;
+		
+		wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxEAPCredentialsConnectionDialogBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPBannerPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPBannerPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+	
+	public:
+		wxStaticText* m_title;
+		
+		wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); 
+		~wxEAPBannerPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPNotePanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPNotePanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_note_icon;
+		wxBoxSizer* m_note_vert;
+		wxStaticText* m_note_label;
+	
+	public:
+		
+		wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); 
+		~wxEAPNotePanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPCredentialsConfigPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPCredentialsConfigPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBoxSizer* m_sb_credentials;
+		wxStaticBitmap* m_credentials_icon;
+		wxStaticText* m_credentials_label;
+		wxRadioButton* m_storage;
+		wxStaticText* m_storage_identity_label;
+		wxStaticText* m_storage_identity;
+		wxButton* m_storage_clear;
+		wxButton* m_storage_set;
+		wxRadioButton* m_config;
+		wxStaticText* m_config_identity_label;
+		wxStaticText* m_config_identity;
+		wxButton* m_config_set;
+		wxTimer m_timer_storage;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEAPCredentialsConfigPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxPasswordCredentialsPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase
+{
+	private:
+	
+	protected:
+		wxStaticBoxSizer* m_sb_credentials;
+		wxStaticBitmap* m_credentials_icon;
+		wxBoxSizer* m_sb_credentials_vert;
+		wxStaticText* m_credentials_label;
+		wxStaticText* m_identity_label;
+		wxTextCtrl* m_identity;
+		wxStaticText* m_password_label;
+		wxTextCtrl* m_password;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxPasswordCredentialsPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPProviderContactInfoPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPProviderContactInfoPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_provider_contact_icon;
+		wxStaticText* m_provider_contact_label;
+		wxStaticText* m_provider_name_label;
+		wxTextCtrl* m_provider_name;
+		wxStaticText* m_provider_name_note;
+		wxStaticText* m_provider_helpdesk_label;
+		wxStaticText* m_provider_web_icon;
+		wxTextCtrl* m_provider_web;
+		wxStaticText* m_provider_email_icon;
+		wxTextCtrl* m_provider_email;
+		wxStaticText* m_provider_phone_icon;
+		wxTextCtrl* m_provider_phone;
+	
+	public:
+		
+		wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEAPProviderContactInfoPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPProviderIDPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPProviderIDPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_provider_id_icon;
+		wxStaticText* m_provider_id_label_outer;
+		wxStaticText* m_provider_namespace_label;
+		wxChoice* m_provider_namespace;
+		wxStaticText* m_provider_id_label;
+		wxTextCtrl* m_provider_id;
+	
+	public:
+		
+		wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEAPProviderIDPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPProviderLockPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPProviderLockPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_provider_lock_icon;
+		wxStaticText* m_provider_lock_label;
+		wxCheckBox* m_provider_lock;
+		wxStaticText* m_provider_lock_note;
+	
+	public:
+		
+		wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEAPProviderLockPanelBase();
+	
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPProviderSelectDialogBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPProviderSelectDialogBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxEAPBannerPanel *m_banner;
+		wxBoxSizer* m_providers;
+		wxStdDialogButtonSizer* m_buttons;
+		wxButton* m_buttonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxEAPProviderSelectDialogBase();
+	
+};
+
+#endif //__WXEAP_UI_H__
--- a/lib/EAPBase_UI/src/EAP_UI.cpp
+++ b/lib/EAPBase_UI/src/EAP_UI.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -66,7 +66,7 @@ void wxEAPGeneralDialog::AddContent(wxPanel **contents, size_t content_count)
 {
    if (content_count) {
        for (size_t i = 0; i < content_count; i++)
-            m_panels->Add(contents[i], 0, wxALL|wxEXPAND, FromDIP(5));
+            m_panels->Add(contents[i], 0, wxALL|wxEXPAND, 5);

        this->Layout();
        this->GetSizer()->Fit(this);
@@ -138,11 +138,11 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov)
    if (!prov.m_help_email.empty() || !prov.m_help_web.empty() || !prov.m_help_phone.empty()) {
        m_provider_notice = new wxStaticText(this, wxID_ANY, wxString::Format(_("For additional help and instructions, please contact %s at:"),
            !prov.m_name.empty() ? prov.m_name.c_str() : _("your provider")), wxDefaultPosition, wxDefaultSize, 0);
-        m_provider_notice->Wrap(FromDIP(449));
-        m_note_vert->Add(m_provider_notice, 0, wxUP|wxLEFT|wxRIGHT|wxEXPAND, FromDIP(5));
+        m_provider_notice->Wrap(449);
+        m_note_vert->Add(m_provider_notice, 0, wxUP|wxLEFT|wxRIGHT|wxEXPAND, 5);

        wxFlexGridSizer* sb_contact_tbl;
-        sb_contact_tbl = new wxFlexGridSizer(0, 2, FromDIP(5), FromDIP(5));
+        sb_contact_tbl = new wxFlexGridSizer(0, 2, 5, 5);
        sb_contact_tbl->AddGrowableCol(1);
        sb_contact_tbl->SetFlexibleDirection(wxBOTH);
        sb_contact_tbl->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
@@ -153,36 +153,36 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov)
            m_help_web_label = new wxStaticText(this, wxID_ANY, wxT("\xb6"), wxDefaultPosition, wxDefaultSize, 0);
            m_help_web_label->Wrap(-1);
            m_help_web_label->SetFont(font_wingdings);
-            sb_contact_tbl->Add(m_help_web_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_web_label, 0, wxEXPAND|wxALIGN_TOP, 5);

            m_help_web_value = new wxHyperlinkCtrl(this, wxID_ANY, prov.m_help_web, prov.m_help_web, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
            m_help_web_value->SetToolTip(_("Open the default web browser"));
-            sb_contact_tbl->Add(m_help_web_value, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_web_value, 0, wxEXPAND|wxALIGN_TOP, 5);
        }

        if (!prov.m_help_email.empty()) {
            m_help_email_label = new wxStaticText(this, wxID_ANY, wxT("\x2a"), wxDefaultPosition, wxDefaultSize, 0);
            m_help_email_label->Wrap(-1);
            m_help_email_label->SetFont(font_wingdings);
-            sb_contact_tbl->Add(m_help_email_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_email_label, 0, wxEXPAND|wxALIGN_TOP, 5);

            m_help_email_value = new wxHyperlinkCtrl(this, wxID_ANY, prov.m_help_email, wxString(wxT("mailto:")) + prov.m_help_email, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
            m_help_email_value->SetToolTip(_("Open your e-mail program"));
-            sb_contact_tbl->Add(m_help_email_value, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_email_value, 0, wxEXPAND|wxALIGN_TOP, 5);
        }

        if (!prov.m_help_phone.empty()) {
            m_help_phone_label = new wxStaticText(this, wxID_ANY, wxT("\x29"), wxDefaultPosition, wxDefaultSize, 0);
            m_help_phone_label->Wrap(-1);
            m_help_phone_label->SetFont(font_wingdings);
-            sb_contact_tbl->Add(m_help_phone_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_phone_label, 0, wxEXPAND|wxALIGN_TOP, 5);

            m_help_phone_value = new wxHyperlinkCtrl(this, wxID_ANY, prov.m_help_phone, wxString(wxT("tel:")) + GetPhoneNumber(prov.m_help_phone.c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
            m_help_phone_value->SetToolTip(_("Dial the phone number"));
-            sb_contact_tbl->Add(m_help_phone_value, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));
+            sb_contact_tbl->Add(m_help_phone_value, 0, wxEXPAND|wxALIGN_TOP, 5);
        }

-        m_note_vert->Add(sb_contact_tbl, 0, wxLEFT|wxRIGHT|wxDOWN|wxEXPAND, FromDIP(5));
+        m_note_vert->Add(sb_contact_tbl, 0, wxLEFT|wxRIGHT|wxDOWN|wxEXPAND, 5);
    }
 }

@@ -202,7 +202,7 @@ wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &p

    m_note_label->SetLabel(wxString::Format(_("%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."),
        !prov.m_name.empty() ? prov.m_name.c_str() : _("Your provider")));
-    m_note_label->Wrap(FromDIP(449));
+    m_note_label->Wrap(449);

    CreateContactFields(prov);

@@ -227,7 +227,7 @@ wxEAPCredentialWarningPanel::wxEAPCredentialWarningPanel(const eap::config_provi
        status == eap::config_method::status_cred_changing ? _("Previous attempt to connect reported your credentials are being changed.") :
                                                             _("Previous attempt to connect failed.")) + " " +
        _("Please, make sure your credentials are correct, or try again later."));
-    m_note_label->Wrap(FromDIP(449));
+    m_note_label->Wrap(449);

    CreateContactFields(prov);

@@ -249,7 +249,7 @@ wxEAPCredentialLogWarningPanel::wxEAPCredentialLogWarningPanel(wxWindow* parent)

    m_note_label->SetLabel(wxString::Format(_("The %s version installed on this computer logs credentials in visible and easy to read way."), wxT(PRODUCT_NAME_STR)) + " " +
        _("Please, reconsider necessity to enter your credentials."));
-    m_note_label->Wrap(FromDIP(449));
+    m_note_label->Wrap(449);

    this->Layout();
 }
@@ -265,7 +265,7 @@ wxEAPConfigWindow::wxEAPConfigWindow(eap::config_provider &prov, eap::config_met
    m_cfg(cfg),
    wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL)
 {
-    this->SetScrollRate(FromDIP(5), FromDIP(5));
+    this->SetScrollRate(5, 5);

    // Connect Events
    this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPConfigWindow::OnInitDialog));
@@ -448,7 +448,7 @@ wxEAPProviderSelectDialog::wxEAPProviderSelectDialog(eap::config_connection &cfg
    // Iterate over providers.
    for (auto cfg_prov = cfg.m_providers.cbegin(), cfg_prov_end = cfg.m_providers.cend(); cfg_prov != cfg_prov_end; ++cfg_prov) {
        wxCommandLinkButton *btn = new wxCommandLinkButton(this, wxID_ANY, wxEAPGetProviderName(cfg_prov->m_name));
-        m_providers->Add(btn, 0, wxALL|wxEXPAND, FromDIP(5));
+        m_providers->Add(btn, 0, wxALL|wxEXPAND, 5);

        btn->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(wxEAPProviderSelectDialog::OnProvSelect), new wxVariant((void*)&*cfg_prov), this);
    }
@@ -480,7 +480,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
    m_hwnd_popup(NULL)
 {
    // Verify if the monitor is already running.
-    const WNDCLASSEX wnd_class_desc_master = {
+    const WNDCLASSEX wnd_class_desc = {
        sizeof(WNDCLASSEX), // cbSize
        0,                  // style
        winproc,            // lpfnWndProc
@@ -494,7 +494,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
        _T(__FUNCTION__),   // lpszClassName
        NULL                // hIconSm
    };
-    ATOM wnd_class = RegisterClassEx(&wnd_class_desc_master);
+    ATOM wnd_class = RegisterClassEx(&wnd_class_desc);
    if (!wnd_class)
        throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class.");
    tstring_guid guid_str(guid);
@@ -504,7 +504,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
        m_is_master = false;

        // Register slave windows class slightly different, not to include slaves in FindWindowEx().
-        const WNDCLASSEX wnd_class_desc_slave = {
+        const WNDCLASSEX wnd_class_desc = {
            sizeof(WNDCLASSEX),             // cbSize
            0,                              // style
            winproc,                        // lpfnWndProc
@@ -518,7 +518,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
            _T(__FUNCTION__) _T("-Slave"),  // lpszClassName
            NULL                            // hIconSm
        };
-        wnd_class = RegisterClassEx(&wnd_class_desc_slave);
+        wnd_class = RegisterClassEx(&wnd_class_desc);
        if (!wnd_class)
            throw win_runtime_error(__FUNCTION__ " Error registering slave monitor window class.");
    } else {
--- a/lib/EapHost/build/EapHost.vcxproj
+++ b/lib/EapHost/build/EapHost.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}</ProjectGuid>
    <RootNamespace>EapHost</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EapHost.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EapHost.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EapHost.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EapHost.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EapHost.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EapHost.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Credentials.h" />
@@ -134,9 +92,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/EapHost/src/Config.cpp
+++ b/lib/EapHost/src/Config.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -96,7 +96,7 @@ void eap::config_method_eaphost::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNo
    // Convert configuration BLOB to XML using EapHost (and ultimately method peer's EapPeerConfigBlob2Xml).
    com_obj<IXMLDOMDocument2> pConfigDoc;
    eap_error error;
-    DWORD dwResult = EapHostPeerConfigBlob2Xml(0, m_type, (DWORD)m_cfg_blob.size(), const_cast<BYTE*>(m_cfg_blob.data()), &pConfigDoc, get_ptr(error));
+    DWORD dwResult = EapHostPeerConfigBlob2Xml(0, m_type, (DWORD)m_cfg_blob.size(), const_cast<BYTE*>(m_cfg_blob.data()), &pConfigDoc, &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        HRESULT hr;

@@ -127,7 +127,7 @@ void eap::config_method_eaphost::load(_In_ IXMLDOMNode *pConfigRoot)
        DWORD cfg_data_size = 0;
        eap_blob cfg_data;
        eap_error error;
-        DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, get_ptr(cfg_data), &m_type, get_ptr(error));
+        DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, &cfg_data._Myptr, &m_type, &error._Myptr);
        if (dwResult == ERROR_SUCCESS) {
            update_type();
            const BYTE *_cfg_data = cfg_data.get();
--- a/lib/EapHost/src/Credentials.cpp
+++ b/lib/EapHost/src/Credentials.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -283,17 +283,16 @@ eap::credentials::source_t eap::credentials_eaphost::combine(
        src != source_unknown ? (DWORD)m_cred_blob.size() : 0, src != source_unknown ? m_cred_blob.data() : NULL,
        hTokenImpersonateUser,
        &fInvokeUI,
-        &cred_data_size, get_ptr(cred_data),
-        get_ptr(identity),
-        get_ptr(error),
+        &cred_data_size, &cred_data._Myptr,
+        &identity._Myptr,
+        &error._Myptr,
        NULL);
    if (dwResult == ERROR_SUCCESS) {
        if (identity && !fInvokeUI) {
            // Inner EAP method provided identity and does not require additional UI prompt.
            m_identity = identity.get();
-            BYTE *_cred_data = cred_data.get();
-            m_cred_blob.assign(_cred_data, _cred_data + cred_data_size);
-            SecureZeroMemory(_cred_data, cred_data_size);
+            m_cred_blob.assign(cred_data.get(), cred_data.get() + cred_data_size);
+            SecureZeroMemory(cred_data.get(), cred_data_size);
            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_EAPHOST, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank);
            return source_lower;
        } else
--- a/lib/EapHost/src/Method.cpp
+++ b/lib/EapHost/src/Method.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -86,7 +86,7 @@ void eap::method_eaphost::begin_session(
        dwMaxSendPacketSize,
        NULL, NULL, NULL,
        &m_session_id,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Session succesfully created.
    } else if (error)
@@ -100,7 +100,7 @@ void eap::method_eaphost::end_session()
 {
    // End EapHost peer session.
    eap_error_runtime error;
-    DWORD dwResult = EapHostPeerEndSession(m_session_id, get_ptr(error));
+    DWORD dwResult = EapHostPeerEndSession(m_session_id, &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Session successfuly ended.
    } else if (error)
@@ -126,7 +126,7 @@ EapPeerMethodResponseAction eap::method_eaphost::process_request_packet(
        dwReceivedPacketSize,
        reinterpret_cast<const BYTE*>(pReceivedPacket),
        &action,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Packet successfuly processed.
        return action_h2p(action);
@@ -147,12 +147,11 @@ void eap::method_eaphost::get_response_packet(
    DWORD dwResult = EapHostPeerGetSendPacket(
        m_session_id,
        &size_max,
-        get_ptr(_packet),
-        get_ptr(error));
+        &_packet._Myptr,
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Packet successfuly prepared.
-        const BYTE *__packet = _packet.get();
-        packet.assign(__packet, __packet + size_max);
+        packet.assign(_packet.get(), _packet.get() + size_max);
    } else if (error)
        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetSendPacket failed.");
    else
@@ -171,7 +170,7 @@ void eap::method_eaphost::get_result(
        m_session_id,
        EapHostPeerMethodResultFromMethod,
        &result,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Result successfuly returned.
        method::get_result(reason, pResult);
@@ -220,7 +219,7 @@ void eap::method_eaphost::get_ui_context(_Out_ sanitizing_blob &context_data)
        m_session_id,
        &dwUIContextDataSize,
        &pUIContextData,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // UI context data successfuly returned.
        context_data.assign(pUIContextData, pUIContextData + dwUIContextDataSize);
@@ -246,7 +245,7 @@ EapPeerMethodResponseAction eap::method_eaphost::set_ui_context(
        dwUIContextDataSize,
        pUIContextData,
        &action,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // UI context data successfuly returned.
        return action_h2p(action);
@@ -264,7 +263,7 @@ void eap::method_eaphost::get_response_attributes(_Inout_ EapAttributes *pAttrib
    DWORD dwResult = EapHostPeerGetResponseAttributes(
        m_session_id,
        pAttribs,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Response attributes successfuly returned.
    } else if (error)
@@ -283,7 +282,7 @@ EapPeerMethodResponseAction eap::method_eaphost::set_response_attributes(_In_ co
        m_session_id,
        pAttribs,
        &action,
-        get_ptr(error));
+        &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        // Response attributes successfuly set.
        return action_h2p(action);
--- a/lib/EapHost_UI/build/EapHost_UI.vcxproj
+++ b/lib/EapHost_UI/build/EapHost_UI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}</ProjectGuid>
    <RootNamespace>EapHost_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EapHost_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EapHost_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EapHost_UI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EapHost_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EapHost_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EapHost_UI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\EapHost_UI.h" />
    <ClInclude Include="..\res\wxEapHost_UI.h" />
@@ -132,9 +90,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/EapHost_UI/res/wxEapHost_UI.cpp
+++ b/lib/EapHost_UI/res/wxEapHost_UI.cpp
@@ -11,7 +11,7 @@

 ///////////////////////////////////////////////////////////////////////////

-wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style )
+wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_method;
 	sb_method = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Inner EAP Method") ), wxVERTICAL );
@@ -20,14 +20,14 @@ wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent
 	sb_method_horiz = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_method_icon = new wxStaticBitmap( sb_method->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_method_horiz->Add( m_method_icon, 0, wxALL, FromDIP(5) );
+	sb_method_horiz->Add( m_method_icon, 0, wxALL, 5 );
 	
 	wxBoxSizer* sb_method_vert;
 	sb_method_vert = new wxBoxSizer( wxVERTICAL );
 	
 	m_method_label = new wxStaticText( sb_method->GetStaticBox(), wxID_ANY, _("Select and configure inner EAP method"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_method_label->Wrap( FromDIP(440) );
-	sb_method_vert->Add( m_method_label, 0, wxALL|wxEXPAND, FromDIP(5) );
+	m_method_label->Wrap( 440 );
+	sb_method_vert->Add( m_method_label, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* sb_method_inner;
 	sb_method_inner = new wxBoxSizer( wxHORIZONTAL );
@@ -35,19 +35,19 @@ wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent
 	wxArrayString m_methodChoices;
 	m_method = new wxChoice( sb_method->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_methodChoices, 0 );
 	m_method->SetSelection( 0 );
-	sb_method_inner->Add( m_method, 1, wxRIGHT|wxEXPAND, FromDIP(5) );
+	sb_method_inner->Add( m_method, 1, wxRIGHT|wxEXPAND, 5 );
 	
 	m_settings = new wxButton( sb_method->GetStaticBox(), wxID_ANY, _("&Settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	sb_method_inner->Add( m_settings, 0, 0, FromDIP(5) );
+	sb_method_inner->Add( m_settings, 0, 0, 5 );
 	
 	
-	sb_method_vert->Add( sb_method_inner, 0, wxEXPAND|wxALL, FromDIP(5) );
+	sb_method_vert->Add( sb_method_inner, 0, wxEXPAND|wxALL, 5 );
 	
 	
-	sb_method_horiz->Add( sb_method_vert, 1, wxEXPAND, FromDIP(5) );
+	sb_method_horiz->Add( sb_method_vert, 1, wxEXPAND, 5 );
 	
 	
-	sb_method->Add( sb_method_horiz, 1, wxEXPAND, FromDIP(5) );
+	sb_method->Add( sb_method_horiz, 1, wxEXPAND, 5 );
 	
 	
 	this->SetSizer( sb_method );
--- a/lib/EapHost_UI/res/wxEapHost_UI.h
+++ b/lib/EapHost_UI/res/wxEapHost_UI.h
@@ -49,7 +49,7 @@ class wxEapHostMethodConfigPanelBase : public wxPanel
 	
 	public:
 		
-		wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); 
+		wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
 		~wxEapHostMethodConfigPanelBase();
 	
 };
--- a/lib/EapHost_UI/src/EapHost_UI.cpp
+++ b/lib/EapHost_UI/src/EapHost_UI.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -51,7 +51,7 @@ wxEapHostMethodConfigPanel::wxEapHostMethodConfigPanel(const eap::config_provide

    winstd::eap_method_info_array methods;
    winstd::eap_error error;
-    DWORD dwResult = EapHostPeerGetMethods(&methods, get_ptr(error));
+    DWORD dwResult = EapHostPeerGetMethods(&methods, &error._Myptr);
    if (dwResult == ERROR_SUCCESS) {
        for (DWORD i = 0; i < methods.dwNumberOfMethods; i++)
            m_method->Append(methods.pEapMethods[i].pwszFriendlyName, new wxEAPMethodTypeClientData(methods.pEapMethods[i].eaptype, methods.pEapMethods[i].eapProperties));
@@ -126,7 +126,7 @@ void wxEapHostMethodConfigPanel::OnSettings(wxCommandEvent& event)
        DWORD cfg_data_size = 0;
        winstd::eap_blob cfg_data;
        winstd::eap_error error;
-        DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, get_ptr(cfg_data), get_ptr(error));
+        DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, &cfg_data._Myptr, &error._Myptr);
        if (dwResult == ERROR_SUCCESS) {
            const BYTE *_cfg_data = cfg_data.get();
            data->m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size);
@@ -152,7 +152,7 @@ wxEapHostConfigPanel::wxEapHostConfigPanel(const eap::config_provider &prov, eap
    sb_content = new wxBoxSizer( wxVERTICAL );

    m_method = new wxEapHostMethodConfigPanel(prov, cfg, this);
-    sb_content->Add(m_method, 0, wxEXPAND, FromDIP(5));
+    sb_content->Add(m_method, 0, wxEXPAND, 5);

    this->SetSizer(sb_content);
    this->Layout();
--- a/lib/Events/MSIBuild/Makefile
+++ b/lib/Events/MSIBuild/Makefile
--- a/lib/Events/build/Events.rc
+++ b/lib/Events/build/Events.rc
--- a/lib/Events/build/Events.vcxproj
+++ b/lib/Events/build/Events.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,117 +22,77 @@
    <ProjectGuid>{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>Events</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="Events.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="Events.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="Events.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="Events.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="Events.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="Events.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <CustomBuild Include="..\res\EventsETW.man">
      <FileType>Document</FileType>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)."</Command>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling manifest...</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling manifest...</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling manifest...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Compiling manifest...</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling manifest...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Compiling manifest...</Message>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs)</Outputs>
      <SubType>Designer</SubType>
    </CustomBuild>
  </ItemGroup>
--- a/lib/Events/res/EventsETW.man
+++ b/lib/Events/res/EventsETW.man
--- a/lib/GTC/build/.gitignore
+++ b/lib/GTC/build/.gitignore
@@ -1,2 +0,0 @@
-/temp
-/*.user
--- a/lib/GTC/build/GTC.props
+++ b/lib/GTC/build/GTC.props
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
--- a/lib/GTC/build/GTC.vcxproj
+++ b/lib/GTC/build/GTC.vcxproj
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{114A70BB-8698-4A0C-8C90-58F22EDD8129}</ProjectGuid>
-    <RootNamespace>GTC</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <ItemGroup>
-    <ClInclude Include="..\include\Config.h" />
-    <ClInclude Include="..\include\Method.h" />
-    <ClInclude Include="..\src\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\Config.cpp" />
-    <ClCompile Include="..\src\Method.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
-      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/lib/GTC/build/GTC.vcxproj.filters
+++ b/lib/GTC/build/GTC.vcxproj.filters
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\Method.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Method.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
--- a/lib/GTC/include/Config.h
+++ b/lib/GTC/include/Config.h
@@ -1,175 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <sal.h>
-
-namespace eap
-{
-    class config_method_eapgtc;
-}
-
-#pragma once
-
-#include "../../EAPBase/include/Config.h"
-
-#include <Windows.h>
-#include <sal.h>
-#include <tchar.h>
-
-
-namespace eap
-{
-    /// \addtogroup EAPBaseConfig
-    /// @{
-
-    ///
-    /// EAP-GTC configuration
-    ///
-    class config_method_eapgtc : public config_method_with_cred
-    {
-    public:
-        ///
-        /// Authentication mode
-        ///
-        enum auth_mode_t {
-            auth_mode_response = 0, ///< Challenge/Response
-            auth_mode_password,     ///< Password
-        };
-
-    public:
-        ///
-        /// Constructs configuration
-        ///
-        /// \param[in] mod    EAP module to use for global services
-        /// \param[in] level  Config level (0=outer, 1=inner, 2=inner-inner...)
-        ///
-        config_method_eapgtc(_In_ module &mod, _In_ unsigned int level);
-
-        ///
-        /// Copies configuration
-        ///
-        /// \param[in] other  Configuration to copy from
-        ///
-        config_method_eapgtc(_In_ const config_method_eapgtc &other);
-
-        ///
-        /// Moves configuration
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        config_method_eapgtc(_Inout_ config_method_eapgtc &&other);
-
-        ///
-        /// Copies configuration
-        ///
-        /// \param[in] other  Configuration to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        config_method_eapgtc& operator=(_In_ const config_method_eapgtc &other);
-
-        ///
-        /// Moves configuration
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        config_method_eapgtc& operator=(_Inout_ config_method_eapgtc &&other);
-
-        virtual config* clone() const;
-
-        /// \name XML management
-        /// @{
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        /// @}
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-        ///
-        /// @copydoc eap::config_method::get_method_id()
-        /// \returns This implementation always returns `winstd::eap_type_gtc`
-        ///
-        virtual winstd::eap_type_t get_method_id() const;
-
-        ///
-        /// @copydoc eap::config_method::get_method_str()
-        /// \returns This implementation always returns `L"EAP-GTC"`
-        ///
-        virtual const wchar_t* get_method_str() const;
-
-        ///
-        /// @copydoc eap::config_method::make_credentials()
-        /// \returns This implementation returns `eap::credentials_identity` or `eap::credentials_pass` type of credentials, depending on authentication mode.
-        ///
-        virtual credentials* make_credentials() const;
-    };
-
-    /// @}
-}
-
-
-/// \addtogroup EAPBaseStream
-/// @{
-
-///
-/// Packs an EAP-GTC method authentication mode
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[in]    val     Authentication mode to pack
-///
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config_method_eapgtc::auth_mode_t &val)
-{
-    cursor << (unsigned char)val;
-}
-
-
-///
-/// Returns packed size of an EAP-GTC method authentication mode
-///
-/// \param[in] val  Authentication mode to pack
-///
-/// \returns Size of data when packed (in bytes)
-///
-inline size_t pksizeof(_In_ const eap::config_method_eapgtc::auth_mode_t &val)
-{
-    return pksizeof((unsigned char)val);
-}
-
-
-///
-/// Unpacks an EAP-GTC method authentication mode
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[out]   val     Authentication mode to unpack to
-///
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method_eapgtc::auth_mode_t &val)
-{
-    val = (eap::config_method_eapgtc::auth_mode_t)0; // Reset higher bytes to zero before reading to lower byte.
-    cursor >> (unsigned char&)val;
-}
-
-/// @}
--- a/lib/GTC/include/Method.h
+++ b/lib/GTC/include/Method.h
@@ -1,118 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class method_gtc;
-}
-
-#pragma once
-
-#include "Config.h"
-
-#include "../../EAPBase/include/Method.h"
-
-
-namespace eap
-{
-    /// \addtogroup EAPBaseMethod
-    /// @{
-
-    ///
-    /// GTC method
-    ///
-    class method_gtc : public method
-    {
-        WINSTD_NONCOPYABLE(method_gtc)
-
-    public:
-        ///
-        /// Constructs a GTC method
-        ///
-        /// \param[in] mod   GTC module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
-        ///
-        method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred);
-
-        ///
-        /// Moves a GTC method
-        ///
-        /// \param[in] other  GTC method to move from
-        ///
-        method_gtc(_Inout_ method_gtc &&other);
-
-        ///
-        /// Moves a GTC method
-        ///
-        /// \param[in] other  GTC method to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        method_gtc& operator=(_Inout_ method_gtc &&other);
-
-        /// \name Session management
-        /// @{
-
-        virtual void begin_session(
-            _In_        DWORD         dwFlags,
-            _In_  const EapAttributes *pAttributeArray,
-            _In_        HANDLE        hTokenImpersonateUser,
-            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
-
-        /// @}
-
-        /// \name Packet processing
-        /// @{
-
-        virtual EapPeerMethodResponseAction process_request_packet(
-            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
-            _In_                                       DWORD dwReceivedPacketSize);
-
-        virtual void get_response_packet(
-            _Out_    sanitizing_blob &packet,
-            _In_opt_ DWORD           size_max = MAXDWORD);
-
-        /// @}
-
-        virtual void get_result(
-            _In_  EapPeerMethodResultReason reason,
-            _Out_ EapPeerMethodResult       *pResult);
-
-        /// \name User Interaction
-        /// @{
-
-        virtual void get_ui_context(_Out_ sanitizing_blob &context_data);
-
-        virtual EapPeerMethodResponseAction set_ui_context(
-            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
-            _In_                                  DWORD dwUIContextDataSize);
-
-        /// @}
-
-    protected:
-        config_method_eapgtc &m_cfg;            ///< Method configuration
-        credentials &m_cred;                    ///< Method user credentials
-        winstd::sanitizing_wstring m_challenge; ///< GTC challenge
-        winstd::sanitizing_wstring m_response;  ///< GTC response
-    };
-
-    /// @}
-}
--- a/lib/GTC/src/Config.cpp
+++ b/lib/GTC/src/Config.cpp
@@ -1,183 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::config_method_eapgtc
-//////////////////////////////////////////////////////////////////////
-
-eap::config_method_eapgtc::config_method_eapgtc(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
-{
-    // Default to Challenge/Response authentication mode.
-    m_cred.reset(new credentials_identity(mod));
-}
-
-
-eap::config_method_eapgtc::config_method_eapgtc(_In_ const config_method_eapgtc &other) :
-    config_method_with_cred(other)
-{
-}
-
-
-eap::config_method_eapgtc::config_method_eapgtc(_Inout_ config_method_eapgtc &&other) :
-    config_method_with_cred(std::move(other))
-{
-}
-
-
-eap::config_method_eapgtc& eap::config_method_eapgtc::operator=(_In_ const config_method_eapgtc &other)
-{
-    if (this != &other)
-        (config_method_with_cred&)*this = other;
-
-    return *this;
-}
-
-
-eap::config_method_eapgtc& eap::config_method_eapgtc::operator=(_Inout_ config_method_eapgtc &&other)
-{
-    if (this != &other)
-        (config_method_with_cred&&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::config_method_eapgtc::clone() const
-{
-    return new config_method_eapgtc(*this);
-}
-
-
-void eap::config_method_eapgtc::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    config_method_with_cred::save(pDoc, pConfigRoot);
-
-    HRESULT hr;
-
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Challenge/Response"));
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Password"));
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-    if (FAILED(hr))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <AuthMode> element.");
-}
-
-
-void eap::config_method_eapgtc::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-    wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    // Load authentication mode first, then (re)create credentials to match the authentication mode.
-    bstr auth_mode;
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:AuthMode"), auth_mode)) ||
-        CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Challenge/Response"), -1, NULL, NULL, 0) == CSTR_EQUAL)
-    {
-        m_cred.reset(new eap::credentials_identity(m_module));
-    } else if (CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Password"), -1, NULL, NULL, 0) == CSTR_EQUAL) {
-        m_cred.reset(new eap::credentials_pass(m_module));
-    } else
-        throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%ls).", (BSTR)auth_mode));
-
-    m_module.log_config((xpath + L"/AuthMode").c_str(), (BSTR)auth_mode);
-
-    // Load method configuration.
-    config_method_with_cred::load(pConfigRoot);
-}
-
-
-void eap::config_method_eapgtc::operator<<(_Inout_ cursor_out &cursor) const
-{
-    // Save authentication mode first, as credential loading will require this information.
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        cursor << auth_mode_response;
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        cursor << auth_mode_password;
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-
-    config_method_with_cred::operator<<(cursor);
-}
-
-
-size_t eap::config_method_eapgtc::get_pk_size() const
-{
-    auth_mode_t auth_mode;
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        auth_mode = auth_mode_response;
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        auth_mode = auth_mode_password;
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-
-    return
-        pksizeof(auth_mode) +
-        config_method_with_cred::get_pk_size();
-}
-
-
-void eap::config_method_eapgtc::operator>>(_Inout_ cursor_in &cursor)
-{
-    // (Re)create credentials to match the authentication mode.
-    auth_mode_t auth_mode;
-    cursor >> auth_mode;
-    switch (auth_mode) {
-    case auth_mode_response: m_cred.reset(new eap::credentials_identity(m_module)); break;
-    case auth_mode_password: m_cred.reset(new eap::credentials_pass    (m_module)); break;
-    default                : throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%u).", auth_mode));
-    }
-
-    config_method_with_cred::operator>>(cursor);
-}
-
-
-eap_type_t eap::config_method_eapgtc::get_method_id() const
-{
-    return eap_type_gtc;
-}
-
-
-const wchar_t* eap::config_method_eapgtc::get_method_str() const
-{
-    return L"EAP-GTC";
-}
-
-
-eap::credentials* eap::config_method_eapgtc::make_credentials() const
-{
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        return new eap::credentials_identity(m_module);
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        return new eap::credentials_pass    (m_module);
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-}
--- a/lib/GTC/src/Method.cpp
+++ b/lib/GTC/src/Method.cpp
@@ -1,163 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::method_gtc
-//////////////////////////////////////////////////////////////////////
-
-eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred) :
-    m_cfg(cfg),
-    m_cred(cred),
-    method(mod)
-{
-}
-
-
-eap::method_gtc::method_gtc(_Inout_ method_gtc &&other) :
-    m_cfg      (          other.m_cfg       ),
-    m_cred     (          other.m_cred      ),
-    m_challenge(std::move(other.m_challenge)),
-    m_response (std::move(other.m_response )),
-    method     (std::move(other            ))
-{
-}
-
-
-eap::method_gtc& eap::method_gtc::operator=(_Inout_ method_gtc &&other)
-{
-    if (this != std::addressof(other)) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method within same credentials only!
-        (method&)*this = std::move(other            );
-        m_challenge    = std::move(other.m_challenge);
-        m_response     = std::move(other.m_response );
-    }
-
-    return *this;
-}
-
-
-void eap::method_gtc::begin_session(
-    _In_        DWORD         dwFlags,
-    _In_  const EapAttributes *pAttributeArray,
-    _In_        HANDLE        hTokenImpersonateUser,
-    _In_opt_    DWORD         dwMaxSendPacketSize)
-{
-    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
-
-    // Presume authentication will fail with generic protocol failure. (Pesimist!!!)
-    // We will reset once we get get_result(Success) call.
-    m_cfg.m_last_status = config_method::status_auth_failed;
-    m_cfg.m_last_msg.clear();
-}
-
-
-EapPeerMethodResponseAction eap::method_gtc::process_request_packet(
-    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
-    _In_                                       DWORD dwReceivedPacketSize)
-{
-    assert(pReceivedPacket || dwReceivedPacketSize == 0);
-
-    m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-    credentials_pass *cred_pass;
-    if (dynamic_cast<credentials_identity*>(&m_cred)) {
-        // Read authenticator challenge as UTF-8 encoded string.
-        MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_challenge);
-
-        m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-        // User must respond to the challenge.
-        return EapPeerMethodResponseActionInvokeUI;
-    } else if ((cred_pass = dynamic_cast<credentials_pass*>(&m_cred)) != NULL) {
-        // Ignore authenticator challenge and save password as GTC response.
-        m_response = cred_pass->m_password;
-
-        // Send the response.
-        m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
-        return EapPeerMethodResponseActionSend;
-    } else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-}
-
-
-void eap::method_gtc::get_response_packet(
-    _Out_    sanitizing_blob &packet,
-    _In_opt_ DWORD           size_max)
-{
-    // Encode GTC response as UTF-8.
-    sanitizing_string response_utf8;
-    WideCharToMultiByte(CP_UTF8, 0, m_response, response_utf8, NULL, NULL);
-
-    if (sizeof(sanitizing_string::value_type)*response_utf8.length() > size_max)
-        throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", sizeof(sanitizing_string::value_type)*response_utf8.length(), size_max));
-
-    packet.assign(response_utf8.begin(), response_utf8.end());
-}
-
-
-void eap::method_gtc::get_result(
-    _In_    EapPeerMethodResultReason reason,
-    _Inout_ EapPeerMethodResult       *pResult)
-{
-    assert(pResult);
-
-    method::get_result(reason, pResult);
-
-    if (reason == EapPeerMethodResultSuccess)
-        m_cfg.m_last_status = config_method::status_success;
-
-    // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
-    // Don't worry. EapHost is well aware of failed authentication condition.
-    pResult->fSaveConnectionData = TRUE;
-    pResult->fIsSuccess          = TRUE;
-}
-
-
-void eap::method_gtc::get_ui_context(_Out_ sanitizing_blob &context_data)
-{
-    // Return authenticator string.
-    context_data.assign(
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data()                       ),
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data() + m_challenge.length()));
-}
-
-
-EapPeerMethodResponseAction eap::method_gtc::set_ui_context(
-    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
-    _In_                                  DWORD dwUIContextDataSize)
-{
-    m_module.log_event(&EAPMETHOD_GTC_RESPONSE, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-    // Save GTC response.
-    m_response.assign(
-        reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData                      ),
-        reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData + dwUIContextDataSize));
-
-    // Send the response.
-    m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
-    return EapPeerMethodResponseActionSend;
-}
--- a/lib/GTC/src/StdAfx.cpp
+++ b/lib/GTC/src/StdAfx.cpp
@@ -1,21 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
--- a/lib/GTC/src/StdAfx.h
+++ b/lib/GTC/src/StdAfx.h
@@ -1,30 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/Config.h"
-#include "../include/Method.h"
-
-#include <WinStd/Hex.h>
-
-#include <Windows.h>
-#include <EapHostError.h> // include after Windows.h
-#include <RasError.h>
--- a/lib/GTC_UI/build/.gitignore
+++ b/lib/GTC_UI/build/.gitignore
@@ -1,2 +0,0 @@
-/temp
-/*.user
--- a/lib/GTC_UI/build/GTC_UI.props
+++ b/lib/GTC_UI/build/GTC_UI.props
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
--- a/lib/GTC_UI/build/GTC_UI.vcxproj
+++ b/lib/GTC_UI/build/GTC_UI.vcxproj
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34680813-3A52-46FB-B5A8-1E4BBF770855}</ProjectGuid>
-    <RootNamespace>GTC_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <ItemGroup>
-    <ClInclude Include="..\include\GTC_UI.h" />
-    <ClInclude Include="..\res\wxGTC_UI.h" />
-    <ClInclude Include="..\src\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\res\wxGTC_UI.cpp" />
-    <ClCompile Include="..\src\GTC_UI.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
-      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\res\wxGTC_UI.fbp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/lib/GTC_UI/build/GTC_UI.vcxproj.filters
+++ b/lib/GTC_UI/build/GTC_UI.vcxproj.filters
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\GTC_UI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\res\wxGTC_UI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\GTC_UI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\res\wxGTC_UI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\res\wxGTC_UI.fbp">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
--- a/lib/GTC_UI/include/GTC_UI.h
+++ b/lib/GTC_UI/include/GTC_UI.h
@@ -1,140 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../../EAPBase_UI/include/EAP_UI.h"
-#include "../../GTC/include/Config.h"
-
-class wxGTCConfigPanel;
-class wxGTCResponseDialog;
-class wxGTCResponsePanel;
-
-/// \addtogroup EAPBaseGUI
-/// @{
-
-///
-/// GTC challenge/response credential entry panel
-///
-typedef wxIdentityCredentialsPanel<eap::credentials_identity, wxIdentityCredentialsPanelBase> wxGTCResponseCredentialsPanel;
-
-///
-/// GTC challenge/response credential configuration panel
-///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCResponseCredentialsPanel> wxGTCResponseCredentialsConfigPanel;
-
-///
-/// GTC password credential entry panel
-///
-typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxGTCPasswordCredentialsPanel;
-
-///
-/// GTC password credential configuration panel
-///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxGTCPasswordCredentialsPanel> wxGTCPasswordCredentialsConfigPanel;
-
-/// @}
-
-#pragma once
-
-#include "../res/wxGTC_UI.h"
-
-#include <Windows.h>
-
-
-/// \addtogroup EAPBaseGUI
-/// @{
-
-///
-/// GTC configuration panel
-///
-class wxGTCConfigPanel : public wxGTCConfigPanelBase
-{
-public:
-    ///
-    /// Constructs a configuration panel
-    ///
-    wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent);
-
-protected:
-    /// \cond internal
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-    virtual void OnUpdateUI(wxUpdateUIEvent& event);
-    /// \endcond
-
-protected:
-    const eap::config_provider &m_prov;                         ///< EAP provider
-    eap::config_method_eapgtc &m_cfg;                           ///< EAP-GTC configuration
-
-    wxGTCResponseCredentialsConfigPanel *m_credentials_resp;    ///< Challenge/response credentials configuration panel
-    wxGTCPasswordCredentialsConfigPanel *m_credentials_pass;    ///< Password credentials configuration panel
-
-    // Temporary configurations to hold data until applied
-    eap::config_method_eapgtc m_cfg_resp;                       ///< Method configuration for challenge/response mode
-    eap::config_method_eapgtc m_cfg_pass;                       ///< Method configuration for password mode
-};
-
-
-///
-/// GTC challenge/response dialog
-///
-class wxGTCResponseDialog : public wxEAPGeneralDialog
-{
-public:
-    ///
-    /// Constructs a credential dialog
-    ///
-    /// \param[in] prov    Provider configuration data
-    /// \param[in] parent  Parent window
-    /// \param[in] id      An identifier for the dialog. A value of -1 is taken to mean a default.
-    /// \param[in] title   The title of the dialog
-    /// \param[in] pos     The dialog position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] size    The dialog size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] style   The window style
-    ///
-    wxGTCResponseDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = _("GTC Challenge"), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
-};
-
-
-///
-/// GTC challenge/response panel
-///
-class wxGTCResponsePanel : public wxGTCResponsePanelBase
-{
-public:
-    ///
-    /// Constructs a panel
-    ///
-    /// \param[inout] response   GTC response
-    /// \param[in   ] challenge  GTC challenge
-    /// \param[in   ] parent     Parent window
-    ///
-    wxGTCResponsePanel(winstd::sanitizing_wstring &response, const wchar_t *challenge, wxWindow* parent);
-
-protected:
-    /// \cond internal
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-    /// \endcond
-
-protected:
-    winstd::sanitizing_wstring &m_response_value;   ///< GTC response
-};
-
-/// @}
--- a/lib/GTC_UI/res/wxGTC_UI.cpp
+++ b/lib/GTC_UI/res/wxGTC_UI.cpp
@@ -1,92 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include <StdAfx.h>
-
-#include "wxGTC_UI.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-wxGTCResponsePanelBase::wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style )
-{
-	m_sb_response = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("GTC Challenge") ), wxVERTICAL );
-	
-	wxBoxSizer* sb_response_horiz;
-	sb_response_horiz = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_response_icon = new wxStaticBitmap( m_sb_response->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_response_horiz->Add( m_response_icon, 0, wxALL, FromDIP(5) );
-	
-	m_sb_response_vert = new wxBoxSizer( wxVERTICAL );
-	
-	m_response_label = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, _("Please provide your response."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_response_label->Wrap( FromDIP(440) );
-	m_sb_response_vert->Add( m_response_label, 0, wxALL|wxEXPAND, FromDIP(5) );
-	
-	wxFlexGridSizer* sb_response_tbl;
-	sb_response_tbl = new wxFlexGridSizer( 0, 2, FromDIP(5), FromDIP(5) );
-	sb_response_tbl->AddGrowableCol( 1 );
-	sb_response_tbl->SetFlexibleDirection( wxBOTH );
-	sb_response_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_challenge = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, FromDIP(0) );
-	m_challenge->Wrap( -1 );
-	m_challenge->SetToolTip( _("Server challenge") );
-	
-	sb_response_tbl->Add( m_challenge, 0, wxALIGN_CENTER_VERTICAL, FromDIP(5) );
-	
-	m_response = new wxTextCtrl( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_response->SetToolTip( _("Enter your response here") );
-	
-	sb_response_tbl->Add( m_response, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, FromDIP(5) );
-	
-	
-	m_sb_response_vert->Add( sb_response_tbl, 0, wxEXPAND|wxALL, FromDIP(5) );
-	
-	
-	sb_response_horiz->Add( m_sb_response_vert, 1, wxEXPAND, FromDIP(5) );
-	
-	
-	m_sb_response->Add( sb_response_horiz, 0, wxEXPAND, FromDIP(5) );
-	
-	
-	this->SetSizer( m_sb_response );
-	this->Layout();
-}
-
-wxGTCResponsePanelBase::~wxGTCResponsePanelBase()
-{
-}
-
-wxGTCConfigPanelBase::wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style )
-{
-	wxBoxSizer* sb_vertical;
-	sb_vertical = new wxBoxSizer( wxVERTICAL );
-	
-	m_auth_mode_label = new wxStaticText( this, wxID_ANY, _("EAP-GTC authentication &mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_auth_mode_label->Wrap( -1 );
-	sb_vertical->Add( m_auth_mode_label, 0, wxBOTTOM, FromDIP(5) );
-	
-	m_auth_mode = new wxChoicebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT );
-	m_auth_mode->SetToolTip( _("Select EAP-GTC authentication mode from the list") );
-	
-	sb_vertical->Add( m_auth_mode, 1, wxEXPAND, FromDIP(5) );
-	
-	
-	this->SetSizer( sb_vertical );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
-}
-
-wxGTCConfigPanelBase::~wxGTCConfigPanelBase()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
-	
-}
--- a/lib/GTC_UI/res/wxGTC_UI.fbp
+++ b/lib/GTC_UI/res/wxGTC_UI.fbp
@@ -1,695 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration">; </property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_php_events">0</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">.</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file">wxGTC_UI</property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="internationalize">1</property>
-        <property name="name">wxGTC_UI</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header">#include &lt;StdAfx.h&gt;</property>
-        <property name="relative_path">1</property>
-        <property name="skip_lua_events">1</property>
-        <property name="skip_php_events">1</property>
-        <property name="skip_python_events">1</property>
-        <property name="ui_table">UI</property>
-        <property name="use_enum">1</property>
-        <property name="use_microsoft_bom">1</property>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">wxGTCResponsePanelBase</property>
-            <property name="pos"></property>
-            <property name="size">500,-1</property>
-            <property name="subclass">; </property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxStaticBoxSizer" expanded="1">
-                <property name="id">wxID_ANY</property>
-                <property name="label">GTC Challenge</property>
-                <property name="minimum_size"></property>
-                <property name="name">m_sb_response</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">protected</property>
-                <event name="OnUpdateUI"></event>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">sb_response_horiz</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticBitmap" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="bitmap">Load From Icon Resource; ; [32; 32]</property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_response_icon</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">m_sb_response_vert</property>
-                                <property name="orient">wxVERTICAL</property>
-                                <property name="permission">protected</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Please provide your response.</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_response_label</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style"></property>
-                                        <property name="subclass"></property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <property name="wrap">440</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND|wxALL</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxFlexGridSizer" expanded="1">
-                                        <property name="cols">2</property>
-                                        <property name="flexible_direction">wxBOTH</property>
-                                        <property name="growablecols">1</property>
-                                        <property name="growablerows"></property>
-                                        <property name="hgap">5</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sb_response_tbl</property>
-                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                        <property name="permission">none</property>
-                                        <property name="rows">0</property>
-                                        <property name="vgap">5</property>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="label"></property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_challenge</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Server challenge</property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">2</property>
-                                            <object class="wxTextCtrl" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="maxlength"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_response</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Enter your response here</property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="value"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnText"></event>
-                                                <event name="OnTextEnter"></event>
-                                                <event name="OnTextMaxLen"></event>
-                                                <event name="OnTextURL"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">wxGTCConfigPanelBase</property>
-            <property name="pos"></property>
-            <property name="size">500,-1</property>
-            <property name="subclass"></property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI">OnUpdateUI</event>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">sb_vertical</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxBOTTOM</property>
-                    <property name="proportion">0</property>
-                    <object class="wxStaticText" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="label">EAP-GTC authentication &amp;mode:</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_auth_mode_label</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style"></property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxChoicebook" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_auth_mode</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style">wxCHB_DEFAULT</property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip">Select EAP-GTC authentication mode from the list</property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnChoicebookPageChanged"></event>
-                        <event name="OnChoicebookPageChanging"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>
--- a/lib/GTC_UI/res/wxGTC_UI.h
+++ b/lib/GTC_UI/res/wxGTC_UI.h
@@ -1,76 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXGTC_UI_H__
-#define __WXGTC_UI_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/statbmp.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/panel.h>
-#include <wx/choicebk.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxGTCResponsePanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxGTCResponsePanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_response;
-		wxStaticBitmap* m_response_icon;
-		wxBoxSizer* m_sb_response_vert;
-		wxStaticText* m_response_label;
-		wxStaticText* m_challenge;
-		wxTextCtrl* m_response;
-	
-	public:
-		
-		wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); 
-		~wxGTCResponsePanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxGTCConfigPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxGTCConfigPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticText* m_auth_mode_label;
-		wxChoicebook* m_auth_mode;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); 
-		~wxGTCConfigPanelBase();
-	
-};
-
-#endif //__WXGTC_UI_H__
--- a/lib/GTC_UI/src/GTC_UI.cpp
+++ b/lib/GTC_UI/src/GTC_UI.cpp
@@ -1,163 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCConfigPanel
-//////////////////////////////////////////////////////////////////////
-
-wxGTCConfigPanel::wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent) :
-    m_prov    (prov                     ),
-    m_cfg     (cfg                      ),
-    m_cfg_resp(cfg.m_module, cfg.m_level),
-    m_cfg_pass(cfg.m_module, cfg.m_level),
-    wxGTCConfigPanelBase(parent)
-{
-    // Initialize Password authentication mode properly. Challenge/Response mode does not require initialization, since it is initialized so by default.
-    m_cfg_pass.m_cred.reset(new eap::credentials_pass(m_cfg.m_module));
-
-    m_credentials_resp = new wxGTCResponseCredentialsConfigPanel(m_prov, m_cfg_resp, m_auth_mode);
-    m_auth_mode->AddPage(m_credentials_resp, _("Challenge/Response"));
-    m_credentials_pass = new wxGTCPasswordCredentialsConfigPanel(m_prov, m_cfg_pass, m_auth_mode);
-    m_auth_mode->AddPage(m_credentials_pass, _("Password"));
-}
-
-
-/// \cond internal
-
-bool wxGTCConfigPanel::TransferDataToWindow()
-{
-    eap::credentials_identity *cred_resp;
-    eap::credentials_pass     *cred_pass;
-
-    if ((cred_resp = dynamic_cast<eap::credentials_identity*>(m_cfg.m_cred.get())) != NULL) {
-        m_cfg_resp = m_cfg;
-        m_auth_mode->SetSelection(0); // 0=Challenge/Response
-    } else if ((cred_pass = dynamic_cast<eap::credentials_pass*>(m_cfg.m_cred.get())) != NULL) {
-        m_cfg_pass = m_cfg;
-        m_auth_mode->SetSelection(1); // 1=Password
-    } else
-        wxFAIL_MSG(wxT("Unsupported authentication mode."));
-
-    return wxGTCConfigPanelBase::TransferDataToWindow();
-}
-
-
-bool wxGTCConfigPanel::TransferDataFromWindow()
-{
-    wxCHECK(wxGTCConfigPanelBase::TransferDataFromWindow(), false);
-
-    if (!m_prov.m_read_only) {
-        // This is not a provider-locked configuration. Save the data.
-        switch (m_auth_mode->GetSelection()) {
-        case 0: // 0=Challenge/Response
-            m_cfg = m_cfg_resp;
-            break;
-
-        case 1: // 1=Password
-            m_cfg = m_cfg_pass;
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("Unsupported authentication mode."));
-        }
-    }
-
-    return true;
-}
-
-
-void wxGTCConfigPanel::OnUpdateUI(wxUpdateUIEvent& event)
-{
-    UNREFERENCED_PARAMETER(event);
-
-    if (m_prov.m_read_only) {
-        // This is provider-locked configuration. Disable controls.
-        m_auth_mode_label ->Enable(false);
-        m_auth_mode       ->Enable(false);
-        m_credentials_resp->Enable(false);
-        m_credentials_pass->Enable(false);
-    } else {
-        // This is not a provider-locked configuration. Enable controls.
-        m_auth_mode_label ->Enable(true);
-        m_auth_mode       ->Enable(true);
-        m_credentials_resp->Enable(true);
-        m_credentials_pass ->Enable(true);
-    }
-}
-
-/// \endcond
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCResponseDialog
-//////////////////////////////////////////////////////////////////////
-
-wxGTCResponseDialog::wxGTCResponseDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
-    wxEAPGeneralDialog(parent, id, title, pos, size, style)
-{
-    // Set banner title.
-    m_banner->m_title->SetLabel(wxString::Format(_("%s Challenge"), wxEAPGetProviderName(prov.m_name)));
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCResponsePanel
-//////////////////////////////////////////////////////////////////////
-
-wxGTCResponsePanel::wxGTCResponsePanel(winstd::sanitizing_wstring &response, const wchar_t *challenge, wxWindow* parent) :
-    wxGTCResponsePanelBase(parent),
-    m_response_value(response)
-{
-    // Load and set icon.
-    winstd::library lib_shell32;
-    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-        m_response_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(24)));
-
-    // Set challenge label.
-    m_challenge->SetLabelText(challenge);
-    m_challenge->Wrap(FromDIP(200));
-
-    this->Layout();
-}
-
-
-/// \cond internal
-
-bool wxGTCResponsePanel::TransferDataToWindow()
-{
-    m_response->SetValue(m_response_value.c_str());
-
-    return wxGTCResponsePanelBase::TransferDataToWindow();
-}
-
-
-bool wxGTCResponsePanel::TransferDataFromWindow()
-{
-    wxCHECK(wxGTCResponsePanelBase::TransferDataFromWindow(), false);
-
-    m_response_value = m_response->GetValue();
-
-    return true;
-}
-
-/// \endcond
--- a/lib/GTC_UI/src/StdAfx.cpp
+++ b/lib/GTC_UI/src/StdAfx.cpp
@@ -1,21 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
--- a/lib/GTC_UI/src/StdAfx.h
+++ b/lib/GTC_UI/src/StdAfx.h
@@ -1,25 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
-#include "../include/GTC_UI.h"
--- a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj
+++ b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{86A6D6A0-4B7D-4134-BE81-A5755C77584D}</ProjectGuid>
    <RootNamespace>MSCHAPv2</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="MSCHAPv2.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="MSCHAPv2.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="MSCHAPv2.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="MSCHAPv2.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="MSCHAPv2.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="MSCHAPv2.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Method.h" />
@@ -134,9 +92,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj
+++ b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{7AF5B922-7C17-428A-97E0-09E3B41A684D}</ProjectGuid>
    <RootNamespace>MSCHAPv2_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="MSCHAPv2_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="MSCHAPv2_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="MSCHAPv2_UI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="MSCHAPv2_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="MSCHAPv2_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="MSCHAPv2_UI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\MSCHAPv2_UI.h" />
    <ClInclude Include="..\src\StdAfx.h" />
@@ -130,9 +88,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp
+++ b/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp
@@ -31,7 +31,7 @@ wxMSCHAPv2ConfigPanel::wxMSCHAPv2ConfigPanel(const eap::config_provider &prov, e
    sb_content = new wxBoxSizer( wxVERTICAL );

    m_credentials = new wxMSCHAPv2CredentialsConfigPanel(prov, cfg, this, _("MSCHAPv2 User ID and Password"));
-    sb_content->Add(m_credentials, 0, wxEXPAND, FromDIP(5));
+    sb_content->Add(m_credentials, 0, wxEXPAND, 5);

    this->SetSizer(sb_content);
    this->Layout();
--- a/lib/PAP/build/PAP.vcxproj
+++ b/lib/PAP/build/PAP.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{36B0CF8A-7794-46C3-8099-825BA962B4C7}</ProjectGuid>
    <RootNamespace>PAP</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="PAP.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="PAP.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="PAP.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="PAP.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="PAP.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="PAP.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Method.h" />
@@ -132,9 +90,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/PAP_UI/build/PAP_UI.vcxproj
+++ b/lib/PAP_UI/build/PAP_UI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}</ProjectGuid>
    <RootNamespace>PAP_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="PAP_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="PAP_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="PAP_UI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="PAP_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="PAP_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="PAP_UI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\PAP_UI.h" />
    <ClInclude Include="..\src\StdAfx.h" />
@@ -130,9 +88,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/PAP_UI/src/PAP_UI.cpp
+++ b/lib/PAP_UI/src/PAP_UI.cpp
@@ -31,7 +31,7 @@ wxPAPConfigPanel::wxPAPConfigPanel(const eap::config_provider &prov, eap::config
    sb_content = new wxBoxSizer( wxVERTICAL );

    m_credentials = new wxPAPCredentialsConfigPanel(prov, cfg, this, _("PAP User ID and Password"));
-    sb_content->Add(m_credentials, 0, wxEXPAND, FromDIP(5));
+    sb_content->Add(m_credentials, 0, wxEXPAND, 5);

    this->SetSizer(sb_content);
    this->Layout();
--- a/lib/TLS/build/TLS.vcxproj
+++ b/lib/TLS/build/TLS.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4D40CB8A-812E-4F12-B23A-31AF743878E8}</ProjectGuid>
    <RootNamespace>TLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="TLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="TLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="TLS.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="TLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="TLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="TLS.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Credentials.h" />
@@ -131,9 +89,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="..\src\Credentials.cpp" />
  </ItemGroup>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	3220e36206	Switch to SHA-256 signing of final MSI files This breaks support for Windows Vista.	2018-07-04 11:15:43 +02:00
Simon Rozman	4767fb9a13	Import translations from Transifex	2018-07-04 10:25:13 +02:00
Simon Rozman	4bfae4a27d	Update sub-module	2018-07-04 10:25:05 +02:00
Simon Rozman	c42b080c31	Update translation template	2018-06-20 15:33:24 +02:00
Simon Rozman	bc7893804e	Stop using <> parentheses to avoid XML/HTML markup Transifex treats strings enclosed in <> as HTML.	2018-06-20 14:53:47 +02:00
Simon Rozman	4597e6c78f	.gitignore output WLANManager.exe properly	2018-06-20 14:40:22 +02:00
Simon Rozman	6eb15355e9	Switch to SHA-256 signing	2018-06-20 14:39:05 +02:00
Simon Rozman	20a9222057	Preset version to 1.1e	2018-06-20 14:38:49 +02:00
Simon Rozman	36d4ff8757	Enable Italian GUI	2018-06-20 14:37:23 +02:00
Simon Rozman	a59147ca1c	Update translations	2018-06-20 14:36:52 +02:00
Simon Rozman	5d6bd7aa52	Auto-detect devenv.com path	2018-06-20 14:36:22 +02:00
Simon Rozman	b1ea8465f4	Set version to 1.1d	2017-12-05 09:39:31 +01:00
Simon Rozman	0ecb5710b9	Translation update	2017-12-05 09:38:25 +01:00
Simon Rozman	4e136ecb28	Update wxExtend module	2017-12-05 09:37:49 +01:00
Simon Rozman	da4f300b47	Update WinStd submodule	2017-12-05 09:37:34 +01:00
Simon Rozman	e8f2cd237a	Ignore post v1.1 folders For easier switching between branches the non-v1.1 folders has been .gitignored.	2017-12-05 09:36:39 +01:00
Simon Rozman	9eaa46e185	Distribution folder changed	2017-11-20 12:07:18 +01:00
Simon Rozman	067fc26b32	Issue with NULL-initialized new profile configuration fixed	2017-07-10 10:48:55 +02:00
Simon Rozman	97c788298e	Translation update	2017-05-30 12:40:49 +02:00
Simon Rozman	3ba8cfb4c4	Sub-module update	2017-05-30 12:39:00 +02:00
Simon Rozman	1a89ca5e70	Version set to 1.1c	2017-05-22 09:29:50 +02:00
Simon Rozman	54d69aeec1	`daea1bba62` reverted	2017-05-22 09:16:27 +02:00
Simon Rozman	54934a619e	WMI\Autologger records not installed any more, since they caused feature completeness check trouble: MsiUseFeature() reports feature broken, when it is denied access to any component folder or registry key # Conflicts: # Makefile	2017-05-22 09:16:27 +02:00
Simon Rozman	c5f514ac56	MsiUseFeature() returning INSTALLSTATE_BROKEN is tolerated in non-elevated process now	2017-05-22 08:42:16 +02:00
Simon Rozman	3edcf6e1fd	WLANManager.exe now deployed as WLANManager-Win32.exe and WLANManager-x64.exe	2017-05-17 13:02:54 +02:00
Simon Rozman	9248c02db0	Documentation update	2017-05-17 12:51:16 +02:00
Simon Rozman	e2287c07c0	Sub-module update	2017-05-17 12:47:51 +02:00
Simon Rozman	b693f464d3	Secondary error message pop-up removed	2017-05-17 12:45:32 +02:00
Simon Rozman	753f55ffc0	WLANManager support for multiple wireless interfaces	2017-05-17 12:45:32 +02:00
Simon Rozman	920d0ab2f7	Indentation fix	2017-03-14 09:37:33 +01:00
Simon Rozman	d3b9a21c81	Version set to 1.1b	2017-02-24 12:16:02 +01:00
Simon Rozman	4281672d13	Clean-up	2017-02-23 12:14:20 +01:00
Simon Rozman	b3b292a848	Incorrect `CoCreateInstance()` result evaluation fixed # Conflicts: # lib/WinStd	2017-02-23 11:14:32 +01:00
Simon Rozman	f39d192d91	Debugging-related exception in WlanUIEditProfile() resolved	2017-02-23 11:14:09 +01:00
Simon Rozman	5bd970b9e7	Locale is dynamic now, since wxLocale does not support re-initialization (when module is reused)	2017-02-22 09:43:57 +01:00
Simon Rozman	1b143cdbc9	Documentation update # Conflicts: # lib/GTC_UI/include/GTC_UI.h	2017-02-22 09:43:57 +01:00
Simon Rozman	7b6e1b2438	New version of wxExtend	2017-02-20 10:59:13 +01:00
Simon Rozman	fc85c6e4bb	Compilation of debug MSI files fixed	2017-02-20 10:07:46 +01:00
Simon Rozman	0bae6380c9	Documentation update	2017-02-13 07:59:50 +01:00
Simon Rozman	f8f32262c2	64-bit language detection removed from 32-bit MSI resolving ICE80 warning	2017-02-09 13:41:33 +01:00
Simon Rozman	f43488be98	Uninitialized enum higher bytes when reading as unsigned char fixed	2017-02-09 11:43:55 +01:00
Simon Rozman	f32d653bb8	eap::config split to eap::config and eap::packable	2017-02-07 09:38:01 +01:00
Simon Rozman	7e5c98ef39	Version set to 1.1a	2017-02-06 08:15:58 +01:00
Simon Rozman	af37909893	Translation update	2017-02-06 08:05:33 +01:00
Simon Rozman	3ff617a048	__DANGEROUS__LOG_CONFIDENTIAL_DATA is now 0/1 #defined	2017-02-02 13:58:21 +01:00
Simon Rozman	fc0bf839c2	EAP_INNER_EAPHOST is now 0/1 #defined	2017-02-02 13:51:17 +01:00
Simon Rozman	6ef00f3fc2	EAP_USE_NATIVE_CREDENTIAL_CACHE is now 0/1 #defined	2017-02-02 13:27:54 +01:00
Simon Rozman	8dcddb9ded	Documentation update	2017-02-02 12:17:34 +01:00
Simon Rozman	d3b69976b9	EapHost credential prompt result evaluation fixed	2017-02-02 11:38:16 +01:00
Simon Rozman	e93a771e16	EapHost conditional compilation directive fixed	2017-02-02 11:38:16 +01:00
Simon Rozman	6689383824	Clean-up	2017-02-01 14:38:37 +01:00
Simon Rozman	58b9b1cf88	Clean-up	2017-02-01 13:12:25 +01:00
Simon Rozman	89139e824b	EapHost peer initialization conditional now	2017-02-01 11:04:07 +01:00
Simon Rozman	e3904b31eb	get_ui_context() upgraded	2017-02-01 10:54:31 +01:00
Simon Rozman	a6eac3beb4	Simple BLOB encryption/decryption added & comment updates	2017-02-01 10:28:04 +01:00
Simon Rozman	9e0fc09c40	Missing namespace added	2017-02-01 10:13:41 +01:00
Simon Rozman	8c0330f324	Clean-up	2017-01-31 13:57:33 +01:00
Simon Rozman	5bf303aac3	EAP errors now correctly displayed in Event Viewer	2017-01-31 12:38:01 +01:00
Simon Rozman	d2998c9210	Incorrect RFC quote removed	2017-01-31 11:07:55 +01:00
Simon Rozman	33fb62a256	Both event channels are registered using Makefile disabled now, to prevent Events.dll getting constantly locked by Event Log service. # Conflicts: # Makefile	2017-01-31 10:45:48 +01:00
Simon Rozman	368afacbb9	"User ID" and "Password" labels vertically centered	2017-01-31 10:45:15 +01:00
Simon Rozman	65483351f4	Additional clarification of UI context handling	2017-01-30 14:52:08 +01:00
Simon Rozman	a3af704d8e	Comment fixed	2017-01-30 14:52:08 +01:00
Simon Rozman	c7ed9c0845	EAP types look-up extended	2017-01-30 12:19:45 +01:00
Simon Rozman	67426d5db4	Distribution folder changed	2017-01-30 08:57:23 +01:00
Simon Rozman	ea15fde6c1	Version set to 1.1	2017-01-30 08:51:46 +01:00