diff --git a/build/773mod.vcxproj b/build/773mod.vcxproj
index 98069f136..a8aa39666 100644
--- a/build/773mod.vcxproj
+++ b/build/773mod.vcxproj
@@ -81,7 +81,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\exed/773mod.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/build/Cg0.vcxproj b/build/Cg0.vcxproj
index 44da7cafe..e4f5a2272 100644
--- a/build/Cg0.vcxproj
+++ b/build/Cg0.vcxproj
@@ -233,7 +233,6 @@
     <MskCompiler Include="..\src\cg\cg0500a.uml" />
     <MskCompiler Include="..\src\cg\cg0700a.uml" />
     <MskCompiler Include="..\src\cg\cg0800a.uml" />
-    <MskCompiler Include="..\src\cg\cg4300a.uml" />
   </ItemGroup>
   <ItemGroup>
     <TrrCompiler Include="..\src\cg\f103.trr" />
@@ -290,6 +289,7 @@
     <ClInclude Include="..\src\cg\cg0500.h" />
     <ClInclude Include="..\src\cg\cg0700a.h" />
     <ClInclude Include="..\src\cg\cg0800a.h" />
+    <ClInclude Include="..\src\cg\cglib05.h" />
     <ClInclude Include="..\src\cg\cgpim.h" />
   </ItemGroup>
   <ItemGroup>
@@ -315,10 +315,11 @@
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <RepCompiler Include="..\src\cg\cg0800a.rep" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+<ItemGroup>
+    <RepCompiler Include="..\src\cg\cg0800a.rep">
+      <SubType>Designer</SubType>
+    </RepCompiler>
+  </ItemGroup>  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="CampoRules.targets" />
   </ImportGroup>
diff --git a/build/Cg0.vcxproj.filters b/build/Cg0.vcxproj.filters
index dba1b4a3e..4a75154f4 100644
--- a/build/Cg0.vcxproj.filters
+++ b/build/Cg0.vcxproj.filters
@@ -98,9 +98,6 @@
     <MskCompiler Include="..\src\cg\cg0400b.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\src\cg\cg4300a.uml">
-      <Filter>Masks</Filter>
-    </MskCompiler>
     <MskCompiler Include="..\src\cg\cg0800a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
@@ -263,6 +260,9 @@
     <ClInclude Include="..\src\cg\cg0800a.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\cg\cglib05.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/build/Cg4.vcxproj b/build/Cg4.vcxproj
index 3ccb71b7c..a4cc7aea4 100644
--- a/build/Cg4.vcxproj
+++ b/build/Cg4.vcxproj
@@ -118,7 +118,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -332,6 +331,7 @@
     <ClInclude Include="..\src\cg\cg4900a.h" />
     <ClInclude Include="..\src\cg\cg4a00a.h" />
     <ClInclude Include="..\src\cg\cg4b00a.h" />
+    <ClInclude Include="..\src\cg\cglib01.h" />
     <ClInclude Include="..\src\cg\cglib05.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/Cg4.vcxproj.filters b/build/Cg4.vcxproj.filters
index b6a473f07..a39aa13ee 100644
--- a/build/Cg4.vcxproj.filters
+++ b/build/Cg4.vcxproj.filters
@@ -224,6 +224,9 @@
     <ClInclude Include="..\src\cg\cglib05.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\cg\cglib01.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/build/Cg7.vcxproj b/build/Cg7.vcxproj
index c02ac9549..58352acf1 100644
--- a/build/Cg7.vcxproj
+++ b/build/Cg7.vcxproj
@@ -68,7 +68,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -160,6 +159,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\ba\ba8500.cpp" />
+    <ClCompile Include="..\src\cg\cg2103.cpp" />
     <ClCompile Include="..\src\cg\cg7.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -183,6 +183,7 @@
     <ClCompile Include="..\src\cg\cgpim.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\src\cg\cg2103.h" />
     <ClInclude Include="..\src\cg\cg7400a.h" />
     <ClInclude Include="..\src\cg\cg5900a.h" />
     <ClInclude Include="..\src\cg\cg7.h" />
