diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.MultiClient/output/defctrl.json
index 4fe433137e..b300e1fef5 100644
--- a/BizHawk.MultiClient/output/defctrl.json
+++ b/BizHawk.MultiClient/output/defctrl.json
@@ -1,14 +1,14 @@
 {
   "AllTrollers": {
     "NES Controller": {
-      "P1 Up": "UpArrow",
-      "P1 Down": "DownArrow",
-      "P1 Left": "LeftArrow",
-      "P1 Right": "RightArrow",
-      "P1 Select": "Delete",
-      "P1 Start": "End",
-      "P1 B": "S",
-      "P1 A": "A",
+      "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "P1 Select": "Space, X1 Back",
+      "P1 Start": "Return, X1 Start",
+      "P1 B": "X, X1 B",
+      "P1 A": "Z, X1 A",
       "Reset": "",
       "Power": "",
       "P2 Up": "",
@@ -21,24 +21,24 @@
       "P2 A": ""
     },
     "Gameboy Controller": {
-      "Up": "UpArrow",
-      "Down": "DownArrow",
-      "Left": "LeftArrow",
-      "Right": "RightArrow",
-      "A": "A",
-      "B": "S",
-      "Select": "Delete",
-      "Start": "End",
-      "Power": ""
+      "Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "A": "X, X1 B",
+      "B": "Z, X1 A",
+      "Select": "Space, X1 Back",
+      "Start": "Return, X1 Start",
+      "Power": "",
     },
     "Saturn Controller": {
       "Power": "",
       "Reset": "",
-      "P1 Up": "UpArrow",
-      "P1 Down": "DownArrow",
-      "P1 Left": "LeftArrow",
-      "P1 Right": "RightArrow",
-      "P1 Start": "End",
+      "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "P1 Start": "Return, X1 Start",
       "P1 Z": "A",
       "P1 Y": "S",
       "P1 X": "D",
@@ -62,84 +62,84 @@
       "P2 R": ""
     },
     "Dual Gameboy Controller": {
-      "P1 Up": "",
-      "P1 Down": "",
-      "P1 Left": "",
-      "P1 Right": "",
-      "P1 A": "",
-      "P1 B": "",
-      "P1 Select": "",
-      "P1 Start": "",
-      "P1 Power": "",
-      "P2 Up": "",
-      "P2 Down": "",
-      "P2 Left": "",
-      "P2 Right": "",
-      "P2 A": "",
-      "P2 B": "",
-      "P2 Select": "",
-      "P2 Start": "",
-      "P2 Power": ""
+      "P1_Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "P1_Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "P1_Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "P1_Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "P1_A": "X, X1 B",
+      "P1_B": "Z, X1 A",
+      "P1_Select": "Space, X1 Back",
+      "P1_Start": "Return, X1 Start",
+      "P1_Power": "",
+      "P2_Up": "NumberPad8",
+      "P2_Down": "NumberPad2",
+      "P2_Left": "NumberPad4",
+      "P2_Right": "NumberPad6",
+      "P2_A": "C",
+      "P2_B": "V",
+      "P2_Select": "",
+      "P2_Start": "",
+      "P2_Power": ""
     },
     "Null Controller": {},
     "TI83 Controller": {
-      "0": "",
-      "1": "",
-      "2": "",
-      "3": "",
-      "4": "",
-      "5": "",
-      "6": "",
-      "7": "",
-      "8": "",
-      "9": "",
-      "DOT": "",
-      "ON": "",
-      "ENTER": "",
-      "DOWN": "",
-      "LEFT": "",
-      "UP": "",
-      "RIGHT": "",
-      "PLUS": "",
-      "MINUS": "",
-      "MULTIPLY": "",
-      "DIVIDE": "",
-      "CLEAR": "",
-      "EXP": "",
-      "DASH": "",
-      "PARACLOSE": "",
-      "TAN": "",
-      "VARS": "",
-      "PARAOPEN": "",
-      "COS": "",
-      "PRGM": "",
-      "STAT": "",
-      "COMMA": "",
-      "SIN": "",
-      "MATRIX": "",
-      "X": "",
-      "STO": "",
-      "LN": "",
-      "LOG": "",
-      "SQUARED": "",
-      "NEG1": "",
-      "MATH": "",
-      "ALPHA": "",
-      "GRAPH": "",
-      "TRACE": "",
-      "ZOOM": "",
-      "WINDOW": "",
-      "Y": "",
-      "2ND": "",
-      "MODE": "",
-      "DEL": ""
+      "0": "NumberPad0",
+      "1": "NumberPad1",
+      "2": "NumberPad2",
+      "3": "NumberPad3",
+      "4": "NumberPad4",
+      "5": "NumberPad5",
+      "6": "NumberPad6",
+      "7": "NumberPad7",
+      "8": "NumberPad8",
+      "9": "NumberPad9",
+      "DOT": "NumberPadPeriod",
+      "ON": "Space",
+      "ENTER": "Return, NumberPadEnter",
+      "DOWN": "DownArrow",
+      "UP": "UpArrow",
+      "LEFT": "LeftArrow",
+      "RIGHT": "RightArrow",
+      "PLUS": "NumberPadPlus",
+      "MINUS": "NumberPadMinus",
+      "MULTIPLY": "NumberPadStar",
+      "DIVIDE": "NumberPadSlash",
+      "CLEAR": "Escape",
+      "EXP": "6",
+      "DASH": "Minus",
+      "PARACLOSE": "0",
+      "TAN": "T",
+      "VARS": "V",
+      "PARAOPEN": "9",
+      "COS": "C",
+      "PRGM": "R",
+      "STAT": "S",
+      "SIN": "Period",
+      "MATRIX": "LeftBracket",
+      "X": "X",
+      "STO": "Insert",
+      "LN": "L",
+      "LOG": "O",
+      "SQUARED": "2",
+      "NEG1": "1",
+      "MATH": "M",
+      "ALPHA": "A",
+      "GRAPH": "G",
+      "TRACE": "Home",
+      "ZOOM": "Z",
+      "WINDOW": "W",
+      "Y": "Y",
+      "SECOND": "Slash",
+      "MODE": "BackSlash",
+      "DEL": "Delete",
+      "COMMA": "Comma",
     },
     "Nintento 64 Controller": {
-      "P1 DPad R": "RightArrow",
-      "P1 DPad L": "LeftArrow",
-      "P1 DPad D": "DownArrow",
-      "P1 DPad U": "UpArrow",
-      "P1 Start": "End",
+      "P1 DPad R": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "P1 DPad L": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "P1 DPad D": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "P1 DPad U": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "P1 Start": "Return, X1 Start",
       "P1 Z": "D",
       "P1 B": "S",
       "P1 A": "A",