diff --git a/es_systems.cfg b/es_systems.cfg
index 9f69c9a2..fdcabb02 100644
--- a/es_systems.cfg
+++ b/es_systems.cfg
@@ -827,7 +827,6 @@
 			<emulator name="retroarch">
 				<cores>
 					<core default="true">dosbox_pure</core>
-					<core>dosbox_svn</core>
 				</cores>
 			</emulator>
 		</emulators>
@@ -1047,9 +1046,29 @@
 		<platform>nds</platform>
 		<theme>nds</theme>
 		<emulators>
-			<emulator name="drastic">
+			<emulator name="retroarch">
 				<cores>
-					<core default="true">drastic</core>
+					<core default="true">desmume</core>
+					<core>melonds</core>
+				</cores>
+			</emulator>
+		</emulators>
+	</system>
+	<system>
+		<name>3ds</name>
+		<fullname>Nintendo 3DS</fullname>
+		<manufacturer>Nintendo</manufacturer>
+		<release>2011</release>
+		<hardware>portable</hardware>
+		<path>~/retrodeck/storage/roms/3ds</path>
+		<extension>.3ds .3dsx .elf .axf .cci .cxi .app .3DS .3DSX .ELF .AXF .CCI .CXI .APP</extension>
+		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
+		<platform>3ds</platform>
+		<theme>3ds</theme>
+		<emulators>
+			<emulator name="retroarch">
+				<cores>
+					<core default="true">citra</core>
 				</cores>
 			</emulator>
 		</emulators>
diff --git a/install-retrodeck.sh b/install-retrodeck.sh
index e917302a..560da22d 100755
--- a/install-retrodeck.sh
+++ b/install-retrodeck.sh
@@ -134,6 +134,7 @@ mkdir -p $INSTALL_DIR/roms/doom
 mkdir -p $INSTALL_DIR/roms/switch
 mkdir -p $INSTALL_DIR/roms/wii
 mkdir -p $INSTALL_DIR/roms/gc
+mkdir -p $INSTALL_DIR/roms/3ds
 
 # Initializing directories
 mkdir -p $INSTALL_DIR/storage/.config/