From 61fcb9a73b91069665e609558dc3e01f4b07abce Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Fri, 7 Aug 2020 22:21:42 +0200
Subject: [PATCH] VisualGDB cleanup

---
 VSLinux/Amiberry.sln                          |  87 +---
 VSLinux/Amiberry.vcxproj                      | 146 ++----
 VSLinux/Amiberry.vcxproj.filters              | 105 ++--
 VSLinux/Amiberry.vcxproj.user                 |   3 +
 VSLinux/guisan/guisan.vcxproj                 | 410 +++++----------
 VSLinux/guisan/guisan.vcxproj.filters         | 486 +++++-------------
 VSLinux/guisan/guisan.vcxproj.user            |   9 +-
 VisualGDB/{Amiberry => }/Amiberry.sln         |  32 +-
 .../Amiberry-Debug-dispmanx.vgdbsettings      | 120 +++++
 ...iberry-Debug-sdl1.vgdbsettings.midwan.user |  17 -
 .../Amiberry/Amiberry-Debug.vgdbsettings      | 120 +++++
 .../Amiberry-Release-dispmanx.vgdbsettings    | 120 +++++
 .../Amiberry/Amiberry-Release.vgdbsettings    | 120 +++++
 VisualGDB/Amiberry/Amiberry.vcxproj           |  10 +-
 VisualGDB/Amiberry/Amiberry.vcxproj.filters   |   6 +
 VisualGDB/genblitter/Readme.txt               |  17 -
 VisualGDB/genblitter/genblitter.vcxproj       |  75 ---
 .../genblitter/genblitter.vcxproj.filters     |  40 --
 VisualGDB/genblitter/genblitter.vcxproj.user  |   4 -
 VisualGDB/genlinetoscr/Readme.txt             |   7 -
 VisualGDB/genlinetoscr/genlinetoscr.vcxproj   |  74 ---
 .../genlinetoscr/genlinetoscr.vcxproj.filters |  37 --
 .../genlinetoscr/genlinetoscr.vcxproj.user    |   4 -
 23 files changed, 885 insertions(+), 1164 deletions(-)
 rename VisualGDB/{Amiberry => }/Amiberry.sln (52%)
 create mode 100644 VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
 delete mode 100644 VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user
 create mode 100644 VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
 create mode 100644 VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
 create mode 100644 VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
 delete mode 100644 VisualGDB/genblitter/Readme.txt
 delete mode 100644 VisualGDB/genblitter/genblitter.vcxproj
 delete mode 100644 VisualGDB/genblitter/genblitter.vcxproj.filters
 delete mode 100644 VisualGDB/genblitter/genblitter.vcxproj.user
 delete mode 100644 VisualGDB/genlinetoscr/Readme.txt
 delete mode 100644 VisualGDB/genlinetoscr/genlinetoscr.vcxproj
 delete mode 100644 VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters
 delete mode 100644 VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user

diff --git a/VSLinux/Amiberry.sln b/VSLinux/Amiberry.sln
index e20217d8..84d8d893 100644
--- a/VSLinux/Amiberry.sln
+++ b/VSLinux/Amiberry.sln
@@ -12,67 +12,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcx
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug-rockpro64|ARM = Debug-rockpro64|ARM
-		Debug-rockpro64|ARM64 = Debug-rockpro64|ARM64
-		Debug-rpi4|ARM = Debug-rpi4|ARM
-		Debug-rpi4|ARM64 = Debug-rpi4|ARM64
-		Debug-xu4|ARM = Debug-xu4|ARM
-		Debug-xu4|ARM64 = Debug-xu4|ARM64
-		Release-rpi4|ARM = Release-rpi4|ARM
-		Release-rpi4|ARM64 = Release-rpi4|ARM64
-		Release-xu4|ARM = Release-xu4|ARM
-		Release-xu4|ARM64 = Release-xu4|ARM64
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.Build.0 = Debug-rockpro64|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.Build.0 = Debug|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.ActiveCfg = Debug-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.ActiveCfg = Release|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.Build.0 = Release|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Build.0 = Release|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.ActiveCfg = Release-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64
-		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.Build.0 = Debug|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.ActiveCfg = Debug-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.ActiveCfg = Release|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.Build.0 = Release|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Build.0 = Release|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.ActiveCfg = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64
-		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.Build.0 = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.Deploy.0 = Debug|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.ActiveCfg = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.Build.0 = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.Deploy.0 = Release|ARM
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.Build.0 = Release|ARM64
+		{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.Deploy.0 = Release|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.Build.0 = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.Deploy.0 = Debug|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.ActiveCfg = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.Build.0 = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.Deploy.0 = Release|ARM
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.Build.0 = Release|ARM64
+		{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.Deploy.0 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj
index 46a6d4fe..33772296 100644
--- a/VSLinux/Amiberry.vcxproj
+++ b/VSLinux/Amiberry.vcxproj
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-rockpro64|ARM">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-rockpro64|ARM64">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|ARM">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|ARM64">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
@@ -25,14 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|ARM">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|ARM64">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
@@ -56,31 +32,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>Remote_GCC_1_0</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects</RemoteRootDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -89,54 +46,6 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|x86'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
@@ -153,8 +62,8 @@
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=pi64</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=pi64</RemoteReBuildCommandLine>
     <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
     <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
@@ -199,16 +108,16 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
     <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
     <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <NMakeIncludeSearchPath>..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=pi64</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=pi64</RemoteReBuildCommandLine>
     <RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
     <NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
@@ -248,6 +157,7 @@
       <DeploymentContent>true</DeploymentContent>
     </Image>
     <Image Include="..\data\amiberry-logo.png" />
+    <Image Include="..\data\amiberry.png" />
     <Image Include="..\data\amigainfo.ico" />
     <Image Include="..\data\chip.ico">
       <DeploymentContent>true</DeploymentContent>
@@ -296,9 +206,6 @@
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\data\AmigaTopaz.ttf" />
-    <Font Include="..\data\Topaznew.ttf">
-      <DeploymentContent>true</DeploymentContent>
-    </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\conf\amiberry.conf">
@@ -308,9 +215,6 @@
       <DeploymentContent>false</DeploymentContent>
     </None>
     <None Include="..\src\aks.def" />
-    <None Include="..\src\filesys.asm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <None Include="..\src\inputevents.def">
       <DeploymentContent>true</DeploymentContent>
     </None>
@@ -320,9 +224,6 @@
     <None Include="..\src\osdep\aarch64_helper.s" />
     <None Include="..\src\osdep\arm_helper.s" />
     <None Include="..\src\osdep\neon_helper.s" />
-    <None Include="..\src\table68k">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\akiko.cpp">
@@ -420,12 +321,15 @@
     <ClCompile Include="..\src\cdrom.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\cdtv.cpp" />
+    <ClCompile Include="..\src\cdtvcr.cpp" />
     <ClCompile Include="..\src\cfgfile.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
     <ClCompile Include="..\src\cia.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\consolehook.cpp" />
     <ClCompile Include="..\src\cpudefs.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -503,6 +407,7 @@
     <ClCompile Include="..\src\inputdevice.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\isofs.cpp" />
     <ClCompile Include="..\src\jit\codegen_arm.cpp.in" />
     <ClCompile Include="..\src\jit\compemu.cpp" />
     <ClCompile Include="..\src\jit\compemu_fpp.cpp" />
@@ -543,6 +448,7 @@
     <ClCompile Include="..\src\osdep\bsdsocket_host.cpp" />
     <ClCompile Include="..\src\osdep\cda_play.cpp" />
     <ClCompile Include="..\src\osdep\charset.cpp" />
+    <ClCompile Include="..\src\osdep\clipboard.cpp" />
     <ClCompile Include="..\src\osdep\fsdb_host.cpp" />
     <ClCompile Include="..\src\osdep\gui\CreateFilesysHardfile.cpp" />
     <ClCompile Include="..\src\osdep\gui\EditFilesysHardfile.cpp" />
@@ -561,6 +467,7 @@
     <ClCompile Include="..\src\osdep\gui\PanelInput.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelMisc.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelPaths.cpp" />
+    <ClCompile Include="..\src\osdep\gui\PanelPrio.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelQuickstart.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelRAM.cpp" />
     <ClCompile Include="..\src\osdep\gui\PanelROM.cpp" />
@@ -571,10 +478,6 @@
     <ClCompile Include="..\src\osdep\gui\SelectorEntry.cpp" />
     <ClCompile Include="..\src\osdep\gui\ShowHelp.cpp" />
     <ClCompile Include="..\src\osdep\gui\ShowMessage.cpp" />
-    <ClCompile Include="..\src\osdep\gui\UaeCheckBox.cpp" />
-    <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp" />
-    <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp" />
-    <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp" />
     <ClCompile Include="..\src\osdep\amiberry_hardfile.cpp" />
     <ClCompile Include="..\src\osdep\keyboard.cpp" />
     <ClCompile Include="..\src\osdep\mp3decoder.cpp" />
@@ -594,7 +497,9 @@
     <ClCompile Include="..\src\savestate.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\scp.cpp" />
     <ClCompile Include="..\src\scsi.cpp" />
+    <ClCompile Include="..\src\scsiemul.cpp" />
     <ClCompile Include="..\src\sinctable.cpp.in">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -602,15 +507,18 @@
     <ClCompile Include="..\src\statusline.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\tabletlibrary.cpp" />
     <ClCompile Include="..\src\traps.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\uaeexe.cpp" />
     <ClCompile Include="..\src\uaelib.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
     <ClCompile Include="..\src\uaeresource.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
+    <ClCompile Include="..\src\vm.cpp" />
     <ClCompile Include="..\src\zfile.cpp">
       <DeploymentContent>false</DeploymentContent>
     </ClCompile>
@@ -674,9 +582,14 @@
     <ClInclude Include="..\src\include\bsdsocket.h" />
     <ClInclude Include="..\src\include\calc.h" />
     <ClInclude Include="..\src\include\cd32_fmv.h" />
+    <ClInclude Include="..\src\include\cdtv.h" />
+    <ClInclude Include="..\src\include\cdtvcr.h" />
     <ClInclude Include="..\src\include\cia.h" />
+    <ClInclude Include="..\src\include\clipboard.h" />
     <ClInclude Include="..\src\include\commpipe.h" />
+    <ClInclude Include="..\src\include\consolehook.h" />
     <ClInclude Include="..\src\include\cpummu.h" />
+    <ClInclude Include="..\src\include\cpummu030.h" />
     <ClInclude Include="..\src\include\cputbl.h" />
     <ClInclude Include="..\src\include\cpu_prefetch.h" />
     <ClInclude Include="..\src\include\crc32.h" />
@@ -701,6 +614,8 @@
     <ClInclude Include="..\src\include\gui.h" />
     <ClInclude Include="..\src\include\ide.h" />
     <ClInclude Include="..\src\include\inputdevice.h" />
+    <ClInclude Include="..\src\include\isofs.h" />
+    <ClInclude Include="..\src\include\isofs_api.h" />
     <ClInclude Include="..\src\include\keyboard.h" />
     <ClInclude Include="..\src\include\keybuf.h" />
     <ClInclude Include="..\src\include\memory.h" />
@@ -714,11 +629,15 @@
     <ClInclude Include="..\src\include\rtc.h" />
     <ClInclude Include="..\src\include\rtgmodes.h" />
     <ClInclude Include="..\src\include\savestate.h" />
+    <ClInclude Include="..\src\include\scp.h" />
     <ClInclude Include="..\src\include\scsi.h" />
+    <ClInclude Include="..\src\include\scsidev.h" />
     <ClInclude Include="..\src\include\statusline.h" />
     <ClInclude Include="..\src\include\sysdeps.h" />
+    <ClInclude Include="..\src\include\tabletlibrary.h" />
     <ClInclude Include="..\src\include\traps.h" />
     <ClInclude Include="..\src\include\uae.h" />
+    <ClInclude Include="..\src\include\uaeexe.h" />
     <ClInclude Include="..\src\include\uaeresource.h" />
     <ClInclude Include="..\src\include\uae\caps.h" />
     <ClInclude Include="..\src\include\uae\dlopen.h" />
@@ -727,6 +646,7 @@
     <ClInclude Include="..\src\include\uae\string.h" />
     <ClInclude Include="..\src\include\uae\types.h" />
     <ClInclude Include="..\src\include\uae\uae.h" />
+    <ClInclude Include="..\src\include\uae\vm.h" />
     <ClInclude Include="..\src\include\xwin.h" />
     <ClInclude Include="..\src\include\zarchive.h" />
     <ClInclude Include="..\src\include\zfile.h" />
@@ -746,10 +666,6 @@
     <ClInclude Include="..\src\osdep\config.h" />
     <ClInclude Include="..\src\osdep\gui\gui_handling.h" />
     <ClInclude Include="..\src\osdep\gui\SelectorEntry.hpp" />
-    <ClInclude Include="..\src\osdep\gui\UaeCheckBox.hpp" />
-    <ClInclude Include="..\src\osdep\gui\UaeDropDown.hpp" />
-    <ClInclude Include="..\src\osdep\gui\UaeListBox.hpp" />
-    <ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp" />
     <ClInclude Include="..\src\osdep\mp3decoder.h" />
     <ClInclude Include="..\src\osdep\picasso96.h" />
     <ClInclude Include="..\src\osdep\sysconfig.h" />
diff --git a/VSLinux/Amiberry.vcxproj.filters b/VSLinux/Amiberry.vcxproj.filters
index 38599805..227aae0c 100644
--- a/VSLinux/Amiberry.vcxproj.filters
+++ b/VSLinux/Amiberry.vcxproj.filters
@@ -143,26 +143,20 @@
     <Image Include="..\data\controller.png">
       <Filter>data</Filter>
     </Image>
+    <Image Include="..\data\amiberry.png">
+      <Filter>data</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
-    <Font Include="..\data\Topaznew.ttf">
-      <Filter>data</Filter>
-    </Font>
     <Font Include="..\data\AmigaTopaz.ttf">
       <Filter>data</Filter>
     </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Makefile" />
-    <None Include="..\src\filesys.asm">
-      <Filter>src</Filter>
-    </None>
     <None Include="..\src\inputevents.def">
       <Filter>src</Filter>
     </None>
-    <None Include="..\src\table68k">
-      <Filter>src</Filter>
-    </None>
     <None Include="..\src\osdep\neon_helper.s">
       <Filter>src\osdep</Filter>
     </None>
@@ -564,18 +558,6 @@
     <ClCompile Include="..\src\osdep\gui\ShowMessage.cpp">
       <Filter>src\osdep\gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeCheckBox.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeListBox.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\sounddep\sound.cpp">
       <Filter>src\sounddep</Filter>
     </ClCompile>
@@ -741,6 +723,39 @@
     <ClCompile Include="..\src\caps\caps_amiberry.cpp">
       <Filter>src\caps</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cdtv.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cdtvcr.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\consolehook.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\isofs.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scp.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\scsiemul.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tabletlibrary.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\uaeexe.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\vm.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\clipboard.cpp">
+      <Filter>src\osdep</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\osdep\gui\PanelPrio.cpp">
+      <Filter>src\osdep\gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\archivers\7z\7zBuf.h">
@@ -1004,18 +1019,6 @@
     <ClInclude Include="..\src\osdep\gui\SelectorEntry.hpp">
       <Filter>src\osdep\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeCheckBox.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeDropDown.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeListBox.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp">
-      <Filter>src\osdep\gui</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\sounddep\sound.h">
       <Filter>src\sounddep</Filter>
     </ClInclude>
@@ -1154,5 +1157,41 @@
     <ClInclude Include="..\src\jit\codegen_armA64.h">
       <Filter>src\jit</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\include\uae\vm.h">
+      <Filter>src\include\uae</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cdtv.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cdtvcr.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\clipboard.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\consolehook.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\cpummu030.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\isofs.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\isofs_api.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scp.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\tabletlibrary.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\uaeexe.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\scsidev.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VSLinux/Amiberry.vcxproj.user b/VSLinux/Amiberry.vcxproj.user
index f25b9741..f7973d0e 100644
--- a/VSLinux/Amiberry.vcxproj.user
+++ b/VSLinux/Amiberry.vcxproj.user
@@ -6,12 +6,14 @@
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand>
     </PreLaunchCommand>
+    <RemoteTarget>983517077;rpi4.midlair (username=, port=22, authentication=Password)</RemoteTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <RemoteDebuggerCommand>/home/pi/projects/amiberry/amiberry</RemoteDebuggerCommand>
     <RemoteDebuggerWorkingDirectory>/home/pi/projects/amiberry</RemoteDebuggerWorkingDirectory>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand />
+    <RemoteTarget>-1706257654;argon (username=, port=22, authentication=Password)</RemoteTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
     <RemoteDebuggerCommand>/home/pigaming/projects/Amiberry/amiberry-xu4</RemoteDebuggerCommand>
@@ -38,6 +40,7 @@
     <RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
     <DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
     <PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
+    <RemoteTarget>-1706257654;argon (username=, port=22, authentication=Password)</RemoteTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
     <RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj
index 80dbfeea..a0d9672b 100644
--- a/VSLinux/guisan/guisan.vcxproj
+++ b/VSLinux/guisan/guisan.vcxproj
@@ -1,38 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-rockpro64|ARM">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-rockpro64|ARM64">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-rockpro64|x64">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-rockpro64|x86">
-      <Configuration>Debug-rockpro64</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|ARM">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|ARM64">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|x64">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-xu4|x86">
-      <Configuration>Debug-xu4</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
@@ -41,22 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|ARM">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|ARM64">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|x64">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-xu4|x86">
-      <Configuration>Release-xu4</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
@@ -103,26 +55,6 @@
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
@@ -133,256 +65,182 @@
     <ConfigurationType>Makefile</ConfigurationType>
     <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-    <RemoteRootDir>~/projects/Amiberry/src</RemoteRootDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|x86'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-rockpro64|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean</RemoteCleanCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
     <NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
-    <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM64'">
-    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
-    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
-    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
+    <RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make all</RemoteBuildCommandLine>
+    <RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all</RemoteReBuildCommandLine>
+    <RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean</RemoteCleanCommandLine>
     <RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\..\guisan-dev\lib\.keep">
+    <None Include="..\..\external\libguisan\lib\.keep">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="..\..\guisan-dev\Makefile" />
+    <None Include="..\..\external\libguisan\Makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp" />
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp" />
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
   </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/VSLinux/guisan/guisan.vcxproj.filters b/VSLinux/guisan/guisan.vcxproj.filters
index 29ff7ed1..2c853dbb 100644
--- a/VSLinux/guisan/guisan.vcxproj.filters
+++ b/VSLinux/guisan/guisan.vcxproj.filters
@@ -33,373 +33,131 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\guisan-dev\lib\.keep">
-      <Filter>lib</Filter>
-    </None>
-    <None Include="..\..\guisan-dev\Makefile" />
+    <None Include="..\..\external\libguisan\lib\.keep" />
+    <None Include="..\..\external\libguisan\Makefile" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\actionlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\basiccontainer.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\cliprectangle.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\color.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\deathlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\defaultfont.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\event.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\exception.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focushandler.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\focuslistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\font.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\genericinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\glut.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\graphics.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\gui.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\image.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imagefont.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\imageloader.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\input.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\inputevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\key.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keyinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\keylistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\listmodel.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouseinput.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\mouselistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionevent.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\selectionlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widget.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgetlistener.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\x.hpp">
-      <Filter>include\guisan</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglgraphics.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglimage.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\opengl\openglsdlimageloader.hpp">
-      <Filter>include\guisan\opengl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlinput.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlpixel.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdltruetypefont.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\button.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\checkbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\container.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\slider.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tab.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\tabbedarea.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\textfield.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\window.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp">
-      <Filter>include\guisan\widgets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp">
-      <Filter>include\guisan\sdl</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\external\libguisan\include\guisan.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\actionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\basiccontainer.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\cliprectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\color.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\deathlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\defaultfont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\event.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\exception.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focushandler.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\focuslistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\font.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\genericinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\glut.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\gui.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\image.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imagefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\imageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\input.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\inputevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\key.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keyinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\keylistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\listmodel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouseinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\mouselistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\opengl\openglsdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\platform.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\rectangle.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdl2graphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlgraphics.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimage.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlimageloader.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlinput.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdlpixel.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\sdl\sdltruetypefont.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionevent.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\selectionlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widget.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgetlistener.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\button.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\checkbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\container.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\dropdown.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\icon.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagebutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\imagetextbutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\inputbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\label.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\listbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\messagebox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\progressbar.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\radiobutton.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\scrollarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\slider.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tab.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\tabbedarea.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textbox.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\textfield.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\widgets\window.hpp" />
+    <ClInclude Include="..\..\external\libguisan\include\guisan\x.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\guisan-dev\src\actionevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\basiccontainer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\cliprectangle.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\color.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\defaultfont.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\event.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\exception.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\focushandler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\font.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\genericinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\graphics.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\gui.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\image.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\imagefont.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\inputevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\key.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\keyinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\mouseinput.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\rectangle.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\selectionevent.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widget.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\opengl.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglgraphics.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp">
-      <Filter>src\opengl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdlinput.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdltruetypefont.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\button.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\checkbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\container.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\dropdown.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\icon.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\imagebutton.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\label.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\listbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\radiobutton.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\scrollarea.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\slider.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tab.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\tabbedarea.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textbox.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\textfield.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\window.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
-      <Filter>src\widgets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp">
-      <Filter>src\sdl</Filter>
-    </ClCompile>
+    <ClCompile Include="..\..\external\libguisan\src\actionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\basiccontainer.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\cliprectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\color.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\defaultfont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\event.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\exception.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\focushandler.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\font.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\genericinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\gui.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\guisan.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\image.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\imagefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\inputevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\key.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\keyinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\mouseinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\opengl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\opengl\openglimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\rectangle.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdl2graphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlgraphics.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimage.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlimageloader.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdlinput.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\sdl\sdltruetypefont.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\selectionevent.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widget.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\button.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\checkbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\container.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\dropdown.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\icon.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\imagebutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\label.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\listbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\progressbar.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\radiobutton.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\scrollarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\slider.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tab.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\tabbedarea.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textbox.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\textfield.cpp" />
+    <ClCompile Include="..\..\external\libguisan\src\widgets\window.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VSLinux/guisan/guisan.vcxproj.user b/VSLinux/guisan/guisan.vcxproj.user
index f24ea7a9..ac0d7376 100644
--- a/VSLinux/guisan/guisan.vcxproj.user
+++ b/VSLinux/guisan/guisan.vcxproj.user
@@ -1,9 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
-    <RemoteTarget>-1406338439;192.168.1.47 (username=, port=22, authentication=Password)</RemoteTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM64'">
-    <RemoteTarget>-1406338439;192.168.1.47 (username=, port=22, authentication=Password)</RemoteTarget>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry.sln
similarity index 52%
rename from VisualGDB/Amiberry/Amiberry.sln
rename to VisualGDB/Amiberry.sln
index b6b04af7..17d6a774 100644
--- a/VisualGDB/Amiberry/Amiberry.sln
+++ b/VisualGDB/Amiberry.sln
@@ -3,65 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29209.62
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry\Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6} = {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "..\guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|VisualGDB = Debug|VisualGDB
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Debug-dispmanx|VisualGDB = Debug-dispmanx|VisualGDB
-		Debug-dispmanx|x64 = Debug-dispmanx|x64
-		Debug-dispmanx|x86 = Debug-dispmanx|x86
 		Release|VisualGDB = Release|VisualGDB
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 		Release-dispmanx|VisualGDB = Release-dispmanx|VisualGDB
-		Release-dispmanx|x64 = Release-dispmanx|x64
-		Release-dispmanx|x86 = Release-dispmanx|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x64.ActiveCfg = Debug|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.Build.0 = Debug-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x64.ActiveCfg = Debug-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x86.ActiveCfg = Debug-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x64.ActiveCfg = Release|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x86.ActiveCfg = Release|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.ActiveCfg = Release-dispmanx|VisualGDB
 		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.Build.0 = Release-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x64.ActiveCfg = Release-dispmanx|VisualGDB
-		{FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x86.ActiveCfg = Release-dispmanx|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x64.ActiveCfg = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x86.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x86.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB
 		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.Build.0 = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB
-		{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.Build.0 = Release|VisualGDB
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
new file mode 100644
index 00000000..5501309e
--- /dev/null
+++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Debug-dispmanx</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+      <LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
+    </CustomSourceDirectories>
+    <DeploymentHost>
+      <HostName>rpi4.midlair</HostName>
+      <Transport>SSH</Transport>
+      <UserName>pi</UserName>
+    </DeploymentHost>
+    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
+    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
+    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
+    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
+    <SkipDeploymentTests>false</SkipDeploymentTests>
+    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
+  </Project>
+  <Build xsi:type="com.visualgdb.build.msbuild">
+    <BuildLogMode xsi:nil="true" />
+    <ToolchainID>
+      <ID>com.visualgdb.raspberry_pi</ID>
+      <Version>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>2</Revision>
+      </Version>
+    </ToolchainID>
+    <ProjectFile>Amiberry.vcxproj</ProjectFile>
+    <ParallelJobCount>0</ParallelJobCount>
+    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
+  </Build>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>Unknown</Enabled>
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
+      <CheckForClangFormatFiles>true</CheckForClangFormatFiles>
+      <FormattingEngine xsi:nil="true" />
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <Configurations />
+  <ProgramArgumentsSuggestions />
+  <Debug xsi:type="com.visualgdb.debug.remote">
+    <AdditionalStartupCommands />
+    <AdditionalGDBSettings>
+      <Features>
+        <DisableAutoDetection>false</DisableAutoDetection>
+        <UseFrameParameter>false</UseFrameParameter>
+        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+        <ListLocalsSupported>false</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>false</ThreadInfoSupported>
+        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+        <SupportTargetCommand>false</SupportTargetCommand>
+        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+      </Features>
+      <EnableSmartStepping>false</EnableSmartStepping>
+      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+      <UseAppleExtensions>false</UseAppleExtensions>
+      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+      <MakeLogFile>false</MakeLogFile>
+      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+      <UseRelativePathsOnly>false</UseRelativePathsOnly>
+      <ExitAction>None</ExitAction>
+      <DisableDisassembly>false</DisableDisassembly>
+      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+      <DisableSignals>false</DisableSignals>
+      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+      <EnableNonStopMode>false</EnableNonStopMode>
+      <MaxBreakpointLimit>0</MaxBreakpointLimit>
+      <EnableVerboseMode>true</EnableVerboseMode>
+    </AdditionalGDBSettings>
+    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
+      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
+      <GDBServerPort>2000</GDBServerPort>
+      <ProgramArguments />
+      <ArgumentEscapingMode>Auto</ArgumentEscapingMode>
+    </LaunchGDBSettings>
+    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
+    <SuppressArgumentVariablesCheck>false</SuppressArgumentVariablesCheck>
+    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
+    <X11WindowMode>Remote</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <StripDebugSymbolsDuringDeployment>false</StripDebugSymbolsDuringDeployment>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
+    <IndexDebugSymbols>false</IndexDebugSymbols>
+  </Debug>
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user b/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user
deleted file mode 100644
index be8d5823..00000000
--- a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBUserPreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <UserDefinedVariableValues />
-  <DebugPreferences>
-    <CatchpointConfiguration>
-      <Throw>false</Throw>
-      <Rethrow>false</Rethrow>
-      <Catch>false</Catch>
-      <Exec>false</Exec>
-      <Fork>false</Fork>
-      <Vfork>false</Vfork>
-      <Syscalls />
-    </CatchpointConfiguration>
-    <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
-    <MemoryWindowPreferences />
-  </DebugPreferences>
-</VisualGDBUserPreferences>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
new file mode 100644
index 00000000..2a4bea8d
--- /dev/null
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Debug</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+      <LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
+    </CustomSourceDirectories>
+    <DeploymentHost>
+      <HostName>rpi4.midlair</HostName>
+      <Transport>SSH</Transport>
+      <UserName>pi</UserName>
+    </DeploymentHost>
+    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
+    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
+    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
+    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
+    <SkipDeploymentTests>false</SkipDeploymentTests>
+    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
+  </Project>
+  <Build xsi:type="com.visualgdb.build.msbuild">
+    <BuildLogMode xsi:nil="true" />
+    <ToolchainID>
+      <ID>com.visualgdb.raspberry_pi</ID>
+      <Version>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>2</Revision>
+      </Version>
+    </ToolchainID>
+    <ProjectFile>Amiberry.vcxproj</ProjectFile>
+    <ParallelJobCount>0</ParallelJobCount>
+    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
+  </Build>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>Unknown</Enabled>
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
+      <CheckForClangFormatFiles>true</CheckForClangFormatFiles>
+      <FormattingEngine xsi:nil="true" />
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <Configurations />
+  <ProgramArgumentsSuggestions />
+  <Debug xsi:type="com.visualgdb.debug.remote">
+    <AdditionalStartupCommands />
+    <AdditionalGDBSettings>
+      <Features>
+        <DisableAutoDetection>false</DisableAutoDetection>
+        <UseFrameParameter>false</UseFrameParameter>
+        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+        <ListLocalsSupported>false</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>false</ThreadInfoSupported>
+        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+        <SupportTargetCommand>false</SupportTargetCommand>
+        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+      </Features>
+      <EnableSmartStepping>false</EnableSmartStepping>
+      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+      <UseAppleExtensions>false</UseAppleExtensions>
+      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+      <MakeLogFile>false</MakeLogFile>
+      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+      <UseRelativePathsOnly>false</UseRelativePathsOnly>
+      <ExitAction>None</ExitAction>
+      <DisableDisassembly>false</DisableDisassembly>
+      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+      <DisableSignals>false</DisableSignals>
+      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+      <EnableNonStopMode>false</EnableNonStopMode>
+      <MaxBreakpointLimit>0</MaxBreakpointLimit>
+      <EnableVerboseMode>true</EnableVerboseMode>
+    </AdditionalGDBSettings>
+    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
+      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
+      <GDBServerPort>2000</GDBServerPort>
+      <ProgramArguments />
+      <ArgumentEscapingMode>Auto</ArgumentEscapingMode>
+    </LaunchGDBSettings>
+    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
+    <SuppressArgumentVariablesCheck>false</SuppressArgumentVariablesCheck>
+    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
+    <X11WindowMode>Remote</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <StripDebugSymbolsDuringDeployment>false</StripDebugSymbolsDuringDeployment>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
+    <IndexDebugSymbols>false</IndexDebugSymbols>
+  </Debug>
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
new file mode 100644
index 00000000..f2aaff62
--- /dev/null
+++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Release-dispmanx</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+      <LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
+    </CustomSourceDirectories>
+    <DeploymentHost>
+      <HostName>rpi4.midlair</HostName>
+      <Transport>SSH</Transport>
+      <UserName>pi</UserName>
+    </DeploymentHost>
+    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
+    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
+    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
+    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
+    <SkipDeploymentTests>false</SkipDeploymentTests>
+    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
+  </Project>
+  <Build xsi:type="com.visualgdb.build.msbuild">
+    <BuildLogMode xsi:nil="true" />
+    <ToolchainID>
+      <ID>com.visualgdb.raspberry_pi</ID>
+      <Version>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>2</Revision>
+      </Version>
+    </ToolchainID>
+    <ProjectFile>Amiberry.vcxproj</ProjectFile>
+    <ParallelJobCount>0</ParallelJobCount>
+    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
+  </Build>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>Unknown</Enabled>
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
+      <CheckForClangFormatFiles>true</CheckForClangFormatFiles>
+      <FormattingEngine xsi:nil="true" />
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <Configurations />
+  <ProgramArgumentsSuggestions />
+  <Debug xsi:type="com.visualgdb.debug.remote">
+    <AdditionalStartupCommands />
+    <AdditionalGDBSettings>
+      <Features>
+        <DisableAutoDetection>false</DisableAutoDetection>
+        <UseFrameParameter>false</UseFrameParameter>
+        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+        <ListLocalsSupported>false</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>false</ThreadInfoSupported>
+        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+        <SupportTargetCommand>false</SupportTargetCommand>
+        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+      </Features>
+      <EnableSmartStepping>false</EnableSmartStepping>
+      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+      <UseAppleExtensions>false</UseAppleExtensions>
+      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+      <MakeLogFile>false</MakeLogFile>
+      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+      <UseRelativePathsOnly>false</UseRelativePathsOnly>
+      <ExitAction>None</ExitAction>
+      <DisableDisassembly>false</DisableDisassembly>
+      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+      <DisableSignals>false</DisableSignals>
+      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+      <EnableNonStopMode>false</EnableNonStopMode>
+      <MaxBreakpointLimit>0</MaxBreakpointLimit>
+      <EnableVerboseMode>true</EnableVerboseMode>
+    </AdditionalGDBSettings>
+    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
+      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
+      <GDBServerPort>2000</GDBServerPort>
+      <ProgramArguments />
+      <ArgumentEscapingMode>Auto</ArgumentEscapingMode>
+    </LaunchGDBSettings>
+    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
+    <SuppressArgumentVariablesCheck>false</SuppressArgumentVariablesCheck>
+    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
+    <X11WindowMode>Local</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <StripDebugSymbolsDuringDeployment>false</StripDebugSymbolsDuringDeployment>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
+    <IndexDebugSymbols>false</IndexDebugSymbols>
+  </Debug>
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
new file mode 100644
index 00000000..165037a0
--- /dev/null
+++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConfigurationName>Release</ConfigurationName>
+  <Project xsi:type="com.visualgdb.project.linux">
+    <CustomSourceDirectories>
+      <Directories />
+      <PathStyle>MinGWUnixSlash</PathStyle>
+      <LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
+    </CustomSourceDirectories>
+    <DeploymentHost>
+      <HostName>rpi4.midlair</HostName>
+      <Transport>SSH</Transport>
+      <UserName>pi</UserName>
+    </DeploymentHost>
+    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
+    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
+    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
+    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
+    <SkipDeploymentTests>false</SkipDeploymentTests>
+    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
+  </Project>
+  <Build xsi:type="com.visualgdb.build.msbuild">
+    <BuildLogMode xsi:nil="true" />
+    <ToolchainID>
+      <ID>com.visualgdb.raspberry_pi</ID>
+      <Version>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>2</Revision>
+      </Version>
+    </ToolchainID>
+    <ProjectFile>Amiberry.vcxproj</ProjectFile>
+    <ParallelJobCount>0</ParallelJobCount>
+    <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
+  </Build>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>Unknown</Enabled>
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
+      <CheckForClangFormatFiles>true</CheckForClangFormatFiles>
+      <FormattingEngine xsi:nil="true" />
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <Configurations />
+  <ProgramArgumentsSuggestions />
+  <Debug xsi:type="com.visualgdb.debug.remote">
+    <AdditionalStartupCommands />
+    <AdditionalGDBSettings>
+      <Features>
+        <DisableAutoDetection>false</DisableAutoDetection>
+        <UseFrameParameter>false</UseFrameParameter>
+        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
+        <ListLocalsSupported>false</ListLocalsSupported>
+        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
+        <ThreadInfoSupported>false</ThreadInfoSupported>
+        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
+        <SupportTargetCommand>false</SupportTargetCommand>
+        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
+      </Features>
+      <EnableSmartStepping>false</EnableSmartStepping>
+      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
+      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
+      <UseAppleExtensions>false</UseAppleExtensions>
+      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
+      <MakeLogFile>false</MakeLogFile>
+      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
+      <UseRelativePathsOnly>false</UseRelativePathsOnly>
+      <ExitAction>None</ExitAction>
+      <DisableDisassembly>false</DisableDisassembly>
+      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
+      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
+      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
+      <DisableSignals>false</DisableSignals>
+      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
+      <EnableNonStopMode>false</EnableNonStopMode>
+      <MaxBreakpointLimit>0</MaxBreakpointLimit>
+      <EnableVerboseMode>true</EnableVerboseMode>
+    </AdditionalGDBSettings>
+    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
+      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
+      <GDBServerPort>2000</GDBServerPort>
+      <ProgramArguments />
+      <ArgumentEscapingMode>Auto</ArgumentEscapingMode>
+    </LaunchGDBSettings>
+    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
+    <SuppressArgumentVariablesCheck>false</SuppressArgumentVariablesCheck>
+    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
+    <X11WindowMode>Local</X11WindowMode>
+    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
+    <RunGDBUnderSudo>false</RunGDBUnderSudo>
+    <DeploymentMode>Auto</DeploymentMode>
+    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
+    <StripDebugSymbolsDuringDeployment>false</StripDebugSymbolsDuringDeployment>
+    <SuppressTTYCreation>false</SuppressTTYCreation>
+    <IndexDebugSymbols>false</IndexDebugSymbols>
+  </Debug>
+</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index cde5a4d3..64209e96 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -39,7 +39,7 @@
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
@@ -47,21 +47,21 @@
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
     <ToolchainVersion>8.3.0/8.2.1/r2</ToolchainVersion>
-    <TargetName>$(ProjectName)-sdl2</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <RemoteBuildHost>
     </RemoteBuildHost>
   </PropertyGroup>
@@ -329,7 +329,9 @@
     <None Include="..\..\src\jit\compemu_midfunc_arm2.cpp.in" />
     <None Include="..\..\src\jit\compemu_midfunc_armA64.cpp.in" />
     <None Include="..\..\src\jit\compemu_midfunc_armA64_2.cpp.in" />
+    <None Include="Amiberry-Debug-dispmanx.vgdbsettings" />
     <None Include="Amiberry-Debug.vgdbsettings" />
+    <None Include="Amiberry-Release-dispmanx.vgdbsettings" />
     <None Include="Amiberry-Release.vgdbsettings" />
   </ItemGroup>
   <ItemGroup>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index 7e65ee96..a0afba28 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -98,6 +98,12 @@
     <None Include="..\..\src\jit\codegen_armA64.cpp.in">
       <Filter>Source files\jit</Filter>
     </None>
+    <None Include="Amiberry-Debug-dispmanx.vgdbsettings">
+      <Filter>VisualGDB settings</Filter>
+    </None>
+    <None Include="Amiberry-Release-dispmanx.vgdbsettings">
+      <Filter>VisualGDB settings</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\akiko.cpp">
diff --git a/VisualGDB/genblitter/Readme.txt b/VisualGDB/genblitter/Readme.txt
deleted file mode 100644
index 85dd819a..00000000
--- a/VisualGDB/genblitter/Readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-This tool generates the following files:
-- blit.h
-- blitfunc.cpp
-- blitfunc.h
-- blittable.cpp
-
-To use it, compile it for the target platform, then execute it there as follows:
-
-genblitter.exe i > blit.h
-
-genblitter.exe f > blitfunc.cpp
-
-genblitter.exe h > blitfunc.h
-
-genblitter.exe t > blittable.cpp
-
-Copy the resulting files back in the "src" directory of Amiberry
\ No newline at end of file
diff --git a/VisualGDB/genblitter/genblitter.vcxproj b/VisualGDB/genblitter/genblitter.vcxproj
deleted file mode 100644
index a7e9c7c4..00000000
--- a/VisualGDB/genblitter/genblitter.vcxproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|VisualGDB">
-      <Configuration>Debug</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|VisualGDB">
-      <Configuration>Release</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{619EFB8C-E41A-4058-B085-1B8CD22692DD}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <GNUConfigurationType>Debug</GNUConfigurationType>
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;..\..\src\include;..\..\src;..\..\src\osdep;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="genblitter-Debug.vgdbsettings" />
-    <None Include="genblitter-Release.vgdbsettings" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\blitops.cpp" />
-    <ClCompile Include="..\..\src\genblitter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Readme.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/genblitter/genblitter.vcxproj.filters b/VisualGDB/genblitter/genblitter.vcxproj.filters
deleted file mode 100644
index fcb90c62..00000000
--- a/VisualGDB/genblitter/genblitter.vcxproj.filters
+++ /dev/null
@@ -1,40 +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>{afe8a49f-0586-4eea-b2ea-cc1c4567db36}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{4718ef87-4582-42a4-8469-11a35b5a4418}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource files">
-      <UniqueIdentifier>{e9ba1ae1-6dab-41af-8b75-7c41100a7fc9}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="VisualGDB settings">
-      <UniqueIdentifier>{c7346196-4f74-4afd-aa85-9da2661c7ab7}</UniqueIdentifier>
-      <Extensions>*.vgdbsettings</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="genblitter-Debug.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-    <None Include="genblitter-Release.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\genblitter.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blitops.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Readme.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/genblitter/genblitter.vcxproj.user b/VisualGDB/genblitter/genblitter.vcxproj.user
deleted file mode 100644
index be250787..00000000
--- a/VisualGDB/genblitter/genblitter.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/genlinetoscr/Readme.txt b/VisualGDB/genlinetoscr/Readme.txt
deleted file mode 100644
index ff2f6f3c..00000000
--- a/VisualGDB/genlinetoscr/Readme.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This tool generates the "linetoscr.cpp" file.
-
-Compile it for the target system (e.g. Raspberry) then run it there as:
-
-genlinetoscr > linetoscr.cpp
-
-Copy the generated file back into the "src" directory.
\ No newline at end of file
diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj
deleted file mode 100644
index edb80923..00000000
--- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|VisualGDB">
-      <Configuration>Debug</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|VisualGDB">
-      <Configuration>Release</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{883F2A00-8030-429B-AC7F-E930DDF9568F}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <GNUConfigurationType>Debug</GNUConfigurationType>
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-    <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;=/usr/local/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;=/usr/local/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/usr/local/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="genlinetoscr-Debug.vgdbsettings" />
-    <None Include="genlinetoscr-Release.vgdbsettings" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\genlinetoscr.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Readme.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters
deleted file mode 100644
index dc1e79f8..00000000
--- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters
+++ /dev/null
@@ -1,37 +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>{19e139ec-d402-45d4-89fc-39f22443a95b}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{0a02e0a2-214b-4e9e-a7c5-0668ebf38e34}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource files">
-      <UniqueIdentifier>{30f92ef0-a24c-49e2-9e92-906dcef4d050}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="VisualGDB settings">
-      <UniqueIdentifier>{20bde34c-9e8e-42ee-83c1-c8c8143c7516}</UniqueIdentifier>
-      <Extensions>*.vgdbsettings</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="genlinetoscr-Debug.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-    <None Include="genlinetoscr-Release.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\genlinetoscr.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Readme.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user
deleted file mode 100644
index be250787..00000000
--- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file