diff --git a/melonDS.cbp b/melonDS.cbp
index 5acfc894..2e466b8c 100644
--- a/melonDS.cbp
+++ b/melonDS.cbp
@@ -22,19 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m64" />
-					<Add library=":libwx_mswu_core-3.0.a" />
-					<Add library=":libwx_baseu-3.0.a" />
 					<Add library="SDL2" />
-					<Add library=":libpng.a" />
-					<Add library=":libjpeg.a" />
-					<Add library=":libtiff.a" />
-					<Add library=":libz.a" />
-					<Add library="rpcrt4" />
-					<Add library="oleaut32" />
-					<Add library="ole32" />
-					<Add library="uuid" />
-					<Add library="winspool" />
-					<Add library="winmm" />
 					<Add library="shell32" />
 					<Add library="comctl32" />
 					<Add library="comdlg32" />
@@ -42,6 +30,11 @@
 					<Add library="wsock32" />
 					<Add library="oleacc" />
 					<Add library="gdi32" />
+					<Add library="d2d1" />
+					<Add library="dwrite" />
+					<Add library="uxtheme" />
+					<Add library="usp10" />
+					<Add library="ole32" />
 				</Linker>
 			</Target>
 			<Target title="Release Windows">
@@ -205,16 +198,367 @@
 		<Unit filename="src/SPU.h" />
 		<Unit filename="src/Wifi.cpp" />
 		<Unit filename="src/Wifi.h" />
+		<Unit filename="src/libui_sdl/Platform.cpp" />
+		<Unit filename="src/libui_sdl/libui/common/areaevents.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/control.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/controlsigs.h">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/debug.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/matrix.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/shouldquit.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/uipriv.h">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/common/userbugs.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/ui.h">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/ui_windows.h">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/_uipriv_migrate.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/alloc.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/area.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/area.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/areadraw.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/areaevents.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/areascroll.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/areautil.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/box.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/button.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/checkbox.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/colorbutton.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/colordialog.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/combobox.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/compilerver.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/container.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/control.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/d2dscratch.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/datetimepicker.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/debug.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/draw.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/draw.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/drawmatrix.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/drawpath.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/drawtext.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/dwrite.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/editablecombo.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/entry.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/events.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/fontbutton.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/fontdialog.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/form.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/graphemes.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/grid.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/group.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/init.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/label.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/main.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/menu.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/multilineentry.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/parent.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/progressbar.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/radiobuttons.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/resources.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/resources.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/separator.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/sizing.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/slider.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/spinbox.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/stddialogs.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/tab.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/tabpage.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/text.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/uipriv_windows.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/utf16.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/utilwin.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/winapi.hpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/window.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/winpublic.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/libui/windows/winutil.cpp">
+			<Option target="Debug Windows" />
+			<Option target="Release Windows" />
+			<Option target="Profile Windows" />
+		</Unit>
+		<Unit filename="src/libui_sdl/main.cpp" />
 		<Unit filename="src/types.h" />
 		<Unit filename="src/version.h" />
-		<Unit filename="src/wx/EmuConfig.cpp" />
-		<Unit filename="src/wx/EmuConfig.h" />
-		<Unit filename="src/wx/InputConfig.cpp" />
-		<Unit filename="src/wx/InputConfig.h" />
-		<Unit filename="src/wx/Platform.cpp" />
-		<Unit filename="src/wx/main.cpp" />
-		<Unit filename="src/wx/main.h" />
-		<Unit filename="src/wx/scancode_wx2sdl.h" />
 		<Unit filename="xp.manifest">
 			<Option target="Debug Windows" />
 			<Option target="Release Windows" />