diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index f6a4c5e96..acfabaa6a 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1047,9 +1047,9 @@
   </system>
   <system>
     <name>switch</name>
-    <fullname>Nintendo SWITCH</fullname>
+    <fullname>Nintendo Switch</fullname>
     <path>%ROMPATH%/switch</path>
-    <extension>.nsp .NSP .zip .ZIP .7z .nso .NSO .nro .NRO .nca .NCA .xci .XCI</extension>
+    <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
     <command>PLACEHOLDER %ROM%</command>
     <platform>switch</platform>
     <theme>switch</theme>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 0462c4b88..38f10b781 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1047,10 +1047,10 @@
   </system>
   <system>
     <name>switch</name>
-    <fullname>Nintendo SWITCH</fullname>
+    <fullname>Nintendo Switch</fullname>
     <path>%ROMPATH%/switch</path>
-    <extension>.nsp .NSP .zip .ZIP .7z .nso .NSO .nro .NRO .nca .NCA .xci .XCI</extension>
-    <command>/opt/yuzu/yuzu.AppImage %ROM%</command>
+    <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
+    <command>%EMULATOR_YUZU% %ROM%</command>
     <platform>switch</platform>
     <theme>switch</theme>
   </system>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index fdba569d4..229b919c7 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1047,10 +1047,10 @@
   </system>
   <system>
     <name>switch</name>
-    <fullname>Nintendo SWITCH</fullname>
-    <path>%ROMPATH%/switch</path>
-    <extension>.nsp .NSP .zip .ZIP .7z .nso .NSO .nro .NRO .nca .NCA .xci .XCI</extension>
-    <command>PLACEHOLDER %ROM%</command>
+    <fullname>Nintendo Switch</fullname>
+    <path>%ROMPATH%\switch</path>
+    <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
+    <command>%EMULATOR_YUZU% %ROM%</command>
     <platform>switch</platform>
     <theme>switch</theme>
   </system>