diff --git a/es_systems.cfg b/es_systems.cfg
index c0d3f602..78adb842 100644
--- a/es_systems.cfg
+++ b/es_systems.cfg
@@ -2110,25 +2110,6 @@
 			</emulator>
 		</emulators>
 	</system>
-	<system>
-		<name>mplayer</name>
-		<fullname>MPlayer</fullname>
-		<manufacturer>Various</manufacturer>
-		<release>unknown</release>
-		<hardware>system</hardware>
-		<path>~/retrodeck/storage/roms/mplayer</path>
-		<extension>.mp4 .MP4 .mkv .MKV .avi .AVI .mov .MOV .wmv .WMV .m3u .M3U .mpg .MPG .ytb .YTB .twi .TWI .sh .SH</extension>
-		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
-		<platform>mplayer</platform>
-		<theme>mplayer</theme>
-		<emulators>
-			<emulator name="mpv">
-				<cores>
-					<core default="true">mpv</core>
-				</cores>
-			</emulator>
-		</emulators>
-	</system>
 	<system>
 		<name>tools</name>
 		<fullname> &#xf0ad; Tools</fullname>
@@ -2153,4 +2134,23 @@
 		<platform>imageviewer</platform>
 		<theme>imageviewer</theme>
 	</system>
-</systemList>
+		<system>
+		<name>switch</name>
+		<fullname>Nintendo Switch</fullname>
+		<manufacturer>Nintendo</manufacturer>
+		<release>2017</release>
+		<hardware>portable</hardware>
+		<path>~/retrodeck/storage/roms/switch</path>
+		<extension>.nsp .xci</extension>
+		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
+		<platform>switch</platform>
+		<theme>switch</theme>
+		<emulators>
+			<emulator name="solarus">
+				<cores>
+					<core default="true">solarus</core>
+				</cores>
+			</emulator>
+		</emulators>
+	</system>
+</systemList>
\ No newline at end of file
diff --git a/install-retrodeck.sh b/install-retrodeck.sh
index 5901265d..f8cb5c6d 100755
--- a/install-retrodeck.sh
+++ b/install-retrodeck.sh
@@ -130,6 +130,7 @@ mkdir -p $INSTALL_DIR/roms/j2me
 mkdir -p $INSTALL_DIR/roms/uzebox
 mkdir -p $INSTALL_DIR/roms/supervision
 mkdir -p $INSTALL_DIR/roms/doom
+mkdir -p $INSTALL_DIR/roms/switch
 
 # Initializing directories
 mkdir -p $INSTALL_DIR/storage/.config/
@@ -162,8 +163,6 @@ if test -f "$INSTALL_DIR/emulators/RetroArch_cores.7z"; then
         rm -rf RetroArch*
         wget $CORES_LINK
     fi
-else
-    wget $CORES_LINK
 fi
 
 7z x RetroArch_cores.7z
@@ -171,6 +170,17 @@ mv $INSTALL_DIR/emulators/RetroArch-Linux-x86_64/RetroArch-Linux-x86_64.AppImage
 
 # TODO: Installing standalone emulators
 
+# Switch - Yuzu
+flatpak install flathub org.yuzu_emu.yuzu
+
+# Switch - Ryujinx
+cd $INSTALL_DIR/emulators
+wget https://github.com/Ryujinx/release-channel-master/releases/download/1.1.76/ryujinx-1.1.76-linux_x64.tar.gz
+tar -xvf ryujinx-1.1.76-linux_x64.tar.gz
+mv publish ryujinx
+
+
+
 # Installing 351elec-emulationstation
 cd $INSTALL_DIR
 git clone --recursive https://github.com/351ELEC/351elec-emulationstation emulationstation
@@ -180,7 +190,7 @@ cp $INSTALL_DIR/patches/Splash.h $INSTALL_DIR/emulationstation/es-core/src/Splas
 cp $INSTALL_DIR/patches/GuiMenu.cpp $INSTALL_DIR/emulationstation/es-app/src/guis/GuiMenu.cpp
 # pathes applied
 cd emulationstation
-sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost
+sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost openal # openal is needed for ryujinx
 cmake -DENABLE_EMUELEC=1 -DGLES2=0 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0 -DRG552=1
 make -j$(nproc)
 cp $INSTALL_DIR/es_systems.cfg $INSTALL_DIR/emulationstation/
diff --git a/patches/Splash.h b/patches/Splash.h
index 801d9084..30316f68 100644
--- a/patches/Splash.h
+++ b/patches/Splash.h
@@ -18,7 +18,7 @@ class TextureResource;
 #define DEFAULT_SPLASH_IMAGE ":/splash.svg"
 #define OLD_SPLASH_LAYOUT true
 #else
-#define DEFAULT_SPLASH_IMAGE "/home/deck/retrodeck/res/logo.png"
+#define DEFAULT_SPLASH_IMAGE "./res/logo.png"
 #define OLD_SPLASH_LAYOUT false
 #endif