diff --git a/ansible/files/game_station/bin/system/steamos-session-select b/ansible/files/game_station/bin/system/steamos-session-select
index c58d571..61e4a0d 100644
--- a/ansible/files/game_station/bin/system/steamos-session-select
+++ b/ansible/files/game_station/bin/system/steamos-session-select
@@ -35,6 +35,6 @@ if systemctl --user is-active --quiet sunshine.scope; then
   log "Stopping sunshine.scope"
   systemctl --user stop sunshine.scope
 fi
-
+sleep 5
 log "Restarting graphical session service..."
 systemctl --user restart session.service
\ No newline at end of file
diff --git a/ansible/files/game_station/bin/user/launch_genesis.sh b/ansible/files/game_station/bin/user/launch_genesis.sh
index 9282d65..d1911a1 100644
--- a/ansible/files/game_station/bin/user/launch_genesis.sh
+++ b/ansible/files/game_station/bin/user/launch_genesis.sh
@@ -9,14 +9,12 @@ if [ ! -d "$RETROARCH_HOME" ]; then
   exit 127
 fi
 
-RETROARCH_BIN="$RETROARCH_HOME/retroarch"
 RETROARCH_CORE=genesis_plus_gx_libretro.so
-if [ ! -f "$RETROARCH_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
-  log "ERROR: retroarch or core not found, install it via Steam"
+STEAM_BIN=$(command -v steam || true)
+if [ ! -f "$STEAM_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
+  log "ERROR: steam or retroarch core not found, install Steam or RetroArch PPSSPP core via Steam"
   exit 127
 fi
 
-log "Launching RetroArch: $RETROARCH_BIN -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
-cd "$RETROARCH_HOME"
-$HOME/.steam/steam/ubuntu12_32/steam-runtime/run.sh "$RETROARCH_BIN" -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"
-
+log "Launching RetroArch: $STEAM_BIN -applaunch 1118310 -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
+"$STEAM_BIN" -applaunch 1118310 -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"
diff --git a/ansible/files/game_station/bin/user/launch_ppspp.sh b/ansible/files/game_station/bin/user/launch_ppspp.sh
index 9dc605d..68d2f47 100644
--- a/ansible/files/game_station/bin/user/launch_ppspp.sh
+++ b/ansible/files/game_station/bin/user/launch_ppspp.sh
@@ -9,12 +9,12 @@ if [ ! -d "$RETROARCH_HOME" ]; then
   exit 127
 fi
 
-RETROARCH_BIN="$RETROARCH_HOME/retroarch"
 RETROARCH_CORE=ppsspp_libretro.so
-if [ ! -f "$RETROARCH_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
-  log "ERROR: retroarch or core not found, install it via Steam"
+STEAM_BIN=$(command -v steam || true)
+if [ ! -f "$STEAM_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
+  log "ERROR: steam or retroarch core not found, install Steam or RetroArch PPSSPP core via Steam"
   exit 127
 fi
 
-log "Launching RetroArch: $RETROARCH_BIN -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
-"$RETROARCH_BIN" -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"
+log "Launching RetroArch: $STEAM_BIN -applaunch 1118310 -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
+"$STEAM_BIN" -applaunch 1118310 -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"
diff --git a/ansible/files/game_station/bin/user/launch_snes.sh b/ansible/files/game_station/bin/user/launch_snes.sh
index 2ae190f..c4afc6e 100644
--- a/ansible/files/game_station/bin/user/launch_snes.sh
+++ b/ansible/files/game_station/bin/user/launch_snes.sh
@@ -9,13 +9,12 @@ if [ ! -d "$RETROARCH_HOME" ]; then
   exit 127
 fi
 
-RETROARCH_BIN="$RETROARCH_HOME/retroarch"
-RETROARCH_CORE=mesen-s_libretro.so.so
-if [ ! -f "$RETROARCH_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
-  log "ERROR: retroarch or core not found, install it via Steam"
+RETROARCH_CORE=mesen-s_libretro.so
+STEAM_BIN=$(command -v steam || true)
+if [ ! -f "$STEAM_BIN" ] || [ ! -f "$RETROARCH_HOME/cores/$RETROARCH_CORE" ]; then
+  log "ERROR: steam or retroarch core not found, install Steam or RetroArch PPSSPP core via Steam"
   exit 127
 fi
 
-log "Launching RetroArch: $RETROARCH_BIN -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
-cd "$RETROARCH_HOME"
-"$RETROARCH_BIN" -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"
+log "Launching RetroArch: $STEAM_BIN -applaunch 1118310 -L \"$RETROARCH_HOME/cores/$RETROARCH_CORE\" \"${@}\""
+"$STEAM_BIN" -applaunch 1118310 -L "$RETROARCH_HOME/cores/$RETROARCH_CORE" "${@}" >>"$LOGFILE"