diff --git a/board/recalbox/fsoverlay/recalbox/share_init/system/.emulationstation/es_input.cfg b/board/recalbox/fsoverlay/recalbox/share_init/system/.emulationstation/es_input.cfg
index 566bd016dd017e70acc1bf7439a7d4b3eceebd14..49af8878e55297e36932c61fc72aefb61813796d 100644
--- a/board/recalbox/fsoverlay/recalbox/share_init/system/.emulationstation/es_input.cfg
+++ b/board/recalbox/fsoverlay/recalbox/share_init/system/.emulationstation/es_input.cfg
@@ -59,7 +59,6 @@
   <!-- Nintendo Switch Left Joy-Con -->
   <!-- Nintendo Switch Right Joy-Con -->
   <!-- Ultimarc J-PAC -->
-  <!-- SNES controller -->
   <!-- SN30-GP BT -->
   <!-- SN30-GP USB -->
   <!-- 8bitdo Pro X-Input -->
@@ -72,7 +71,6 @@
   <!-- Retrobit Tribute64 (default mode Start + Up) -->
   <!-- PiBoy DMG Controller -->
   <!-- PiBoy XRS Controller -->
-  <!-- Nintendo Switch N64 Controller -->
   <!-- Nintendo Switch Megadrive/Genesis Controller -->
   <!-- Hutopi -->
   <inputConfig type="joystick" deviceGUID="03004d2a1f08000001e4000010010000" deviceNbAxes="2" deviceNbHats="0" deviceNbButtons="10">
@@ -237,4 +235,42 @@
     <input name="select" type="button" id="6" value="1" code="314" />
     <input name="start" type="button" id="7" value="1" code="315" />
   </inputConfig>
+  <!-- Nintendo Switch SNES controller -->
+  <inputConfig type="joystick" deviceName="SNES Controller" deviceGUID="0500c0db7e0500001720000001800000" deviceNbAxes="0" deviceNbHats="1" deviceNbButtons="10" version="2">
+    <input name="left" type="hat" id="0" value="8" code="-1" />
+    <input name="down" type="hat" id="0" value="4" code="-1" />
+    <input name="right" type="hat" id="0" value="2" code="-1" />
+    <input name="up" type="hat" id="0" value="1" code="-1" />
+    <input name="r2" type="button" id="7" value="1" code="313" />
+    <input name="l2" type="button" id="6" value="1" code="312" />
+    <input name="r1" type="button" id="5" value="1" code="311" />
+    <input name="l1" type="button" id="4" value="1" code="310" />
+    <input name="y" type="button" id="3" value="1" code="308" />
+    <input name="x" type="button" id="2" value="1" code="307" />
+    <input name="b" type="button" id="0" value="1" code="304" />
+    <input name="a" type="button" id="1" value="1" code="305" />
+    <input name="hotkey" type="button" id="8" value="1" code="314" />
+    <input name="select" type="button" id="8" value="1" code="314" />
+    <input name="start" type="button" id="9" value="1" code="315" />
+  </inputConfig>
+  <!-- Nintendo Switch N64 Controller -->
+  <inputConfig type="joystick" deviceName="N64 Controller" deviceGUID="05001c5e7e0500001920000001800000" deviceNbAxes="2" deviceNbHats="1" deviceNbButtons="13" version="2">
+    <input name="joystick1up" type="axis" id="1" value="-1" code="1" />
+    <input name="joystick1left" type="axis" id="0" value="-1" code="0" />
+    <input name="left" type="hat" id="0" value="8" code="-1" />
+    <input name="down" type="hat" id="0" value="4" code="-1" />
+    <input name="right" type="hat" id="0" value="2" code="-1" />
+    <input name="up" type="hat" id="0" value="1" code="-1" />
+    <input name="r2" type="button" id="9" value="1" code="313" />
+    <input name="l2" type="button" id="8" value="1" code="312" />
+    <input name="r1" type="button" id="7" value="1" code="311" />
+    <input name="l1" type="button" id="6" value="1" code="310" />
+    <input name="y" type="button" id="1" value="1" code="305" />
+    <input name="x" type="button" id="4" value="1" code="308" />
+    <input name="b" type="button" id="0" value="1" code="304" />
+    <input name="a" type="button" id="3" value="1" code="307" />
+    <input name="hotkey" type="button" id="12" value="1" code="316" />
+    <input name="select" type="button" id="12" value="1" code="316" />
+    <input name="start" type="button" id="11" value="1" code="315" />
+  </inputConfig>
 </inputList>
diff --git a/projects/configgen/configgen/generators/libretro/libretroControllers.py b/projects/configgen/configgen/generators/libretro/libretroControllers.py
index e62942d81c1ac92f53b776861e73b979a419e0a9..21df5730cd5d63e45b21903523626f353dcf6258 100644
--- a/projects/configgen/configgen/generators/libretro/libretroControllers.py
+++ b/projects/configgen/configgen/generators/libretro/libretroControllers.py
@@ -426,11 +426,11 @@ class LibretroControllers:
         settings.setInt("input_player{}_joypad_index".format(playerIndex), inputIndex)
 
         # Specific configuration for Nintendo Switch N64 Controller
-        if controller.DeviceName == 'Nintendo Switch N64 Controller':
-            settings.setString("input_player{}_r_x_plus_btn".format(playerIndex), '"9"')
-            settings.setString("input_player{}_r_x_minus_btn".format(playerIndex), '"2"')
-            settings.setString("input_player{}_r_y_plus_btn".format(playerIndex), '"8"')
-            settings.setString("input_player{}_r_y_minus_btn".format(playerIndex), '"3"')
+        if controller.DeviceName in ['Nintendo Switch N64 Controller', 'N64 Controller']:
+            settings.setString("input_player{}_r_x_plus_btn".format(playerIndex), '"2"')    # C-Right
+            settings.setString("input_player{}_r_x_minus_btn".format(playerIndex), '"4"')   # C-Left
+            settings.setString("input_player{}_r_y_plus_btn".format(playerIndex), '"3"')    # C-Down
+            settings.setString("input_player{}_r_y_minus_btn".format(playerIndex), '"10"')  # C-Up
 
         # remap config
         print("[libretroControllers] setting input_libretro_device_p{}={}".format(playerIndex, 1))
diff --git a/projects/configgen/configgen/generators/mupen/mupenControllers.py b/projects/configgen/configgen/generators/mupen/mupenControllers.py
index a982ce0dacde3eaa71b8d555e2ecc2c621b99c05..b26d8dd36f5a390fcb2c5bbc55eb310d2842af1a 100644
--- a/projects/configgen/configgen/generators/mupen/mupenControllers.py
+++ b/projects/configgen/configgen/generators/mupen/mupenControllers.py
@@ -83,12 +83,12 @@ def defineControllerKeys(controller: Controller) -> Dict[str, str]:
             config['X Axis'] = "button({},{})".format(controller.Left.Id, controller.Right.Id)
             config['Y Axis'] = "button({},{})".format(controller.Up.Id, controller.Down.Id)
 
-    if controller.DeviceName == 'Nintendo Switch N64 Controller':
+    if controller.DeviceName in ['Nintendo Switch N64 Controller', 'N64 Controller']:
         # Specific case for the official N64 controller for Nintendo Switch
-        config['C Button U'] = "button(3)";
-        config['C Button D'] = "button(8)";
-        config['C Button L'] = "button(2)";
-        config['C Button R'] = "button(9)";
+        config['C Button U'] = "button(10)"
+        config['C Button D'] = "button(3)"
+        config['C Button L'] = "button(4)"
+        config['C Button R'] = "button(2)"
     return config