diff --git a/build/Cg7.vcxproj.filters b/build/Cg7.vcxproj.filters
index f32c43b99..e80050280 100644
--- a/build/Cg7.vcxproj.filters
+++ b/build/Cg7.vcxproj.filters
@@ -37,6 +37,9 @@
     <ClCompile Include="..\src\cg\cg7800.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cg\cg2103.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\cg\cg7.h">
@@ -63,6 +66,9 @@
     <ClInclude Include="..\src\cg\ivadiff.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\cg\cg2103.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/build/Cg7.vcxproj.user b/build/Cg7.vcxproj.user
index 5c0ad9bfc..19815b0e2 100644
--- a/build/Cg7.vcxproj.user
+++ b/build/Cg7.vcxproj.user
@@ -3,6 +3,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-6 -uADMIN</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-5 -uADMIN</LocalDebuggerCommandArguments>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/build/ca3.vcxproj b/build/ca3.vcxproj
index 3a31711f0..84608ccab 100644
--- a/build/ca3.vcxproj
+++ b/build/ca3.vcxproj
@@ -293,7 +293,9 @@
   </ItemGroup>
   <ItemGroup>
     <RepCompiler Include="..\src\ca\ca3100a.rep" />
-    <RepCompiler Include="..\src\ca\ca3100b.rep" />
+    <RepCompiler Include="..\src\ca\ca3100b.rep">
+      <SubType>Designer</SubType>
+    </RepCompiler>
     <RepCompiler Include="..\src\ca\ca3200a.rep" />
     <RepCompiler Include="..\src\ca\ca3200b.rep" />
     <RepCompiler Include="..\src\ca\ca3300a.rep" />
@@ -302,9 +304,15 @@
     <RepCompiler Include="..\src\ca\ca3300d.rep" />
     <RepCompiler Include="..\src\ca\ca3600a.rep" />
     <RepCompiler Include="..\src\ca\ca3700a.rep" />
-    <RepCompiler Include="..\src\ca\ca3800a.rep" />
-    <RepCompiler Include="..\src\ca\ca3800b.rep" />
-    <RepCompiler Include="..\src\ca\ca3800c.rep" />
+    <RepCompiler Include="..\src\ca\ca3800a.rep">
+      <SubType>Designer</SubType>
+    </RepCompiler>
+    <RepCompiler Include="..\src\ca\ca3800b.rep">
+      <SubType>Designer</SubType>
+    </RepCompiler>
+    <RepCompiler Include="..\src\ca\ca3800c.rep">
+      <SubType>Designer</SubType>
+    </RepCompiler>
     <RepCompiler Include="..\src\ca\ca3900a.rep" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/fastrip.exe b/build/fastrip.exe
