diff --git a/AppleWinExpress2012.sln b/AppleWinExpress2012.sln
deleted file mode 100644
index 49cd5e65..00000000
--- a/AppleWinExpress2012.sln
+++ /dev/null
@@ -1,50 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppleWin", "AppleWinExpress2012.vcxproj", "{0A960136-A00A-4D4B-805F-664D9950D2CA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D} = {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E} = {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip_lib", "zip_lib\zip_lib2012.vcxproj", "{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib-Express2012.vcxproj", "{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug NoDX|Win32 = Debug NoDX|Win32
-		Debug|Win32 = Debug|Win32
-		Release NoDX|Win32 = Release NoDX|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug NoDX|Win32.ActiveCfg = Debug NoDX|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug NoDX|Win32.Build.0 = Debug NoDX|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug|Win32.Build.0 = Debug|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Release NoDX|Win32.ActiveCfg = Release NoDX|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Release NoDX|Win32.Build.0 = Release NoDX|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Release|Win32.ActiveCfg = Release|Win32
-		{0A960136-A00A-4D4B-805F-664D9950D2CA}.Release|Win32.Build.0 = Release|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug NoDX|Win32.ActiveCfg = Debug|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug NoDX|Win32.Build.0 = Debug|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug|Win32.Build.0 = Debug|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release NoDX|Win32.ActiveCfg = Release|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release NoDX|Win32.Build.0 = Release|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release|Win32.ActiveCfg = Release|Win32
-		{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release|Win32.Build.0 = Release|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug NoDX|Win32.ActiveCfg = Debug|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug NoDX|Win32.Build.0 = Debug|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug|Win32.Build.0 = Debug|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release NoDX|Win32.ActiveCfg = Release|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release NoDX|Win32.Build.0 = Release|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release|Win32.ActiveCfg = Release|Win32
-		{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/AppleWinExpress2012.vcxproj b/AppleWinExpress2012.vcxproj
deleted file mode 100644
index 42ba5edb..00000000
--- a/AppleWinExpress2012.vcxproj
+++ /dev/null
@@ -1,424 +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 NoDX|Win32">
-      <Configuration>Debug NoDX</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release NoDX|Win32">
-      <Configuration>Release NoDX</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource\resource.h" />
-    <ClInclude Include="resource\winres.h" />
-    <ClInclude Include="source\6821.h" />
-    <ClInclude Include="source\Applewin.h" />
-    <ClInclude Include="source\AY8910.h" />
-    <ClInclude Include="source\Common.h" />
-    <ClInclude Include="source\CommonVICE\6510core.h" />
-    <ClInclude Include="source\CommonVICE\alarm.h" />
-    <ClInclude Include="source\CommonVICE\interrupt.h" />
-    <ClInclude Include="source\CommonVICE\mem.h" />
-    <ClInclude Include="source\CommonVICE\types.h" />
-    <ClInclude Include="source\Configuration\About.h" />
-    <ClInclude Include="source\Configuration\Config.h" />
-    <ClInclude Include="source\Configuration\IPropertySheet.h" />
-    <ClInclude Include="source\Configuration\IPropertySheetPage.h" />
-    <ClInclude Include="source\Configuration\PageAdvanced.h" />
-    <ClInclude Include="source\Configuration\PageConfig.h" />
-    <ClInclude Include="source\Configuration\PageConfigTfe.h" />
-    <ClInclude Include="source\Configuration\PageDisk.h" />
-    <ClInclude Include="source\Configuration\PageInput.h" />
-    <ClInclude Include="source\Configuration\PageSound.h" />
-    <ClInclude Include="source\Configuration\PropertySheet.h" />
-    <ClInclude Include="source\Configuration\PropertySheetDefs.h" />
-    <ClInclude Include="source\Configuration\PropertySheetHelper.h" />
-    <ClInclude Include="source\CPU.h" />
-    <ClInclude Include="source\CPU\cpu6502.h" />
-    <ClInclude Include="source\CPU\cpu65C02.h" />
-    <ClInclude Include="source\CPU\cpu65d02.h" />
-    <ClInclude Include="source\Debugger\Debug.h" />
-    <ClInclude Include="source\Debugger\DebugDefs.h" />
-    <ClInclude Include="source\Debugger\Debugger_Assembler.h" />
-    <ClInclude Include="source\Debugger\Debugger_Color.h" />
-    <ClInclude Include="source\Debugger\Debugger_Console.h" />
-    <ClInclude Include="source\Debugger\Debugger_DisassemblerData.h" />
-    <ClInclude Include="source\Debugger\Debugger_Display.h" />
-    <ClInclude Include="source\Debugger\Debugger_Help.h" />
-    <ClInclude Include="source\Debugger\Debugger_Parser.h" />
-    <ClInclude Include="source\Debugger\Debugger_Range.h" />
-    <ClInclude Include="source\Debugger\Debugger_Symbols.h" />
-    <ClInclude Include="source\Debugger\Debugger_Types.h" />
-    <ClInclude Include="source\Debugger\Util_MemoryTextFile.h" />
-    <ClInclude Include="source\Debugger\Util_Text.h" />
-    <ClInclude Include="source\Disk.h" />
-    <ClInclude Include="source\DiskDefs.h" />
-    <ClInclude Include="source\DiskImage.h" />
-    <ClInclude Include="source\DiskImageHelper.h" />
-    <ClInclude Include="source\Frame.h" />
-    <ClInclude Include="source\Harddisk.h" />
-    <ClInclude Include="source\Joystick.h" />
-    <ClInclude Include="source\Keyboard.h" />
-    <ClInclude Include="source\Log.h" />
-    <ClInclude Include="source\Memory.h" />
-    <ClInclude Include="source\Mockingboard.h" />
-    <ClInclude Include="source\MouseInterface.h" />
-    <ClInclude Include="source\NoSlotClock.h" />
-    <ClInclude Include="source\ParallelPrinter.h" />
-    <ClInclude Include="source\Pravets.h" />
-    <ClInclude Include="source\Registry.h" />
-    <ClInclude Include="source\Riff.h" />
-    <ClInclude Include="source\SaveState.h" />
-    <ClInclude Include="source\SerialComms.h" />
-    <ClInclude Include="source\SoundCore.h" />
-    <ClInclude Include="source\Speaker.h" />
-    <ClInclude Include="source\Speech.h" />
-    <ClInclude Include="source\SSI263Phonemes.h" />
-    <ClInclude Include="source\StdAfx.h" />
-    <ClInclude Include="source\Structs.h" />
-    <ClInclude Include="source\Tape.h" />
-    <ClInclude Include="source\Tfe\Bittypes.h" />
-    <ClInclude Include="source\Tfe\Bpf.h" />
-    <ClInclude Include="source\Tfe\Ip6_misc.h" />
-    <ClInclude Include="source\Tfe\Pcap-stdinc.h" />
-    <ClInclude Include="source\Tfe\Pcap.h" />
-    <ClInclude Include="source\Tfe\Tfe.h" />
-    <ClInclude Include="source\Tfe\Tfearch.h" />
-    <ClInclude Include="source\Tfe\Tfesupp.h" />
-    <ClInclude Include="source\Tfe\Uilib.h" />
-    <ClInclude Include="source\Video.h" />
-    <ClInclude Include="source\z80emu.h" />
-    <ClInclude Include="source\Z80VICE\daa.h" />
-    <ClInclude Include="source\Z80VICE\z80.h" />
-    <ClInclude Include="source\Z80VICE\z80mem.h" />
-    <ClInclude Include="source\Z80VICE\z80regs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="docs\CodingConventions.txt" />
-    <Text Include="docs\Debugger_Changelog.txt" />
-    <Text Include="docs\FAQ.txt" />
-    <Text Include="bin\History.txt" />
-    <Text Include="docs\ToDo.txt" />
-    <Text Include="docs\Video_Cleanup.txt" />
-    <Text Include="docs\Wishlist.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="source\6821.cpp" />
-    <ClCompile Include="source\Applewin.cpp" />
-    <ClCompile Include="source\AY8910.cpp" />
-    <ClCompile Include="source\Configuration\About.cpp" />
-    <ClCompile Include="source\Configuration\PageAdvanced.cpp" />
-    <ClCompile Include="source\Configuration\PageConfig.cpp" />
-    <ClCompile Include="source\Configuration\PageConfigTfe.cpp" />
-    <ClCompile Include="source\Configuration\PageDisk.cpp" />
-    <ClCompile Include="source\Configuration\PageInput.cpp" />
-    <ClCompile Include="source\Configuration\PageSound.cpp" />
-    <ClCompile Include="source\Configuration\PropertySheet.cpp" />
-    <ClCompile Include="source\Configuration\PropertySheetHelper.cpp" />
-    <ClCompile Include="source\CPU.cpp" />
-    <ClCompile Include="source\Debugger\Debug.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Assembler.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Color.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Commands.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Console.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_DisassemblerData.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Display.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Help.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Parser.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Range.cpp" />
-    <ClCompile Include="source\Debugger\Debugger_Symbols.cpp" />
-    <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp" />
-    <ClCompile Include="source\Disk.cpp" />
-    <ClCompile Include="source\DiskImage.cpp" />
-    <ClCompile Include="source\DiskImageHelper.cpp" />
-    <ClCompile Include="source\Frame.cpp" />
-    <ClCompile Include="source\Harddisk.cpp" />
-    <ClCompile Include="source\Joystick.cpp" />
-    <ClCompile Include="source\Keyboard.cpp" />
-    <ClCompile Include="source\Log.cpp" />
-    <ClCompile Include="source\Memory.cpp" />
-    <ClCompile Include="source\Mockingboard.cpp" />
-    <ClCompile Include="source\MouseInterface.cpp" />
-    <ClCompile Include="source\NoSlotClock.cpp" />
-    <ClCompile Include="source\ParallelPrinter.cpp" />
-    <ClCompile Include="source\Pravets.cpp" />
-    <ClCompile Include="source\Registry.cpp" />
-    <ClCompile Include="source\Riff.cpp" />
-    <ClCompile Include="source\SaveState.cpp" />
-    <ClCompile Include="source\SerialComms.cpp" />
-    <ClCompile Include="source\SoundCore.cpp" />
-    <ClCompile Include="source\Speaker.cpp" />
-    <ClCompile Include="source\Speech.cpp" />
-    <ClCompile Include="source\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Tape.cpp" />
-    <ClCompile Include="source\Tfe\Tfe.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Tfearch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Tfesupp.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Uilib.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Video.cpp" />
-    <ClCompile Include="source\z80emu.cpp" />
-    <ClCompile Include="source\Z80VICE\daa.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Z80VICE\z80.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="source\Z80VICE\z80mem.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="resource\Apple2.rom" />
-    <None Include="resource\Apple2e.rom" />
-    <None Include="resource\Apple2e_Enhanced.rom" />
-    <None Include="resource\Apple2_Plus.rom" />
-    <None Include="resource\DISK2.rom" />
-    <None Include="resource\Freezes_Non-autostart_F8_Rom.rom" />
-    <None Include="resource\Hddrvr.bin" />
-    <None Include="resource\Mockingboard-D.rom" />
-    <None Include="resource\MouseInterface.rom" />
-    <None Include="resource\Parallel.rom" />
-    <None Include="resource\PRAVETS82.ROM" />
-    <None Include="resource\PRAVETS8C.ROM" />
-    <None Include="resource\PRAVETS8M.ROM" />
-    <None Include="resource\SSC.rom" />
-    <None Include="resource\ThunderClockPlus.rom" />
-    <None Include="source\CPU\cpu_general.inl" />
-    <None Include="source\CPU\cpu_instructions.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zip_lib\zip_lib2012.vcxproj">
-      <Project>{509739e7-0af3-4c09-a1a9-f0b1bc31b39d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="zlib\zlib-Express2012.vcxproj">
-      <Project>{9b32a6e7-1237-4f36-8903-a3fd51df9c4e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="resource\Applewin.bmp" />
-    <Image Include="resource\APPLEWIN.ICO" />
-    <Image Include="resource\CAPSOFF.BMP" />
-    <Image Include="resource\CAPSOFF_P8.BMP" />
-    <Image Include="resource\CAPSON.BMP" />
-    <Image Include="resource\CAPSON_P8.BMP" />
-    <Image Include="resource\CHARSET4.BMP" />
-    <Image Include="resource\CHARSET82.bmp" />
-    <Image Include="resource\CHARSET8C.bmp" />
-    <Image Include="resource\CHARSET8M.bmp" />
-    <Image Include="resource\COLOR.BMP" />
-    <Image Include="resource\DEBUG.BMP" />
-    <Image Include="resource\Debug_Font.bmp" />
-    <Image Include="resource\DISK.ICO" />
-    <Image Include="resource\DISKOFF.BMP" />
-    <Image Include="resource\DISKPROT.BMP" />
-    <Image Include="resource\DISKREAD.BMP" />
-    <Image Include="resource\DISKWRIT.BMP" />
-    <Image Include="resource\DRIVE1.BMP" />
-    <Image Include="resource\DRIVE2.BMP" />
-    <Image Include="resource\DriveSwap.bmp" />
-    <Image Include="resource\FULLSCR.BMP" />
-    <Image Include="resource\HELP.BMP" />
-    <Image Include="resource\LATOFF.BMP" />
-    <Image Include="resource\LATON.BMP" />
-    <Image Include="resource\LED_CAPS_OFF.BMP" />
-    <Image Include="resource\LED_CAPS_OFF_LAT.BMP" />
-    <Image Include="resource\LED_CAPS_OFF_P8.BMP" />
-    <Image Include="resource\LED_CAPS_ON.BMP" />
-    <Image Include="resource\LED_CAPS_ON_LAT.BMP" />
-    <Image Include="resource\LED_CAPS_ON_P8.BMP" />
-    <Image Include="resource\RUN.BMP" />
-    <Image Include="resource\RUNP.BMP" />
-    <Image Include="resource\SETUP.BMP" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource\Applewin.rc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0A960136-A00A-4D4B-805F-664D9950D2CA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>AppleWinExpress2012</RootNamespace>
-    <ProjectName>AppleWin</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>source\cpu;source\emulator;source\debugger;zlib;zip_lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>htmlhelp.lib;comctl32.lib;ddraw.lib;winmm.lib;dsound.lib;dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;Advapi32.lib;shell32.lib;Comdlg32.lib;ole32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalManifestDependencies>"type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;NO_DIRECT_X;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>source\cpu;source\emulator;source\debugger;zlib;zip_lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>htmlhelp.lib;comctl32.lib;ddraw.lib;winmm.lib;dsound.lib;dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;Advapi32.lib;shell32.lib;Comdlg32.lib;ole32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalManifestDependencies>"type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>source\cpu;source\emulator;source\debugger;zlib;zip_lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>htmlhelp.lib;comctl32.lib;ddraw.lib;winmm.lib;dsound.lib;dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;Advapi32.lib;shell32.lib;Comdlg32.lib;ole32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalManifestDependencies>"type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;NO_DIRECT_X;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>source\cpu;source\emulator;source\debugger;zlib;zip_lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>htmlhelp.lib;comctl32.lib;ddraw.lib;winmm.lib;dsound.lib;dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;Advapi32.lib;shell32.lib;Comdlg32.lib;ole32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <AdditionalManifestDependencies>"type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"</AdditionalManifestDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/AppleWinExpress2012.vcxproj.filters b/AppleWinExpress2012.vcxproj.filters
deleted file mode 100644
index 81d4fde5..00000000
--- a/AppleWinExpress2012.vcxproj.filters
+++ /dev/null
@@ -1,659 +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="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="Docs">
-      <UniqueIdentifier>{a9a09086-bbce-46ea-8b29-f18a8df8732b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CommonVICE">
-      <UniqueIdentifier>{d1228537-59c3-4a6c-92fd-d7ba9d4efab7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Configuration">
-      <UniqueIdentifier>{d614ba59-527b-4acb-842e-7b61ca7f694f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\CPU">
-      <UniqueIdentifier>{2e94f8a1-5598-4bed-8365-add09bca1f56}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Debugger">
-      <UniqueIdentifier>{71ec7de0-6ba1-4de1-9bc8-bdc3597e62cd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Disk">
-      <UniqueIdentifier>{2c27fcf6-cf59-4359-9e15-2de64af1a94f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Emulator">
-      <UniqueIdentifier>{9b13bfc1-31ab-4f55-bb69-b8620ebdc2be}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Model">
-      <UniqueIdentifier>{15b450e4-f89f-4d80-9c44-48b32f33f3e3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Uthernet">
-      <UniqueIdentifier>{9bcc8097-f610-4843-bd76-a313aa54fbb0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Video">
-      <UniqueIdentifier>{f688ce36-1417-440c-b844-f2180a0017a9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Z80VICE">
-      <UniqueIdentifier>{4cecf5fc-1fe3-425f-907a-b62a6d046d45}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\_Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="source\Common.h">
-      <Filter>Source Files\_Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="source\SSI263Phonemes.h">
-      <Filter>Source Files\_Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Structs.h">
-      <Filter>Source Files\_Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="resource\resource.h">
-      <Filter>Source Files\_Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Applewin.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="source\StdAfx.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CommonVICE\6510core.h">
-      <Filter>Source Files\CommonVICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CommonVICE\alarm.h">
-      <Filter>Source Files\CommonVICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CommonVICE\interrupt.h">
-      <Filter>Source Files\CommonVICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CommonVICE\mem.h">
-      <Filter>Source Files\CommonVICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CommonVICE\types.h">
-      <Filter>Source Files\CommonVICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\About.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\Config.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\IPropertySheet.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\IPropertySheetPage.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageAdvanced.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageConfig.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageConfigTfe.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageDisk.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageInput.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PageSound.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PropertySheet.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PropertySheetDefs.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Configuration\PropertySheetHelper.h">
-      <Filter>Source Files\Configuration</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CPU\cpu65C02.h">
-      <Filter>Source Files\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CPU\cpu65d02.h">
-      <Filter>Source Files\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CPU\cpu6502.h">
-      <Filter>Source Files\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="source\CPU.h">
-      <Filter>Source Files\CPU</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debug.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Assembler.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Color.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Console.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_DisassemblerData.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Display.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Help.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Parser.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Range.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Symbols.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Debugger_Types.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Util_MemoryTextFile.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Disk.h">
-      <Filter>Source Files\Disk</Filter>
-    </ClInclude>
-    <ClInclude Include="source\DiskImage.h">
-      <Filter>Source Files\Disk</Filter>
-    </ClInclude>
-    <ClInclude Include="source\DiskImageHelper.h">
-      <Filter>Source Files\Disk</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Harddisk.h">
-      <Filter>Source Files\Disk</Filter>
-    </ClInclude>
-    <ClInclude Include="source\6821.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\AY8910.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Joystick.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Keyboard.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Log.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Memory.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Mockingboard.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\MouseInterface.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\NoSlotClock.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\ParallelPrinter.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Registry.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Riff.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\SaveState.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\SerialComms.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\SoundCore.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Speaker.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Speech.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tape.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\z80emu.h">
-      <Filter>Source Files\Emulator</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Z80VICE\daa.h">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Z80VICE\z80.h">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Z80VICE\z80mem.h">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Z80VICE\z80regs.h">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Frame.h">
-      <Filter>Source Files\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Video.h">
-      <Filter>Source Files\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Bittypes.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Bpf.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Ip6_misc.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Pcap.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Pcap-stdinc.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Tfe.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Tfearch.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Tfesupp.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Tfe\Uilib.h">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClInclude>
-    <ClInclude Include="resource\winres.h">
-      <Filter>Resource Files</Filter>
-    </ClInclude>
-    <ClInclude Include="source\DiskDefs.h">
-      <Filter>Source Files\Disk</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\DebugDefs.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Debugger\Util_Text.h">
-      <Filter>Source Files\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="source\Pravets.h">
-      <Filter>Source Files\Model</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="docs\CodingConventions.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="docs\Debugger_Changelog.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="docs\FAQ.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="bin\History.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="docs\ToDo.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="docs\Video_Cleanup.txt">
-      <Filter>Docs</Filter>
-    </Text>
-    <Text Include="docs\Wishlist.txt">
-      <Filter>Docs</Filter>
-    </Text>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="source\Applewin.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="source\StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\About.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageAdvanced.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageConfig.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageConfigTfe.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageDisk.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageInput.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PageSound.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PropertySheet.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Configuration\PropertySheetHelper.cpp">
-      <Filter>Source Files\Configuration</Filter>
-    </ClCompile>
-    <ClCompile Include="source\CPU.cpp">
-      <Filter>Source Files\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debug.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Assembler.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Color.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Commands.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Console.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_DisassemblerData.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Display.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Help.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Parser.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Range.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Debugger_Symbols.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp">
-      <Filter>Source Files\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Disk.cpp">
-      <Filter>Source Files\Disk</Filter>
-    </ClCompile>
-    <ClCompile Include="source\DiskImage.cpp">
-      <Filter>Source Files\Disk</Filter>
-    </ClCompile>
-    <ClCompile Include="source\DiskImageHelper.cpp">
-      <Filter>Source Files\Disk</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Harddisk.cpp">
-      <Filter>Source Files\Disk</Filter>
-    </ClCompile>
-    <ClCompile Include="source\6821.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\AY8910.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Joystick.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Keyboard.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Log.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Memory.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Mockingboard.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\MouseInterface.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\NoSlotClock.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\ParallelPrinter.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Registry.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Riff.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\SaveState.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\SerialComms.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\SoundCore.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Speaker.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Speech.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Tape.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\z80emu.cpp">
-      <Filter>Source Files\Emulator</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Z80VICE\daa.cpp">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Z80VICE\z80.cpp">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Z80VICE\z80mem.cpp">
-      <Filter>Source Files\Z80VICE</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Frame.cpp">
-      <Filter>Source Files\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Video.cpp">
-      <Filter>Source Files\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Tfe.cpp">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Tfearch.cpp">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Tfesupp.cpp">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Tfe\Uilib.cpp">
-      <Filter>Source Files\Uthernet</Filter>
-    </ClCompile>
-    <ClCompile Include="source\Pravets.cpp">
-      <Filter>Source Files\Model</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="source\CPU\cpu_general.inl">
-      <Filter>Source Files\CPU</Filter>
-    </None>
-    <None Include="source\CPU\cpu_instructions.inl">
-      <Filter>Source Files\CPU</Filter>
-    </None>
-    <None Include="resource\Apple2.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Apple2_Plus.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Apple2e.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Apple2e_Enhanced.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\DISK2.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Freezes_Non-autostart_F8_Rom.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Hddrvr.bin">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Mockingboard-D.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\MouseInterface.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\Parallel.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\PRAVETS8C.ROM">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\PRAVETS8M.ROM">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\PRAVETS82.ROM">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\SSC.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="resource\ThunderClockPlus.rom">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="resource\Applewin.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\APPLEWIN.ICO">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CAPSOFF.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CAPSOFF_P8.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CAPSON.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CAPSON_P8.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CHARSET4.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CHARSET8C.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CHARSET8M.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\CHARSET82.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\COLOR.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DEBUG.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\Debug_Font.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DISK.ICO">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DISKOFF.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DISKPROT.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DISKREAD.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DISKWRIT.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DRIVE1.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DRIVE2.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\DriveSwap.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\FULLSCR.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\HELP.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LATOFF.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LATON.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_OFF.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_OFF_LAT.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_OFF_P8.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_ON.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_ON_LAT.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\LED_CAPS_ON_P8.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\RUN.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\RUNP.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="resource\SETUP.BMP">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource\Applewin.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/NTSC.cpp b/source/NTSC.cpp
index 42d35096..a167b811 100644
--- a/source/NTSC.cpp
+++ b/source/NTSC.cpp
@@ -1631,7 +1631,7 @@ void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit
 	for (int y = 0; y < (VIDEO_SCANNER_Y_DISPLAY*2); y++)
 	{
 		uint32_t offset = sizeof(bgra_t) * GetFrameBufferWidth() * ((GetFrameBufferHeight() - 1) - y - GetFrameBufferBorderHeight()) + (sizeof(bgra_t) * GetFrameBufferBorderWidth());
-		offset -= sizeof(bgra_t);	// GH#555: Start 1 RGBA pixel before frame to account for g_nLastColumnPixelNTSC
+//		offset -= sizeof(bgra_t);	// GH#555: Start 1 RGBA pixel before frame to account for g_nLastColumnPixelNTSC
 		g_pScanLines[y] = (bgra_t*) (g_pFramebufferbits + offset);
 	}
 
diff --git a/zip_lib/zip_lib2012.vcxproj b/zip_lib/zip_lib2012.vcxproj
deleted file mode 100644
index 77b67814..00000000
--- a/zip_lib/zip_lib2012.vcxproj
+++ /dev/null
@@ -1,96 +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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="crypt.h" />
-    <ClInclude Include="ioapi.h" />
-    <ClInclude Include="iowin32.h" />
-    <ClInclude Include="mztools.h" />
-    <ClInclude Include="unzip.h" />
-    <ClInclude Include="zip.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ioapi.c" />
-    <ClCompile Include="iowin32.c" />
-    <ClCompile Include="mztools.c" />
-    <ClCompile Include="unzip.c" />
-    <ClCompile Include="zip.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>zip_lib</RootNamespace>
-    <ProjectName>zip_lib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/zip_lib/zip_lib2012.vcxproj.filters b/zip_lib/zip_lib2012.vcxproj.filters
deleted file mode 100644
index c7a6d9c7..00000000
--- a/zip_lib/zip_lib2012.vcxproj.filters
+++ /dev/null
@@ -1,46 +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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="crypt.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ioapi.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="iowin32.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mztools.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="unzip.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zip.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ioapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="iowin32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mztools.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/zlib/zlib-Express2012.vcxproj b/zlib/zlib-Express2012.vcxproj
deleted file mode 100644
index 6678d4dd..00000000
--- a/zlib/zlib-Express2012.vcxproj
+++ /dev/null
@@ -1,106 +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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="adler32.c" />
-    <ClCompile Include="compress.c" />
-    <ClCompile Include="crc32.c" />
-    <ClCompile Include="deflate.c" />
-    <ClCompile Include="gzio.c" />
-    <ClCompile Include="infback.c" />
-    <ClCompile Include="inffast.c" />
-    <ClCompile Include="inflate.c" />
-    <ClCompile Include="inftrees.c" />
-    <ClCompile Include="trees.c" />
-    <ClCompile Include="uncompr.c" />
-    <ClCompile Include="zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="crc32.h" />
-    <ClInclude Include="deflate.h" />
-    <ClInclude Include="inffast.h" />
-    <ClInclude Include="inffixed.h" />
-    <ClInclude Include="inflate.h" />
-    <ClInclude Include="inftrees.h" />
-    <ClInclude Include="trees.h" />
-    <ClInclude Include="zconf.h" />
-    <ClInclude Include="zconf.in.h" />
-    <ClInclude Include="zlib.h" />
-    <ClInclude Include="zutil.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>zlib</RootNamespace>
-    <ProjectName>zlib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/zlib/zlib-Express2012.vcxproj.filters b/zlib/zlib-Express2012.vcxproj.filters
deleted file mode 100644
index 5cdde106..00000000
--- a/zlib/zlib-Express2012.vcxproj.filters
+++ /dev/null
@@ -1,82 +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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gzio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="crc32.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="deflate.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inffast.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inffixed.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inflate.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="inftrees.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trees.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zconf.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zconf.in.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zlib.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="zutil.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file