diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml
index 47c51e78..f8369bba 100644
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -1057,7 +1057,7 @@
             <entry>org.yuzu_emu.yuzu</entry>
         </rule>
         <rule type="staticpath">
-            <entry>/var/data/ponzu/Yuzu/bin/yuzu-qt</entry> <!-- RetroDECK, ponzu -->
+            <entry>/var/data/ponzu/Yuzu/bin/yuzu</entry> <!-- RetroDECK, ponzu -->
             <entry>~/Applications/yuzu*.AppImage</entry>
             <entry>~/.local/share/applications/yuzu*.AppImage</entry>
             <entry>~/.local/bin/yuzu*.AppImage</entry>
diff --git a/functions/steam-sync/steam-sync.py b/functions/steam-sync/steam-sync.py
index 428f5c9c..11b078b2 100644
--- a/functions/steam-sync/steam-sync.py
+++ b/functions/steam-sync/steam-sync.py
@@ -129,7 +129,7 @@ command_list_default={
 "x68000": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/px68k_libretro.so",
 "zx81": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/81_libretro.so",
 "zxspectrum": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/fuse_libretro.so",
-"switch": "flatpak run --command=/var/data/ponzu/Yuzu/bin/yuzu-qt net.retrodeck.retrodeck -f -g",
+"switch": "flatpak run --command=/var/data/ponzu/Yuzu/bin/yuzu net.retrodeck.retrodeck -f -g",
 "n3ds": "flatpak run --command=/var/data/ponzu/Citra/bin/citra-qt net.retrodeck.retrodeck",
 "ps2": "flatpak run --command=pcsx2-qt net.retrodeck.retrodeck -batch",
 "wiiu": "flatpak run --command=Cemu-wrapper net.retrodeck.retrodeck -g",
diff --git a/tools/configurator.sh b/tools/configurator.sh
index 56b5ea9e..f4874ee8 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -447,10 +447,10 @@ configurator_open_emulator_dialog() {
   )
 
   # Check if any ponzu is true before adding Yuzu or Citra to the list
-  if [[ "$kiroi_ponzu" == true ]]; then
+  if [[ $(get_setting_value "$rd_conf" "kiroi_ponzu" "retrodeck" "options") == "true" ]]; then
     emulator_list+=("Yuzu" "Open the Switch emulator Yuzu")
   fi
-  if [[ "$kiroi_ponzu" == true ]]; then
+  if [[ $(get_setting_value "$rd_conf" "akai_ponzu" "retrodeck" "options") == "true" ]]; then
     emulator_list+=("Citra" "Open the 3DS emulator Citra")
   fi
 
@@ -536,7 +536,7 @@ configurator_open_emulator_dialog() {
 
   "Yuzu" )
     log i "Configurator: \"$emulator\""
-    /var/data/ponzu/Yuzu/bin/yuzu-qt
+    /var/data/ponzu/Yuzu/bin/yuzu
   ;;
 
   "" ) # No selection made or Back button clicked
@@ -1085,10 +1085,10 @@ configurator_reset_dialog() {
   )
 
   # Check if any ponzu is true before adding Yuzu or Citra to the list
-  if [[ "$kiroi_ponzu" == true ]]; then
+  if [[ $(get_setting_value "$rd_conf" "kiroi_ponzu" "retrodeck" "options") == "true" ]]; then
     emulator_list+=("Yuzu" "Reset the Switch emulator Yuzu")
   fi
-  if [[ "$kiroi_ponzu" == true ]]; then
+  if [[ $(get_setting_value "$rd_conf" "akai_ponzu" "retrodeck" "options") == "true" ]]; then
     emulator_list+=("Citra" "Reset the 3DS emulator Citra")
   fi