index 15ee6b6a1..579752d23 100644
Binary files a/build/fastrip.exe and b/build/fastrip.exe differ
diff --git a/build/fastrip.vcxproj b/build/fastrip.vcxproj
index 37c48e875..6121502ce 100644
--- a/build/fastrip.vcxproj
+++ b/build/fastrip.vcxproj
@@ -14,8 +14,8 @@
     <ProjectGuid>{68251613-3B9A-4F87-9F40-827C46267ADE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fastrip</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
+
+    <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>
diff --git a/build/fd.vcxproj b/build/fd.vcxproj
index b0f0764ef..2fe599852 100644
--- a/build/fd.vcxproj
+++ b/build/fd.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -15,18 +15,21 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fd</RootNamespace>
     <ProjectName>fd0</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.17763.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>NotSet</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/lv0.vcxproj b/build/lv0.vcxproj
index 41c17ad39..01cbfe881 100644
--- a/build/lv0.vcxproj
+++ b/build/lv0.vcxproj
@@ -144,6 +144,7 @@
       <Version>12.0</Version>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/lv1.vcxproj b/build/lv1.vcxproj
index dc6336412..dde97df19 100644
--- a/build/lv1.vcxproj
+++ b/build/lv1.vcxproj
@@ -146,6 +146,7 @@
       <Version>12.0</Version>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/lv2.vcxproj b/build/lv2.vcxproj
index 91a6b9c2f..6c20c0097 100644
--- a/build/lv2.vcxproj
+++ b/build/lv2.vcxproj
@@ -143,6 +143,7 @@
       <Version>12.0</Version>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/lv3.vcxproj b/build/lv3.vcxproj
index 5f773b397..302e351de 100644
--- a/build/lv3.vcxproj
+++ b/build/lv3.vcxproj
@@ -144,6 +144,7 @@
       <Version>12.0</Version>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -188,6 +189,7 @@
     <ClInclude Include="..\src\lv\lv3600a.h" />
     <ClInclude Include="..\src\lv\lv3700a.h" />
     <ClInclude Include="..\src\lv\lv3uml.h" />
+    <ClInclude Include="..\src\ve\ve0100.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuildStep Include="..\lib\AgaLib.lib">
diff --git a/build/lv3.vcxproj.filters b/build/lv3.vcxproj.filters
index 15cabdef5..c601d648a 100644
--- a/build/lv3.vcxproj.filters
+++ b/build/lv3.vcxproj.filters
@@ -100,6 +100,9 @@
     <ClInclude Include="..\src\lv\lv3uml.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\ve\ve0100.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/build/lv4.vcxproj b/build/lv4.vcxproj
index 72a884b4e..1c6782283 100644
--- a/build/lv4.vcxproj
+++ b/build/lv4.vcxproj
@@ -147,6 +147,7 @@
       <Version>12.0</Version>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/mr0.vcxproj b/build/mr0.vcxproj
index 49e111518..4b862e593 100644
--- a/build/mr0.vcxproj
+++ b/build/mr0.vcxproj
@@ -63,10 +63,9 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -84,6 +83,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj
index 7a2102319..12d17131d 100644
--- a/build/mr1.vcxproj
+++ b/build/mr1.vcxproj
@@ -105,7 +105,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -121,7 +120,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,6 +134,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj
index aa45e1736..f07c776ad 100644
--- a/build/mr2.vcxproj
+++ b/build/mr2.vcxproj
@@ -63,11 +63,10 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -76,7 +75,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -91,6 +90,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
       <Profile>false</Profile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/msk232.bat b/build/msk232.bat
index 386018762..5eef7df95 100644
--- a/build/msk232.bat
+++ b/build/msk232.bat
@@ -8,7 +8,7 @@ type ..\src\include\uml.h >%TMP%\%~n1.tmp
 type %1 >>%TMP%\%~n1.tmp
 
 cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\%~n1.tm2
-patchdef %TMP%\%~n1.tm2 %TMP%\%TMP%\%~n1.tm3
+patchdef %TMP%\%~n1.tm2 %TMP%\%~n1.tm3
 
 type ..\src\include\uml.h >%TMP%\%~n1.uml
 type %TMP%\%~n1.tm3 >>%TMP%\%~n1.uml
diff --git a/build/pg0001.vcxproj b/build/pg0001.vcxproj
index c3da22b77..4d3a98213 100644
--- a/build/pg0001.vcxproj
+++ b/build/pg0001.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9D5735F1-EE47-4ED3-929A-048FFF8B6344}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pg0067.vcxproj b/build/pg0067.vcxproj
index 7558a3a4f..5e6e31d1a 100644
--- a/build/pg0067.vcxproj
+++ b/build/pg0067.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{453301DF-028E-479F-9548-C2346AD8C6ED}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pg0068.vcxproj b/build/pg0068.vcxproj
index 7a0e80d51..ed0625d9a 100644
--- a/build/pg0068.vcxproj
+++ b/build/pg0068.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DE9692C8-AD5E-4AD1-A0BB-16B9A4F722F1}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pg0069.vcxproj b/build/pg0069.vcxproj
index 3f9d1db0b..4a27598fa 100644
--- a/build/pg0069.vcxproj
+++ b/build/pg0069.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3B1237FC-2632-448E-B5F1-A1B2A3278E47}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pg0388.vcxproj b/build/pg0388.vcxproj
index 2eae33f79..ddd60c4ff 100644
--- a/build/pg0388.vcxproj
+++ b/build/pg0388.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4E392B08-31F0-48CC-AC05-5C6EE7A6473C}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pi0001.vcxproj b/build/pi0001.vcxproj
index c8943483f..b787c0cd9 100644
--- a/build/pi0001.vcxproj
+++ b/build/pi0001.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5379F62B-868B-4469-9FC9-993AF9ADE381}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pi0002.vcxproj b/build/pi0002.vcxproj
index 3eaf3bbf0..86855a5e7 100644
--- a/build/pi0002.vcxproj
+++ b/build/pi0002.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F154352E-CF6F-44A1-B45F-BAE74281A0AD}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pl0001.vcxproj b/build/pl0001.vcxproj
index bfa715189..4fa5c3a99 100644
--- a/build/pl0001.vcxproj
+++ b/build/pl0001.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EAA83FEF-B3E6-4BDE-B746-2BE727FA057A}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pl0002.vcxproj b/build/pl0002.vcxproj
index 28676a4cf..b12376c0b 100644
--- a/build/pl0002.vcxproj
+++ b/build/pl0002.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{69D3E5F4-0C68-4171-9296-D01B7E885C89}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/ps0017.vcxproj b/build/ps0017.vcxproj
index fbe014b21..f7d3326f6 100644
--- a/build/ps0017.vcxproj
+++ b/build/ps0017.vcxproj
@@ -42,7 +42,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
   </PropertyGroup>
