diff --git a/build/wxExtendDll-10.0.vcxproj b/build/wxExtendDll-10.0.vcxproj
deleted file mode 100644
index 8ec5c1f..0000000
--- a/build/wxExtendDll-10.0.vcxproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A3A36689-AC35-4026-93DA-A3BA0C0E767C}</ProjectGuid>
-    <RootNamespace>wxExtend</RootNamespace>
-    <ProjectName>wxExtend</ProjectName>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="wxExtendDll.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\include\xgettext.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendDll-10.0.vcxproj.filters b/build/wxExtendDll-10.0.vcxproj.filters
deleted file mode 100644
index 18263af..0000000
--- a/build/wxExtendDll-10.0.vcxproj.filters
+++ /dev/null
@@ -1,217 +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>
-    <Filter Include="Resource Files\Localization">
-      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
-      <Extensions>po;pot</Extensions>
-    </Filter>
-    <Filter Include="Header Files\persist">
-      <UniqueIdentifier>{33d4709f-47d3-42c1-9562-bc4743799b49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\aui">
-      <UniqueIdentifier>{be99b1e7-e013-4c69-8966-6b34932a1711}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\private">
-      <UniqueIdentifier>{e7ddefe0-5d58-4fda-943c-717689ad974c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\appbar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\comutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\crypto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valhex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\url.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valnet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\framemanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tlwgeom.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\appbar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\comutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\crypto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\hex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\auimanager.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valhex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\url.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valnet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\aui\framemanager.h">
-      <Filter>Header Files\aui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\private\tlwgeom.h">
-      <Filter>Header Files\private</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\toplevel.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\locale\wxExtend.pot">
-      <Filter>Resource Files\Localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\ro_RO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\de_DE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ru_RU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\bg_BG.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ca_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cs_CZ.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cy_UK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\el_GR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\es_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\eu_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fi_FI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_CA.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_FR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\gl_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hr_HR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hu_HU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\is_IS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\it_IT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ko_KR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\lt_LT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nb_NO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nl_NL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pl_PL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pt_PT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sk_SK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sr_RS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sv_SE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\tr_TR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\vi_VN.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\res\wxExtend.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendDll-15.0.vcxproj b/build/wxExtendDll-15.0.vcxproj
deleted file mode 100644
index 7e84ddc..0000000
--- a/build/wxExtendDll-15.0.vcxproj
+++ /dev/null
@@ -1,102 +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>{A3A36689-AC35-4026-93DA-A3BA0C0E767C}</ProjectGuid>
-    <RootNamespace>wxExtend</RootNamespace>
-    <ProjectName>wxExtend</ProjectName>
-    <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">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="wxExtendDll.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <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'" />
-  <PropertyGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\include\xgettext.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendDll-15.0.vcxproj.filters b/build/wxExtendDll-15.0.vcxproj.filters
deleted file mode 100644
index e63d3e7..0000000
--- a/build/wxExtendDll-15.0.vcxproj.filters
+++ /dev/null
@@ -1,217 +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>
-    <Filter Include="Resource Files\Localization">
-      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
-      <Extensions>po;pot</Extensions>
-    </Filter>
-    <Filter Include="Header Files\persist">
-      <UniqueIdentifier>{33d4709f-47d3-42c1-9562-bc4743799b49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\aui">
-      <UniqueIdentifier>{be99b1e7-e013-4c69-8966-6b34932a1711}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\private">
-      <UniqueIdentifier>{e7ddefe0-5d58-4fda-943c-717689ad974c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\appbar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\comutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\crypto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valhex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\url.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valnet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\framemanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tlwgeom.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\appbar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\comutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\crypto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\hex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\auimanager.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valhex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\url.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valnet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\aui\framemanager.h">
-      <Filter>Header Files\aui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\private\tlwgeom.h">
-      <Filter>Header Files\private</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\toplevel.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\locale\wxExtend.pot">
-      <Filter>Resource Files\Localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\ro_RO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\de_DE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ru_RU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\bg_BG.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ca_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cs_CZ.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cy_UK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\el_GR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\es_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\eu_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fi_FI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_CA.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_FR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\gl_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hr_HR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hu_HU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\is_IS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\it_IT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ko_KR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\lt_LT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nb_NO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nl_NL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pl_PL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pt_PT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sk_SK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sr_RS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sv_SE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\tr_TR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\vi_VN.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\res\wxExtend.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendDll-16.0.vcxproj b/build/wxExtendDll.vcxproj
similarity index 92%
rename from build/wxExtendDll-16.0.vcxproj
rename to build/wxExtendDll.vcxproj
index c63bb9a..715834b 100644
--- a/build/wxExtendDll-16.0.vcxproj
+++ b/build/wxExtendDll.vcxproj
@@ -30,26 +30,25 @@
     <ProjectGuid>{A3A36689-AC35-4026-93DA-A3BA0C0E767C}</ProjectGuid>
     <RootNamespace>wxExtend</RootNamespace>
     <ProjectName>wxExtend</ProjectName>
-    <WindowsTargetPlatformVersion>10.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>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -57,21 +56,21 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/build/wxExtendDll-16.0.vcxproj.filters b/build/wxExtendDll.vcxproj.filters
similarity index 100%
rename from build/wxExtendDll-16.0.vcxproj.filters
rename to build/wxExtendDll.vcxproj.filters
diff --git a/build/wxExtendLib-10.0.vcxproj b/build/wxExtendLib-10.0.vcxproj
deleted file mode 100644
index 46fbd9c..0000000
--- a/build/wxExtendLib-10.0.vcxproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</ProjectGuid>
-    <RootNamespace>wxExtend</RootNamespace>
-    <ProjectName>wxExtend</ProjectName>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="wxExtendLib.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\include\xgettext.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendLib-10.0.vcxproj.filters b/build/wxExtendLib-10.0.vcxproj.filters
deleted file mode 100644
index 8dece68..0000000
--- a/build/wxExtendLib-10.0.vcxproj.filters
+++ /dev/null
@@ -1,212 +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>
-    <Filter Include="Resource Files\Localization">
-      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
-      <Extensions>po;pot</Extensions>
-    </Filter>
-    <Filter Include="Header Files\persist">
-      <UniqueIdentifier>{33d4709f-47d3-42c1-9562-bc4743799b49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\aui">
-      <UniqueIdentifier>{be99b1e7-e013-4c69-8966-6b34932a1711}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\private">
-      <UniqueIdentifier>{e7ddefe0-5d58-4fda-943c-717689ad974c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\appbar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\comutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\crypto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valhex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\url.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valnet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\framemanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tlwgeom.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\appbar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\comutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\crypto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\hex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\auimanager.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valhex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\url.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valnet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\aui\framemanager.h">
-      <Filter>Header Files\aui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\private\tlwgeom.h">
-      <Filter>Header Files\private</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\toplevel.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\locale\wxExtend.pot">
-      <Filter>Resource Files\Localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\ro_RO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\de_DE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ru_RU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\bg_BG.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ca_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cs_CZ.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cy_UK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\el_GR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\es_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\eu_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fi_FI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_CA.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_FR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\gl_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hr_HR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hu_HU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\is_IS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\it_IT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ko_KR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\lt_LT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nb_NO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nl_NL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pl_PL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pt_PT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sk_SK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sr_RS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sv_SE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\tr_TR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\vi_VN.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendLib-16.0.vcxproj b/build/wxExtendLib-16.0.vcxproj
deleted file mode 100644
index ab05132..0000000
--- a/build/wxExtendLib-16.0.vcxproj
+++ /dev/null
@@ -1,102 +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>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</ProjectGuid>
-    <RootNamespace>wxExtend</RootNamespace>
-    <ProjectName>wxExtend</ProjectName>
-    <WindowsTargetPlatformVersion>10.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>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="wxExtendLib.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <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'" />
-  <PropertyGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\include\xgettext.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendLib-16.0.vcxproj.filters b/build/wxExtendLib-16.0.vcxproj.filters
deleted file mode 100644
index 6346c6c..0000000
--- a/build/wxExtendLib-16.0.vcxproj.filters
+++ /dev/null
@@ -1,215 +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>
-    <Filter Include="Resource Files\Localization">
-      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
-      <Extensions>po;pot</Extensions>
-    </Filter>
-    <Filter Include="Header Files\persist">
-      <UniqueIdentifier>{33d4709f-47d3-42c1-9562-bc4743799b49}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\aui">
-      <UniqueIdentifier>{be99b1e7-e013-4c69-8966-6b34932a1711}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\private">
-      <UniqueIdentifier>{e7ddefe0-5d58-4fda-943c-717689ad974c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\appbar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\comutils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xml.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\crypto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valhex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\url.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\valnet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\framemanager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tlwgeom.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\appbar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\comutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\crypto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\hex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\auimanager.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valhex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\url.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\valnet.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\aui\framemanager.h">
-      <Filter>Header Files\aui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\object.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\private\tlwgeom.h">
-      <Filter>Header Files\private</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\wxex\persist\toplevel.h">
-      <Filter>Header Files\persist</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\locale\wxExtend.pot">
-      <Filter>Resource Files\Localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\ro_RO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\de_DE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ru_RU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\bg_BG.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ca_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cs_CZ.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\cy_UK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\el_GR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\es_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\eu_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fi_FI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_CA.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\fr_FR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\gl_ES.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hr_HR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\hu_HU.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\is_IS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\it_IT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\ko_KR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\lt_LT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nb_NO.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\nl_NL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pl_PL.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\pt_PT.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sk_SK.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sr_RS.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\sv_SE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\tr_TR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\vi_VN.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="..\locale\et_EE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/wxExtendLib-15.0.vcxproj b/build/wxExtendLib.vcxproj
similarity index 92%
rename from build/wxExtendLib-15.0.vcxproj
rename to build/wxExtendLib.vcxproj
index 68f216c..009b5ad 100644
--- a/build/wxExtendLib-15.0.vcxproj
+++ b/build/wxExtendLib.vcxproj
@@ -30,26 +30,25 @@
     <ProjectGuid>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</ProjectGuid>
     <RootNamespace>wxExtend</RootNamespace>
     <ProjectName>wxExtend</ProjectName>
-    <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>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -57,21 +56,21 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/build/wxExtendLib-15.0.vcxproj.filters b/build/wxExtendLib.vcxproj.filters
similarity index 100%
rename from build/wxExtendLib-15.0.vcxproj.filters
rename to build/wxExtendLib.vcxproj.filters
diff --git a/wxExtend-10.0.sln b/wxExtend-10.0.sln
deleted file mode 100644
index 429345e..0000000
--- a/wxExtend-10.0.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-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}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendLib-10.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
-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
-		{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
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/wxExtend-15.0.sln b/wxExtend-15.0.sln
deleted file mode 100644
index 59d461a..0000000
--- a/wxExtend-15.0.sln
+++ /dev/null
@@ -1,53 +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}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendDll-15.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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|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|ARM64.ActiveCfg = Release|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
-		{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
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|ARM64.Build.0 = Release|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {705D41BE-8FE1-4AC6-8E11-A09403E777C5}
-	EndGlobalSection
-EndGlobal
diff --git a/wxExtend-16.0.sln b/wxExtend.sln
similarity index 95%
rename from wxExtend-16.0.sln
rename to wxExtend.sln
index c8ce4a7..2f5a191 100644
--- a/wxExtend-16.0.sln
+++ b/wxExtend.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendDll-16.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "build\wxExtendDll.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution