diff --git a/win32/Makefile.win b/win32/Makefile.win
index be63970..29f2426 100644
--- a/win32/Makefile.win
+++ b/win32/Makefile.win
@@ -1,5 +1,5 @@
 # Project: faux86
-# Makefile created by Dev-C++ 5.11
+# Makefile created by Embarcadero Dev-C++ 6.3
 
 CPP      = g++.exe
 CC       = gcc.exe
@@ -7,20 +7,20 @@ WINDRES  = windres.exe
 RES      = build/faux86_private.res
 OBJ      = build/main.o build/SDLInterface.o build/StdioDiskInterface.o build/Config.o build/Adlib.o build/ata.o build/Audio.o build/console.o build/CPU.o build/Debugger.o build/DisneySoundSource.o build/DMA.o build/DriveManager.o build/InputManager.o build/MemUtils.o build/netcard.o build/opl3.o build/packet.o build/PCSpeaker.o build/PIC.o build/PIT.o build/Ports.o build/Ram.o build/Renderer.o build/SerialMouse.o build/SoundBlaster.o build/TaskManager.o build/Timing.o build/Video.o build/VM.o build/UART.o build/menus.o build/settings.o build/opl.o build/PPI.o $(RES)
 LINKOBJ  = build/main.o build/SDLInterface.o build/StdioDiskInterface.o build/Config.o build/Adlib.o build/ata.o build/Audio.o build/console.o build/CPU.o build/Debugger.o build/DisneySoundSource.o build/DMA.o build/DriveManager.o build/InputManager.o build/MemUtils.o build/netcard.o build/opl3.o build/packet.o build/PCSpeaker.o build/PIC.o build/PIT.o build/Ports.o build/Ram.o build/Renderer.o build/SerialMouse.o build/SoundBlaster.o build/TaskManager.o build/Timing.o build/Video.o build/VM.o build/UART.o build/menus.o build/settings.o build/opl.o build/PPI.o $(RES)
-LIBS     = -L"D:/Dev/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib32" -static-libgcc -L"D:/AVR-GCC/projects/SDL/SDL-V22/lib/x86" ../../SDL/SDL-V22/lib/x86/SDL2main.lib ../../SDL/SDL-V22/lib/x86/SDL2.lib ../../../../Dev/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib32/libcomdlg32.a -m32 -s
-INCS     = -I"D:/Dev/Dev-Cpp/MinGW64/include" -I"D:/Dev/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"D:/Dev/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"D:/AVR-GCC/projects/faux86/src" -I"D:/AVR-GCC/projects/SDL/SDL-V22/include"
-CXXINCS  = -I"D:/Dev/Dev-Cpp/MinGW64/include" -I"D:/Dev/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"D:/Dev/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"D:/Dev/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++" -I"D:/AVR-GCC/projects/faux86/src" -I"D:/AVR-GCC/projects/SDL/SDL-V22/include"
+LIBS     = -L"D:/Dev/Dev-Cpp/TDM-GCC-64/x86_64-w64-mingw32/lib32" -static-libgcc -L"D:/AVR-GCC/projects/SDL/SDL-V22/lib/x86" ../../SDL/SDL-V22/lib/x86/SDL2main.lib ../../SDL/SDL-V22/lib/x86/SDL2.lib ../../../../Dev/Dev-Cpp/TDM-GCC-64/x86_64-w64-mingw32/lib32/libcomdlg32.a -m32 -s
+INCS     = -I"D:/Dev/Dev-Cpp/TDM-GCC-64/include" -I"D:/Dev/Dev-Cpp/TDM-GCC-64/x86_64-w64-mingw32/include" -I"D:/Dev/Dev-Cpp/TDM-GCC-64/lib/gcc/x86_64-w64-mingw32/9.2.0/include" -I"D:/AVR-GCC/projects/faux86/src" -I"D:/AVR-GCC/projects/SDL/SDL-V22/include"
+CXXINCS  = -I"D:/Dev/Dev-Cpp/TDM-GCC-64/include" -I"D:/Dev/Dev-Cpp/TDM-GCC-64/x86_64-w64-mingw32/include" -I"D:/Dev/Dev-Cpp/TDM-GCC-64/lib/gcc/x86_64-w64-mingw32/9.2.0/include" -I"D:/Dev/Dev-Cpp/TDM-GCC-64/lib/gcc/x86_64-w64-mingw32/9.2.0/include/c++" -I"D:/AVR-GCC/projects/faux86/src" -I"D:/AVR-GCC/projects/SDL/SDL-V22/include"
 BIN      = bin/faux86.exe