@@ -116,7 +116,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -138,6 +137,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0077.vcxproj b/build/ps0077.vcxproj
index f0469ae2d..76c903aab 100644
--- a/build/ps0077.vcxproj
+++ b/build/ps0077.vcxproj
@@ -68,7 +68,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -76,7 +75,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -90,6 +89,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0099.vcxproj b/build/ps0099.vcxproj
index 198b85dee..a1d4ea2cb 100644
--- a/build/ps0099.vcxproj
+++ b/build/ps0099.vcxproj
@@ -114,7 +114,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -122,7 +121,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,6 +135,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0330.vcxproj b/build/ps0330.vcxproj
index f582a764d..205e740ee 100644
--- a/build/ps0330.vcxproj
+++ b/build/ps0330.vcxproj
@@ -68,7 +68,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -76,7 +75,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -90,6 +89,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0398.vcxproj b/build/ps0398.vcxproj
index bfbe9d92b..bb8d218c8 100644
--- a/build/ps0398.vcxproj
+++ b/build/ps0398.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -87,6 +86,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -115,7 +115,6 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
diff --git a/build/ps0430.vcxproj b/build/ps0430.vcxproj
index 1cc7208e8..012b947f4 100644
--- a/build/ps0430.vcxproj
+++ b/build/ps0430.vcxproj
@@ -113,7 +113,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -121,7 +120,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,6 +134,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0431.vcxproj b/build/ps0431.vcxproj
index d4844224a..a75a0fc18 100644
--- a/build/ps0431.vcxproj
+++ b/build/ps0431.vcxproj
@@ -108,7 +108,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -130,6 +129,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0544.vcxproj b/build/ps0544.vcxproj
index 5d1c731fc..98a572b29 100644
--- a/build/ps0544.vcxproj
+++ b/build/ps0544.vcxproj
@@ -113,7 +113,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -121,7 +120,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -135,6 +134,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0713.vcxproj b/build/ps0713.vcxproj
index 9238ace4b..030b4bef1 100644
--- a/build/ps0713.vcxproj
+++ b/build/ps0713.vcxproj
@@ -67,7 +67,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -75,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/build/ps0816.vcxproj b/build/ps0816.vcxproj
index 11dd0f294..721ce3cf1 100644
--- a/build/ps0816.vcxproj
+++ b/build/ps0816.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0830.vcxproj b/build/ps0830.vcxproj
index c400463ad..313c6da62 100644
--- a/build/ps0830.vcxproj
+++ b/build/ps0830.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0872.vcxproj b/build/ps0872.vcxproj
index 8e19f4942..4e8fc7b4a 100644
--- a/build/ps0872.vcxproj
+++ b/build/ps0872.vcxproj
@@ -114,7 +114,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -122,7 +121,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -136,6 +135,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0883.vcxproj b/build/ps0883.vcxproj
index f4c2536fa..0214be69c 100644
--- a/build/ps0883.vcxproj
+++ b/build/ps0883.vcxproj
@@ -68,7 +68,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -77,7 +76,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -91,6 +90,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0913 .vcxproj b/build/ps0913 .vcxproj
index fd261d9b8..ef6d23c0c 100644
--- a/build/ps0913 .vcxproj	
+++ b/build/ps0913 .vcxproj	
@@ -67,7 +67,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -89,6 +88,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0920.vcxproj b/build/ps0920.vcxproj
index e93fc4115..ae482bb47 100644
--- a/build/ps0920.vcxproj
+++ b/build/ps0920.vcxproj
@@ -41,7 +41,7 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0925.vcxproj b/build/ps0925.vcxproj
index 2817f980f..b4ccc28ef 100644
--- a/build/ps0925.vcxproj
+++ b/build/ps0925.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps0982 .vcxproj b/build/ps0982 .vcxproj
index fd30e35a2..3ec9b424c 100644
--- a/build/ps0982 .vcxproj	
+++ b/build/ps0982 .vcxproj	
@@ -67,7 +67,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -75,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -89,6 +88,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps1001.vcxproj b/build/ps1001.vcxproj
index 1ef63e58b..50c53678e 100644
--- a/build/ps1001.vcxproj
+++ b/build/ps1001.vcxproj
@@ -67,7 +67,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -75,7 +74,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -89,6 +88,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps1004.vcxproj b/build/ps1004.vcxproj
index 4d79c82fb..cebe8b78c 100644
--- a/build/ps1004.vcxproj
+++ b/build/ps1004.vcxproj
@@ -116,7 +116,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -138,6 +137,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps1100.vcxproj b/build/ps1100.vcxproj
index c3cb7497f..899d3fd96 100644
--- a/build/ps1100.vcxproj
+++ b/build/ps1100.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,8 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ps1104.vcxproj b/build/ps1104.vcxproj
index dd93bed32..80626651f 100644
--- a/build/ps1104.vcxproj
+++ b/build/ps1104.vcxproj
@@ -66,7 +66,6 @@
       <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
       <ObjectFileName>.\..\debug/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -74,7 +73,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -88,6 +87,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/pt0001.vcxproj b/build/pt0001.vcxproj
