diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a81d3e292e..3413c6f387 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -101,12 +101,16 @@ jobs:
           curl -LO https://github.com/wavemotion-dave/A8DS/releases/latest/download/A8DS.nds
           curl -LO https://github.com/wavemotion-dave/StellaDS/releases/latest/download/StellaDS.nds
           curl -LO https://github.com/wavemotion-dave/A5200DS/releases/latest/download/A5200DS.nds
+          curl -LO https://github.com/wavemotion-dave/A5200DS/releases/latest/download/A5200DSi.nds
           curl -LO https://github.com/wavemotion-dave/A7800DS/releases/latest/download/A7800DS.nds
           curl -LO https://github.com/wavemotion-dave/NINTV-DS/releases/latest/download/NINTV-DS.nds
           curl -LO https://github.com/wavemotion-dave/ColecoDS/releases/latest/download/ColecoDS.nds
-          curl -LO https://github.com/FluBBaOfWard/S8DS/releases/latest/download/S8DS.zip
           curl -LO https://bitbucket.org/Coto88/snemulds/raw/33f5f469b6e6c19cb3e1be9259b407832fce42b9/release/arm7dldi-ntr/SNEmulDS.nds
           curl -LO https://bitbucket.org/Coto88/snemulds/raw/33f5f469b6e6c19cb3e1be9259b407832fce42b9/release/arm7dldi-twl/SNEmulDS.srl
+          curl -LO https://github.com/DS-Homebrew/NesDS/releases/latest/download/nesDS.7z
+          7z x nesDS.7z nesDS/nesDS.nds
+          rm nesDS.7z
+          curl -LO https://github.com/FluBBaOfWard/S8DS/releases/latest/download/S8DS.zip
           7z x S8DS.zip S8DS.nds
           rm S8DS.zip
           curl -LO https://github.com/FluBBaOfWard/NGPDS/releases/latest/download/NGPDS.zip
diff --git a/7zfile/_nds/TWiLightMenu/emulators/nesds.nds b/7zfile/_nds/TWiLightMenu/emulators/nesds.nds
deleted file mode 100644
index 7bd6b64251..0000000000
Binary files a/7zfile/_nds/TWiLightMenu/emulators/nesds.nds and /dev/null differ
diff --git a/7zfile/_nds/TWiLightMenu/emulators/nestwl.nds b/7zfile/_nds/TWiLightMenu/emulators/nestwl.nds
deleted file mode 100644
index 2eb4891a86..0000000000
Binary files a/7zfile/_nds/TWiLightMenu/emulators/nestwl.nds and /dev/null differ
diff --git a/quickmenu/arm9/source/main.cpp b/quickmenu/arm9/source/main.cpp
index 3e95f6a728..d6be7dbc02 100644
--- a/quickmenu/arm9/source/main.cpp
+++ b/quickmenu/arm9/source/main.cpp
@@ -3205,7 +3205,10 @@ int dsClassicMenu(void) {
 				} else if (extension(filename[ms().secondaryDevice], ".a52")) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::EA5200DSLaunch;
 
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
+						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					}
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;
@@ -3247,7 +3250,7 @@ int dsClassicMenu(void) {
 				} else if (extension(filename[ms().secondaryDevice], ".nes") || extension(filename[ms().secondaryDevice], ".fds")) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::ENESDSLaunch;
 
-					ndsToBoot = (ms().secondaryDevice ? "sd:/_nds/TWiLightMenu/emulators/nesds.nds" : "sd:/_nds/TWiLightMenu/emulators/nestwl.nds");
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/nesds.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/nesds.nds";
 						boostVram = true;
diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
index 8b6f8e4867..2a816ecd45 100644
--- a/romsel_dsimenutheme/arm9/source/main.cpp
+++ b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -2298,7 +2298,10 @@ int dsiMenuTheme(void) {
 				} else if (extension(filename, {".a52"})) {
 					ms().launchType[ms().secondaryDevice] = Launch::EA5200DSLaunch;
 
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
+						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					}
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;
@@ -2339,7 +2342,7 @@ int dsiMenuTheme(void) {
 				} else if (extension(filename, {".nes", ".fds"})) {
 					ms().launchType[ms().secondaryDevice] = Launch::ENESDSLaunch;
 
-					ndsToBoot = (ms().secondaryDevice ? "sd:/_nds/TWiLightMenu/emulators/nesds.nds" : "sd:/_nds/TWiLightMenu/emulators/nestwl.nds");
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/nesds.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/nesds.nds";
 						boostVram = true;
diff --git a/romsel_r4theme/arm9/source/main.cpp b/romsel_r4theme/arm9/source/main.cpp
index 215484c61d..4c3e4e0f2e 100644
--- a/romsel_r4theme/arm9/source/main.cpp
+++ b/romsel_r4theme/arm9/source/main.cpp
@@ -2307,7 +2307,10 @@ int r4Theme(void) {
 				} else if (extension(filename, {".a52"})) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::EA5200DSLaunch;
 					
-					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					if (isDSiMode() && access(ndsToBoot, F_OK) != 0) {
+						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+					}
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 						boostVram = true;
@@ -2348,7 +2351,7 @@ int r4Theme(void) {
 				} else if (extension(filename, {".nes", ".fds"})) {
 					ms().launchType[ms().secondaryDevice] = TWLSettings::ENESDSLaunch;
 
-					ndsToBoot = (ms().secondaryDevice ? "sd:/_nds/TWiLightMenu/emulators/nesds.nds" : "sd:/_nds/TWiLightMenu/emulators/nestwl.nds");
+					ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/nesds.nds";
 					if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
 						ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/nesds.nds";
 						boostVram = true;
diff --git a/title/arm9/source/main.cpp b/title/arm9/source/main.cpp
index 01353c039f..c935111fbc 100644
--- a/title/arm9/source/main.cpp
+++ b/title/arm9/source/main.cpp
@@ -1001,7 +1001,7 @@ void lastRunROM()
 	} else if (ms().launchType[ms().previousUsedDevice] == Launch::ENESDSLaunch) {
 		if (access(ms().romPath[ms().previousUsedDevice].c_str(), F_OK) != 0) return;	// Skip to running TWiLight Menu++
 
-		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/nestwl.nds";
+		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/nesds.nds";
 		if (!isDSiMode() || access(argarray[0], F_OK) != 0) {
 			argarray.at(0) = (char*)"fat:/_nds/TWiLightMenu/emulators/nesds.nds";
 		}
@@ -1144,7 +1144,10 @@ void lastRunROM()
 	} else if (ms().launchType[ms().previousUsedDevice] == Launch::EA5200DSLaunch) {
 		if (access(ms().romPath[ms().previousUsedDevice].c_str(), F_OK) != 0) return;	// Skip to running TWiLight Menu++
 
-		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/A5200DS.nds";
+		argarray.at(0) = (char*)"sd:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+		if (isDSiMode() && access(argarray[0], F_OK) != 0) {
+			argarray.at(0) = (char*)"fat:/_nds/TWiLightMenu/emulators/A5200DSi.nds";
+		}
 		if (!isDSiMode() || access(argarray[0], F_OK) != 0) {
 			argarray.at(0) = (char*)"fat:/_nds/TWiLightMenu/emulators/A5200DS.nds";
 		}