diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7438bec9ce..8bb69f482d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2249,10 +2249,10 @@ set(BigFontAssets
 )
 
 set(NativeAssets
-	android/assets/ui_atlas.zim  # Why are we getting these from the Android folder?
-	android/assets/ui_atlas.meta
-	android/assets/asciifont_atlas.zim
-	android/assets/asciifont_atlas.meta
+	assets/ui_atlas.zim
+	assets/ui_atlas.meta
+	assets/asciifont_atlas.zim
+	assets/asciifont_atlas.meta
 	assets/debugger
 	assets/lang
 	assets/shaders
@@ -2373,7 +2373,7 @@ if(TargetBin)
 		endif()
 
 		if(IOS)
-			add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} {SHADER_FILES} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
+			add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
 			file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/")
 		else()
 			add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
diff --git a/SDL/README.TXT b/SDL/README.TXT
index d553b1a4bc..fa432a8b8f 100644
--- a/SDL/README.TXT
+++ b/SDL/README.TXT
@@ -1,7 +1,8 @@
 1. Install GCC, CMake, and development libraries for zlib and sdl.
-2. cd SDL
-3. ./buildassets.sh
-4. ./b.sh
+2. mkdir build
+3. cd build
+4. cmake ..
+5. make
 
 That should do it.
 
diff --git a/SDL/buildassets.sh b/SDL/buildassets.sh
deleted file mode 100755
index 8adf949009..0000000000
--- a/SDL/buildassets.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cp -r ../android/assets .
-cp ../assets/ppge_atlas.zim assets
diff --git a/android/ab.cmd b/android/ab.cmd
index 33347178f4..18aecf6608 100644
--- a/android/ab.cmd
+++ b/android/ab.cmd
@@ -1,10 +1,13 @@
+mkdir assets > nul
 xcopy ..\assets\flash0 assets\flash0\ /s /y <d.txt
 xcopy ..\assets\lang assets\lang\ /s /y <d.txt
 xcopy ..\assets\shaders assets\shaders\ /s /y <d.txt
-copy ..\assets\langregion.ini assets\langregion.ini
-copy ..\assets\compat.ini assets\compat.ini
+copy ..\assets\*.ini assets\
 copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
 copy ..\assets\*.png assets\
+copy ..\assets\*.zim assets\
+copy ..\assets\*.meta assets\
+copy ..\assets\*.wav assets\
 SET NDK=C:\Android\sdk\ndk\21.3.6528147
 REM SET NDK=C:\Android\ndk
 SET NDK_MODULE_PATH=..\ext;..\ext\native\ext
diff --git a/android/ab.sh b/android/ab.sh
index 8f07b59605..b87b0fbfc3 100755
--- a/android/ab.sh
+++ b/android/ab.sh
@@ -1,9 +1,12 @@
+mkdir -p assets
 cp -r ../assets/flash0 assets/
 cp -r ../assets/lang assets/
 cp -r ../assets/shaders assets/
 cp -r ../assets/debugger assets/
-cp ../assets/langregion.ini assets/langregion.ini
-cp ../assets/compat.ini assets/compat.ini
+cp ../assets/*.ini assets/
 cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
 cp ../assets/*.png assets/
+cp ../assets/*.zim assets/
+cp ../assets/*.meta assets/
+cp ../assets/*.wav assets/
 NDK_MODULE_PATH=../ext $NDK/ndk-build -j3 $*
diff --git a/android/assets/ppge_atlas.meta b/android/assets/ppge_atlas.meta
deleted file mode 100644
index eb80c3f668..0000000000
Binary files a/android/assets/ppge_atlas.meta and /dev/null differ
diff --git a/android/assets/ppge_atlas.zim b/android/assets/ppge_atlas.zim
deleted file mode 100644
index 9ee0af22ab..0000000000
Binary files a/android/assets/ppge_atlas.zim and /dev/null differ
diff --git a/android/assets/rargray.png b/android/assets/rargray.png
deleted file mode 100644
index a1ae9d0b5b..0000000000
Binary files a/android/assets/rargray.png and /dev/null differ
diff --git a/android/assets/ui_atlas.meta b/android/assets/ui_atlas.meta
deleted file mode 100644
index 0c16847d33..0000000000
Binary files a/android/assets/ui_atlas.meta and /dev/null differ
diff --git a/android/assets/ui_atlas.zim b/android/assets/ui_atlas.zim
deleted file mode 100644
index dd3f5baa0f..0000000000
Binary files a/android/assets/ui_atlas.zim and /dev/null differ
diff --git a/android/assets/unknown.png b/android/assets/unknown.png
deleted file mode 100644
index 703da1ab70..0000000000
Binary files a/android/assets/unknown.png and /dev/null differ
diff --git a/android/assets/zip.png b/android/assets/zip.png
deleted file mode 100644
index 1ea89442fc..0000000000
Binary files a/android/assets/zip.png and /dev/null differ
diff --git a/android/buildassets.sh b/android/buildassets.sh
index 5bd6e9c0cf..8bc782fb7e 100644
--- a/android/buildassets.sh
+++ b/android/buildassets.sh
@@ -3,8 +3,10 @@ cp ../assets/7z.png assets/
 cp ../assets/rargray.png assets/
 cp ../assets/unknown.png assets/
 cp ../assets/zip.png assets/
-cp ../assets/ui_atlas.zim assets/
-cp ../assets/ppge_atlas.zim assets/
+cp ../assets/*.zim assets/
+cp ../assets/*.meta assets/
+cp ../assets/*.wav assets/
+cp ../assets/*.ini assets/
 cp ../assets/Roboto-Condensed.ttf assets/
 cp -r ../assets/flash0 assets/
 cp -r ../assets/lang assets/
diff --git a/buildatlas.sh b/buildatlas.sh
index 354efc19b0..4e20f19b81 100755
--- a/buildatlas.sh
+++ b/buildatlas.sh
@@ -1,8 +1,8 @@
 # Note that we do not copy the big font atlas to Android assets. No longer needed!
 
-./ext/native/tools/build/atlastool ui_atlasscript.txt ui 8888 && cp ui_atlas.zim ui_atlas.meta assets && cp ui_atlas.zim ui_atlas.meta android/assets && rm ui_atlas.cpp ui_atlas.h
+./ext/native/tools/build/atlastool ui_atlasscript.txt ui 8888 && cp ui_atlas.zim ui_atlas.meta assets && rm ui_atlas.cpp ui_atlas.h
 ./ext/native/tools/build/atlastool font_atlasscript.txt font 8888 && cp font_atlas.zim font_atlas.meta assets && rm font_atlas.cpp font_atlas.h
-./ext/native/tools/build/atlastool asciifont_atlasscript.txt asciifont 8888 && cp asciifont_atlas.zim asciifont_atlas.meta assets && cp asciifont_atlas.zim asciifont_atlas.meta android/assets && rm asciifont_atlas.cpp asciifont_atlas.h
+./ext/native/tools/build/atlastool asciifont_atlasscript.txt asciifont 8888 && cp asciifont_atlas.zim asciifont_atlas.meta assets && rm asciifont_atlas.cpp asciifont_atlas.h
 
 rm ui_atlas.zim ui_atlas.meta
 rm font_atlas.zim font_atlas.meta
diff --git a/make-font-textfiles.sh b/make-font-textfiles.sh
deleted file mode 100644
index cb05aba69a..0000000000
--- a/make-font-textfiles.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cat assets/lang/zh_CN.ini assets/lang/zh_TW.ini assets/langregion.ini > chinese.txt
-cat assets/lang/ko_KR.ini assets/langregion.ini > korean.txt
-