-CXXFLAGS = $(CXXINCS) -O3 -m32 -std=gnu++11
-CFLAGS   = $(INCS) -O3 -m32 -std=gnu++11
-RM       = rm.exe -f
+CXXFLAGS = $(CXXINCS) -O3 -m32 -std=gnu++11 -Wfatal-errors -lSDL2
+CFLAGS   = $(INCS) -O3 -m32 -std=gnu++11 -Wfatal-errors -lSDL2
+DEL      = D:\Dev\Dev-Cpp\devcpp.exe INTERNAL_DEL
 
 .PHONY: all all-before all-after clean clean-custom
 
 all: all-before $(BIN) all-after
 
 clean: clean-custom
-	${RM} $(OBJ) $(BIN)
+	${DEL} $(OBJ) $(BIN)
 
 $(BIN): $(OBJ)
 	$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
diff --git a/win32/faux86.dev b/win32/faux86.dev
index 0b47568..e417659 100644
--- a/win32/faux86.dev
+++ b/win32/faux86.dev
@@ -9,9 +9,9 @@ Libs=D:\AVR-GCC\projects\SDL\SDL-V22\lib\x86
 PrivateResource=faux86_private.rc
 ResourceIncludes=
 MakeIncludes=
-Compiler=
-CppCompiler=_@@_
-Linker=../../SDL/SDL-V22/lib/x86/SDL2main.lib_@@_../../SDL/SDL-V22/lib/x86/SDL2.lib_@@_../../../../Dev/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib32/libcomdlg32.a_@@_
+Compiler=-lSDL2_@@_
+CppCompiler=-lSDL2_@@_
+Linker=../../SDL/SDL-V22/lib/x86/SDL2main.lib_@@_../../SDL/SDL-V22/lib/x86/SDL2.lib_@@_../../../../Dev/Dev-Cpp/TDM-GCC-64/x86_64-w64-mingw32/lib32/libcomdlg32.a_@@_
 IsCpp=1
 Icon=faux86.ico
 ExeOutput=bin
@@ -28,7 +28,7 @@ Folders=src
 IncludeVersionInfo=0
 SupportXPThemes=0
 CompilerSet=3
-CompilerSettings=000000b1g0000000000001000
+CompilerSettings=0;0;0;0;0;0;3;1;8;0;0;0;0;0;0;1;0;0;0;0;0;1;0;0;0;0
 UnitCount=75
 
 [VersionInfo]
diff --git a/win32/faux86.layout b/win32/faux86.layout
index 0e8ed0f..a37f0de 100644
--- a/win32/faux86.layout
+++ b/win32/faux86.layout
@@ -2,9 +2,9 @@
 Order=0
 Focused=0
 [Editor_0]
-CursorCol=4
-CursorRow=80
-TopLine=1
+CursorCol=23
+CursorRow=24
+TopLine=16
 LeftChar=1
 [Editor_1]
 CursorCol=26
diff --git a/win32/main.cpp b/win32/main.cpp
index e9db495..adcbad6 100644
--- a/win32/main.cpp
+++ b/win32/main.cpp
@@ -20,6 +20,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+
+#define WIN32_LEAN_AND_MEAN
+
 #include <Windows.h>
 #include <stdio.h>
 #include <new>