diff --git a/emulators/ryujinx/ryujinx.sh b/emulators/ryujinx/ryujinx.sh
new file mode 100755
index 00000000..671405df
--- /dev/null
+++ b/emulators/ryujinx/ryujinx.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+ARG=${1//[\\]/}
+./emulators/ryujinx/Ryujinx --fullscreen $ARG
\ No newline at end of file
diff --git a/emulators/yuzu.sh b/emulators/yuzu.sh
new file mode 100755
index 00000000..0d73d3ad
--- /dev/null
+++ b/emulators/yuzu.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+ARG=${1//[\\]/}
+flatpak run org.yuzu_emu.yuzu -f -g "$ARG"
\ No newline at end of file
diff --git a/es_systems.cfg b/es_systems.cfg
index 78adb842..08928555 100644
--- a/es_systems.cfg
+++ b/es_systems.cfg
@@ -2146,9 +2146,14 @@
 		<platform>switch</platform>
 		<theme>switch</theme>
 		<emulators>
-			<emulator name="solarus">
+			<emulator name="yuzu">
 				<cores>
-					<core default="true">solarus</core>
+					<core default="true">yuzu</core>
+				</cores>
+			</emulator>
+			<emulator name="ryujinx">
+				<cores>
+					<core>ryujinx</core>
 				</cores>
 			</emulator>
 		</emulators>
diff --git a/install-retrodeck.sh b/install-retrodeck.sh
index f8cb5c6d..ca547ebd 100755
--- a/install-retrodeck.sh
+++ b/install-retrodeck.sh
@@ -179,7 +179,9 @@ wget https://github.com/Ryujinx/release-channel-master/releases/download/1.1.76/
 tar -xvf ryujinx-1.1.76-linux_x64.tar.gz
 mv publish ryujinx
 
-
+# PS3 - RPCS3
+# DOS - dosbox-pure is included?
+# PSVITA - vita3k
 
 # Installing 351elec-emulationstation
 cd $INSTALL_DIR
@@ -253,6 +255,7 @@ chmod 777 $INSTALL_DIR/export_func.sh
 # TODO: these removal must be made when I am sure this files are safe on github
 #rm -rf $INSTALL_DIR/emulators/RetroArch-Linux-x86_64
 #rm -rf $INSTALL_DIR/emulators/RetroArch_cores.7z
+#rm -rf $INSTALL_DIR/emulators/ryujinx-1.1.76-linux_x64.tar.gz
 #rm $INSTALL_DIR/es_systems.cfg
 #rm $INSTALL_DIR/es_settings.cfg
 #rm $INSTALL_DIR/es_input.cfg
diff --git a/usr/bin/runemu.py b/usr/bin/runemu.py
index 32ba1400..cd530f1c 100755
--- a/usr/bin/runemu.py
+++ b/usr/bin/runemu.py
@@ -116,22 +116,24 @@ class StandaloneEmulator():
 	should_extract: bool = False
 
 standalone_emulators: 'MutableMapping[str, StandaloneEmulator]' = {
-	'AMIBERRY': StandaloneEmulator('amiberry', ['/usr/bin/amiberry.start', '<path>']),
-	'AdvanceMame': StandaloneEmulator('advmame', ['/usr/bin/advmame.sh', '<path>']),
-	'HATARISA': StandaloneEmulator('hatari', ['/usr/bin/hatari.start', '<path>']),
-	'hypseus_singe': StandaloneEmulator('hypseus', ['/usr/bin/hypseus.sh', '<path>']),
-	'OPENBOR': StandaloneEmulator('openbor', ['/usr/bin/openbor.sh', '<path>']),
-	'PPSSPPSDL': StandaloneEmulator('PPSSPPSDL', ['/usr/bin/ppsspp.sh', '<path>']),
-	'SCUMMVMSA': StandaloneEmulator('scummvm', ['/usr/bin/scummvm.start', 'sa', '<path>']),
-	'drastic': StandaloneEmulator('drastic', ['/usr/bin/drastic.sh', '<path>']),
-	'ecwolf': StandaloneEmulator('ecwolf', ['/usr/bin/ecwolf.sh', '<path>']),
-	'gzdoom': StandaloneEmulator('gzdoom', ['/usr/bin/gzdoom.sh', '<path>']),
-	'lzdoom': StandaloneEmulator('lzdoom', ['/usr/bin/lzdoom.sh', '<path>']),
-	'mpv': StandaloneEmulator('mpv', ['/usr/bin/mpv_video.sh', '<path>']),
-	'pico8': StandaloneEmulator('pico8_dyn', ['/usr/bin/pico-8.sh', '<path>']),
-	'piemu': StandaloneEmulator('piemu', ['/usr/bin/bash', '-l', '/usr/bin/piemu.sh', '<path>']),
-	'raze': StandaloneEmulator('raze', ['/usr/bin/raze.sh', '<path>']),
-	'solarus': StandaloneEmulator('solarus-run', ['/usr/bin/solarus.sh', '<path>']),
+	'AMIBERRY': StandaloneEmulator('amiberry', [INSTALL_DIR + '/usr/bin/amiberry.start', '<path>']),
+	'AdvanceMame': StandaloneEmulator('advmame', [INSTALL_DIR + '/usr/bin/advmame.sh', '<path>']),
+	'HATARISA': StandaloneEmulator('hatari', [INSTALL_DIR + '/usr/bin/hatari.start', '<path>']),
+	'hypseus_singe': StandaloneEmulator('hypseus', [INSTALL_DIR + '/usr/bin/hypseus.sh', '<path>']),
+	'OPENBOR': StandaloneEmulator('openbor', [INSTALL_DIR + '/usr/bin/openbor.sh', '<path>']),
+	'PPSSPPSDL': StandaloneEmulator('PPSSPPSDL', [INSTALL_DIR + '/usr/bin/ppsspp.sh', '<path>']),
+	'SCUMMVMSA': StandaloneEmulator('scummvm', [INSTALL_DIR + '/usr/bin/scummvm.start', 'sa', '<path>']),
+	'drastic': StandaloneEmulator('drastic', [INSTALL_DIR + '/usr/bin/drastic.sh', '<path>']),
+	'ecwolf': StandaloneEmulator('ecwolf', [INSTALL_DIR + '/usr/bin/ecwolf.sh', '<path>']),
+	'gzdoom': StandaloneEmulator('gzdoom', [INSTALL_DIR + '/usr/bin/gzdoom.sh', '<path>']),
+	'lzdoom': StandaloneEmulator('lzdoom', [INSTALL_DIR + '/usr/bin/lzdoom.sh', '<path>']),
+	'mpv': StandaloneEmulator('mpv', [INSTALL_DIR + '/usr/bin/mpv_video.sh', '<path>']),
+	'pico8': StandaloneEmulator('pico8_dyn', [INSTALL_DIR + '/usr/bin/pico-8.sh', '<path>']),
+	'piemu': StandaloneEmulator('piemu', [INSTALL_DIR + '/usr/bin/bash', '-l', '/usr/bin/piemu.sh', '<path>']),
+	'raze': StandaloneEmulator('raze', [INSTALL_DIR + '/usr/bin/raze.sh', '<path>']),
+	'solarus': StandaloneEmulator('solarus-run', [INSTALL_DIR + '/usr/bin/solarus.sh', '<path>']),
+	'yuzu': StandaloneEmulator('yuzu', [INSTALL_DIR + '/emulators/yuzu.sh', '<path>']),
+	'ryujinx': StandaloneEmulator('ryujinx', [INSTALL_DIR + '/emulators/ryujinx/ryujinx.sh', '<path>']),
 }
 
 def _load_customized_standalone_emulators():