diff --git a/Assets/defctrl.json b/Assets/defctrl.json
index e8fc5108c5..9900cd3a8b 100644
--- a/Assets/defctrl.json
+++ b/Assets/defctrl.json
@@ -520,7 +520,108 @@
       "P2 B": "",
       "P2 A": "",
       "P2 L": "",
-      "P2 R": ""
+      "P2 R": "",
+      "P1 Escape": "Escape",
+      "P1 F1": "F1",
+      "P1 F2": "F2",
+      "P1 F3": "F3",
+      "P1 F4": "F4",
+      "P1 F5": "F5",
+      "P1 F6": "F6",
+      "P1 F7": "F7",
+      "P1 F8": "F8",
+      "P1 F9": "F9",
+      "P1 F10": "F10",
+      "P1 F11": "F11",
+      "P1 F12": "F12",
+      "P1 Grave`": "Grave",
+      "P1 1(One)": "D1",
+      "P1 2": "D2",
+      "P1 3": "D3",
+      "P1 4": "D4",
+      "P1 5": "D5",
+      "P1 6": "D6",
+      "P1 7": "D7",
+      "P1 8": "D8",
+      "P1 9": "D9",
+      "P1 0(Zero)": "D0",
+      "P1 Minus-": "Minus",
+      "P1 Equals=": "Equals",
+      "P1 Backslash\\": "Backslash",
+      "P1 Backspace": "Backspace",
+      "P1 Tab": "Tab",
+      "P1 Q": "Q",
+      "P1 W": "W",
+      "P1 E": "E",
+      "P1 R": "R",
+      "P1 T": "T",
+      "P1 Y(Key)": "Y",
+      "P1 U": "U",
+      "P1 I": "I",
+      "P1 O": "O",
+      "P1 P": "P",
+      "P1 LeftBracket[": "LeftBracket",
+      "P1 RightBracket]": "RightBracket",
+      "P1 Enter": "Return",
+      "P1 CapsLock": "CapsLock",
+      "P1 A(Key)": "A",
+      "P1 S": "S",
+      "P1 D": "D",
+      "P1 F": "F",
+      "P1 G": "G",
+      "P1 H": "H",
+      "P1 J": "J",
+      "P1 K": "K",
+      "P1 L": "L",
+      "P1 Semicolon;": "Semicolon",
+      "P1 Quote'": "Apostrophe",
+      "P1 LeftShift": "LeftShift",
+      "P1 Z(Key)": "Z",
+      "P1 X(Key)": "X",
+      "P1 C(Key)": "C",
+      "P1 V": "V",
+      "P1 B(Key)": "B",
+      "P1 N": "N",
+      "P1 M": "M",
+      "P1 Comma,": "Comma",
+      "P1 Period.": "Period",
+      "P1 Slash/": "Slash",
+      "P1 RightShift": "RightShift",
+      "P1 LeftCtrl": "LeftControl",
+      "P1 LeftAlt": "LeftAlt",
+      "P1 Space": "Space",
+      "P1 RightAlt": "RightAlt",
+      "P1 RightCtrl": "RightControl",
+      "P1 PrintScreen": "",
+      "P1 ScrollLock": "ScrollLock",
+      "P1 Pause": "Pause",
+      "P1 Insert": "Insert",
+      "P1 Delete": "Delete",
+      "P1 Home": "Home",
+      "P1 End": "End",
+      "P1 PageUp": "PageUp",
+      "P1 PageDown": "PageDown",
+      "P1 Up": "UpArrow",
+      "P1 Down": "DownArrow",
+      "P1 CursorLeft": "LeftArrow",
+      "P1 Right": "RightArrow",
+      "P1 NumLock": "NumberLock",
+      "P1 KeypadSlash(Divide)": "NumberPadSlash",
+      "P1 KeypadAsterisk(Multiply)": "NumberPadStar",
+      "P1 KeypadMinus": "NumberPadMinus",
+      "P1 KeypadHome/7": "NumberPad7",
+      "P1 KeypadUp/8": "NumberPad8",
+      "P1 KeypadPageup/9": "NumberPad9",
+      "P1 KeypadPlus": "NumberPadPlus",
+      "P1 KeypadLeft/4": "NumberPad4",
+      "P1 KeypadCenter/5": "NumberPad5",
+      "P1 KeypadRight/6": "NumberPad6",
+      "P1 KeypadEnd/1": "NumberPad1",
+      "P1 KeypadDown/2": "NumberPad2",
+      "P1 KeypadPagedown/3": "NumberPad3",
+      "P1 KeypadEnter": "NumberPadEnter",
+      "P1 KeypadInsert/0": "NumberPad0",
+      "P1 KeypadDelete": "NumberPadPeriod"
     },
     "PC Engine Controller": {
       "Reset": "",
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
index f5589f1d08..fd136fb93b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/SaturnusControllerDeck.cs
@@ -433,15 +433,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 				"RightAlt",
 				"RightCtrl",
 				"KeypadEnter",
-				"Z",
+				"Z(Key)",
 				"S",
-				"A",
+				"A(Key)",
 				"W",
 				"2",
 				null,
 				null,
-				"C",
-				"X",
+				"C(Key)",
+				"X(Key)",
 				"D",
 				"E",
 				"4",
@@ -457,10 +457,10 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 				null,
 				null,
 				"N",
-				"B",
+				"B(Key)",
 				"H",
 				"G",
-				"Y",
+				"Y(Key)",
 				"6",
 				null,
 				null,
@@ -583,8 +583,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "8": return 108;
 					case "9": return 109;
 					case "0(Zero)": return 110;
-					case "Equals=": return 111;
-					case "Minus-": return 112;
+					case "Minus-": return 111;
+					case "Equals=": return 112;
 					case "Backslash\\": return 113;
 					case "Backspace": return 114;
 
@@ -594,7 +594,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "E": return 203;
 					case "R": return 204;
 					case "T": return 205;
-					case "Y": return 206;
+					case "Y(Key)": return 206;
 					case "U": return 207;
 					case "I": return 208;
 					case "O": return 209;
@@ -604,7 +604,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "Enter": return 213;
 
 					case "CapsLock": return 300;
-					case "A": return 301;
+					case "A(Key)": return 301;
 					case "S": return 302;
 					case "D": return 303;
 					case "F": return 304;
@@ -617,11 +617,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					case "Quote'": return 311;
 
 					case "LeftShift": return 400;
-					case "Z": return 401;
-					case "X": return 402;
-					case "C": return 403;
+					case "Z(Key)": return 401;
+					case "X(Key)": return 402;
+					case "C(Key)": return 403;
 					case "V": return 404;
-					case "B": return 405;
+					case "B(Key)": return 405;
 					case "N": return 406;
 					case "M": return 407;
 					case "Comma,": return 408;