index 073cd1cd0..161a015ec 100644
--- a/build/pt0001.vcxproj
+++ b/build/pt0001.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1479CB30-7DF8-4F92-A3E6-856EA6F2210C}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pt0003.vcxproj b/build/pt0003.vcxproj
index 9f192eb8d..f489e7b12 100644
--- a/build/pt0003.vcxproj
+++ b/build/pt0003.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0AA531D2-E451-4214-B9CE-E06C9E42BA2D}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/pt0195.vcxproj b/build/pt0195.vcxproj
index 6b9bd9f15..b165b1090 100644
--- a/build/pt0195.vcxproj
+++ b/build/pt0195.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -12,15 +12,18 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6796CEDE-A4D5-4340-B24D-F0E7DCEF050D}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj
index a4f943021..cae81e8c4 100644
--- a/build/tf0.vcxproj
+++ b/build/tf0.vcxproj
@@ -92,6 +92,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/build/ve0.vcxproj b/build/ve0.vcxproj
index c8f8f1a8a..de8f6cdff 100644
--- a/build/ve0.vcxproj
+++ b/build/ve0.vcxproj
@@ -66,7 +66,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       
       <WarningLevel>Level3</WarningLevel>
diff --git a/build/ve3.vcxproj b/build/ve3.vcxproj
index 9e6114665..a61c80941 100644
--- a/build/ve3.vcxproj
+++ b/build/ve3.vcxproj
@@ -68,7 +68,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -93,6 +92,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>