diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
index 3ea9b50687..9f58743dac 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
@@ -56,11 +56,10 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 23, 36),
 					ButtonSchema.Left($"P{controller} Left", 2, 24),
 					ButtonSchema.Right($"P{controller} Right", 44, 24), 
-					new ButtonSchema
+					new ButtonSchema(124, 24)
 					{
 						Name = $"P{controller} Button",
-						DisplayName = "B",
-						Location = new Point(124, 24)
+						DisplayName = "B"
 					}
 				}
 			};
@@ -76,33 +75,29 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(334, 94),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(5, 24)
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "B1",
-						Location = new Point(5, 24)
 					},
-					new ButtonSchema
+					new ButtonSchema(5, 48)
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "B2",
-						Location = new Point(5, 48)
 					},
-					new ButtonSchema
+					new ButtonSchema(55, 17)
 					{
 						Name = $"P{controller} Paddle X 1",
 						DisplayName = "Paddle X 1",
-						Location = new Point(55, 17),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
 					},
-					new ButtonSchema
+					new ButtonSchema(193, 17)
 					{
 						Name = $"P{controller} Paddle X 2",
 						DisplayName = "Paddle X 2",
-						Location = new Point(193, 17),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
@@ -122,47 +117,24 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = $"P{controller} Up",
-						Icon = Properties.Resources.BlueUp,
-						Location = new Point(23, 15)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Down",
-						Icon = Properties.Resources.BlueDown,
-						Location = new Point(23, 36)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Left",
-						Icon = Properties.Resources.Back,
-						Location = new Point(2, 24)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Right",
-						Icon = Properties.Resources.Forward,
-						Location = new Point(44, 24)
-					},
-					new ButtonSchema
+					ButtonSchema.Up($"P{controller} Up", 23, 15),
+					ButtonSchema.Down($"P{controller} Down", 23, 36),
+					ButtonSchema.Left($"P{controller} Left", 2, 24),
+					ButtonSchema.Right($"P{controller} Right", 44, 24),
+					new ButtonSchema(132, 24)
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B",
-						Location = new Point(132, 24)
 					},
-					new ButtonSchema
+					new ButtonSchema(68, 36)
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "B1",
-						Location = new Point(68, 36)
 					},
-					new ButtonSchema
+					new ButtonSchema(100, 36)
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "B2",
-						Location = new Point(100, 36)
 					}
 				}
 			};
@@ -178,27 +150,24 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(334, 94),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(5, 24)
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B1",
-						Location = new Point(5, 24)
 					},
-					new ButtonSchema
+					new ButtonSchema(55, 17)
 					{
 						Name = $"P{controller} Wheel X 1",
 						DisplayName = "Wheel X 1",
-						Location = new Point(55, 17),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
 					},
-					new ButtonSchema
+					new ButtonSchema(193, 17)
 					{
 						Name = $"P{controller} Wheel X 2",
 						DisplayName = "Wheel X 2",
-						Location = new Point(193, 17),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
@@ -217,21 +186,9 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(185, 75),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = "Select",
-						Location = new Point(10, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "Reset",
-						Location = new Point(60, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "Power",
-						Location = new Point(108, 15)
-					},
+					new ButtonSchema(10, 15) { Name = "Select" },
+					new ButtonSchema(60, 15) { Name = "Reset" },
+					new ButtonSchema(108, 15) { Name = "Power" },
 					new ButtonSchema
 					{
 						Name = "Toggle Left Difficulty",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
index a4baa0568c..85943da31f 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
@@ -65,17 +65,15 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 23, 36),
 					ButtonSchema.Left($"P{controller} Left", 2, 24),
 					ButtonSchema.Right($"P{controller} Right", 44, 24), 
-					new ButtonSchema
+					new ButtonSchema(120, 24)
 					{
 						Name = $"P{controller} Trigger",
-						DisplayName = "1",
-						Location = new Point(120, 24)
+						DisplayName = "1"
 					},
-					new ButtonSchema
+					new ButtonSchema(145, 24)
 					{
 						Name = $"P{controller} Trigger 2",
-						DisplayName = "2",
-						Location = new Point(145, 24)
+						DisplayName = "2"
 					}
 				}
 			};
@@ -91,35 +89,14 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = $"P{controller} Up",
-						Icon = Properties.Resources.BlueUp,
-						Location = new Point(23, 15)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Down",
-						Icon = Properties.Resources.BlueDown,
-						Location = new Point(23, 36)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Left",
-						Icon = Properties.Resources.Back,
-						Location = new Point(2, 24)
-					},
-					new ButtonSchema
-					{
-						Name = $"P{controller} Right",
-						Icon = Properties.Resources.Forward,
-						Location = new Point(44, 24)
-					},
-					new ButtonSchema
+					ButtonSchema.Up($"P{controller} Up", 23, 15),
+					ButtonSchema.Down($"P{controller} Down", 23, 36),
+					ButtonSchema.Left($"P{controller} Left", 2, 24),
+					ButtonSchema.Right($"P{controller} Right", 54, 24),
+					new ButtonSchema(120, 24)
 					{
 						Name = $"P{controller} Button",
-						DisplayName = "1",
-						Location = new Point(120, 24)
+						DisplayName = "1"
 					}
 				}
 			};
@@ -134,18 +111,16 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(250, 74),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(23, 15)
 					{
 						Name = $"P{controller} Paddle",
 						DisplayName = "Paddle",
-						Location = new Point(23, 15),
 						Type = PadInputType.FloatSingle
 					},
-					new ButtonSchema
+					new ButtonSchema(12, 90)
 					{
 						Name = $"P{controller} Trigger",
-						DisplayName = "1",
-						Location = new Point(12, 90)
+						DisplayName = "1"
 					}
 				}
 			};
@@ -161,10 +136,9 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(14, 17)
 					{
 						Name = $"P{controller} VPos",
-						Location = new Point(14, 17),
 						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
@@ -172,11 +146,10 @@ namespace BizHawk.Client.EmuHawk
 							$"P{controller} HPos"
 						}
 					},
-					new ButtonSchema
+					new ButtonSchema(284, 17)
 					{
 						Name = $"P{controller} Trigger",
-						DisplayName = "Trigger",
-						Location = new Point(284, 17)
+						DisplayName = "Trigger"
 					}
 				}
 			};
@@ -191,31 +164,11 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(215, 50),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = "Select",
-						Location = new Point(10, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "Reset",
-						Location = new Point(60, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "Power",
-						Location = new Point(108, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "Pause",
-						Location = new Point(158, 15)
-					},
-					new ButtonSchema
-					{
-						Name = "BW",
-						Location = new Point(158, 15)
-					}
+					new ButtonSchema(10, 15) { Name = "Select" },
+					new ButtonSchema(60, 15) { Name = "Reset" },
+					new ButtonSchema(108, 15) { Name = "Power" },
+					new ButtonSchema(158, 15) { Name = "Pause" },
+					new ButtonSchema(158, 15) { Name = "BW" }
 				}
 			};
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
index af0e438532..15214b5cda 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
@@ -25,346 +25,98 @@ namespace BizHawk.Client.EmuHawk
 				Buttons = new[]
 				{
 					/************************** Row 1 **************************/
-					new ButtonSchema
-					{
-						Name = "Escape",
-						DisplayName = "Esc",
-						Location = new Point(10, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "1",
-						Location = new Point(46, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "2",
-						Location = new Point(70, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "3",
-						Location = new Point(94, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "4",
-						Location = new Point(118, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "5",
-						Location = new Point(142, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "6",
-						Location = new Point(166, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "7",
-						Location = new Point(190, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "8",
-						Location = new Point(214, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "9",
-						Location = new Point(238, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "0",
-						Location = new Point(262, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "-",
-						Location = new Point(286, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "=",
-						Location = new Point(307, 18)
-					},
-					new ButtonSchema
-					{
-						Name = "Delete",
-						Location = new Point(331, 18)
+					new ButtonSchema(10, 18) { Name = "Escape",  DisplayName = "Esc"
 					},
+					new ButtonSchema(46, 18) { Name = "1" },
+					new ButtonSchema(70, 18) { Name = "2" },
+					new ButtonSchema(94, 18) { Name = "3" },
+					new ButtonSchema(118, 18) { Name = "4" },
+					new ButtonSchema(142, 18) { Name = "5" },
+					new ButtonSchema(166, 18) { Name = "6" },
+					new ButtonSchema(190, 18) { Name = "7" },
+					new ButtonSchema(214, 18) { Name = "8" },
+					new ButtonSchema(238, 18) { Name = "9" },
+					new ButtonSchema(262, 18) { Name = "0" },
+					new ButtonSchema(286, 18) { Name = "-" },
+					new ButtonSchema(307, 18) { Name = "=" },
+					new ButtonSchema(331, 18) { Name = "Delete" },
 					
 					/************************** Row 2 **************************/
-					new ButtonSchema
-					{
-						Name = "Tab",
-						DisplayName = " Tab ",
-						Location = new Point(10, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "Q",
-						Location = new Point(52, 42)
-					},
-
-					new ButtonSchema
-					{
-						Name = "W",
-						Location = new Point(78, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "E",
-						Location = new Point(106, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "R",
-						Location = new Point(130, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "T",
-						Location = new Point(156, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "Y",
-						Location = new Point(180, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "U",
-						Location = new Point(204, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "I",
-						Location = new Point(230, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "O",
-						Location = new Point(250, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "P",
-						Location = new Point(276, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "[",
-						Location = new Point(302, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "]",
-						Location = new Point(325, 42)
-					},
-					new ButtonSchema
-					{
-						Name = "\\",
-						DisplayName = " \\ ",
-						Location = new Point(349, 42)
-					},
+					new ButtonSchema(10, 42) { Name = "Tab",  DisplayName = " Tab " },
+					new ButtonSchema(52, 42) { Name = "Q" },
+					new ButtonSchema(78, 42) { Name = "W" },
+					new ButtonSchema(106, 42) { Name = "E" },
+					new ButtonSchema(130, 42) { Name = "R" },
+					new ButtonSchema(156, 42) { Name = "T" },
+					new ButtonSchema(180, 42) { Name = "Y" },
+					new ButtonSchema(204, 42) { Name = "U" },
+					new ButtonSchema(230, 42) { Name = "I" },
+					new ButtonSchema(250, 42) { Name = "O" },
+					new ButtonSchema(276, 42) { Name = "P" },
+					new ButtonSchema(302, 42) { Name = "[" },
+					new ButtonSchema(325, 42) { Name = "]" },
+					new ButtonSchema(349, 42) { Name = "\\",  DisplayName = " \\ " },
 
 					/************************** Row 3 **************************/
-					new ButtonSchema
-					{
-						Name = "Control",
-						DisplayName = " Control ",
-						Location = new Point(10, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "A",
-						Location = new Point(66, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "S",
-						Location = new Point(90, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "D",
-						Location = new Point(114, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "F",
-						Location = new Point(140, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "G",
-						Location = new Point(164, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "H",
-						Location = new Point(190, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "J",
-						Location = new Point(216, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "K",
-						Location = new Point(238, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "L"
-					},
-					new ButtonSchema
-					{
-						Name = ";",
-						Location = new Point(286, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "'",
-						Location = new Point(307, 66)
-					},
-					new ButtonSchema
-					{
-						Name = "Return",
-						Location = new Point(328, 66)
-					},
+					new ButtonSchema(10, 66) { Name = "Control",  DisplayName = " Control " },
+					new ButtonSchema(66, 66) { Name = "A" },
+					new ButtonSchema(90, 66) { Name = "S" },
+					new ButtonSchema(114, 66) { Name = "D" },
+					new ButtonSchema(140, 66) { Name = "F" },
+					new ButtonSchema(164, 66) { Name = "G" },
+					new ButtonSchema(190, 66) { Name = "H" },
+					new ButtonSchema(216, 66) { Name = "J" },
+					new ButtonSchema(238, 66) { Name = "K" },
+					new ButtonSchema(262, 66) { Name = "L" },
+					new ButtonSchema(286, 66) { Name = ";" },
+					new ButtonSchema(307, 66) { Name = "'" },
+					new ButtonSchema(328, 66) { Name = "Return" },
 
 					/************************** Row 4 **************************/
-					new ButtonSchema
-					{
-						Name = "Shift",
-						DisplayName = "     Shift     ",
-						Location = new Point(10, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "Z",
-						Location = new Point(80, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "X",
-						Location = new Point(106, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "C",
-						Location = new Point(130, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "V",
-						Location = new Point(154, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "B",
-						Location = new Point(178, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "N",
-						Location = new Point(202, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "M",
-						Location = new Point(226, 90)
-					},
-					new ButtonSchema
-					{
-						Name = ",",
-						Location = new Point(252, 90)
-					},
-					new ButtonSchema
-					{
-						Name = ".",
-						Location = new Point(272, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "/",
-						Location = new Point(292, 90)
-					},
-					new ButtonSchema
-					{
-						Name = "Shift",
-						DisplayName = "    Shift    ",
-						Location = new Point(315, 90)
-					},
+					new ButtonSchema(10, 90) { Name = "Shift", DisplayName = "     Shift     " },
+					new ButtonSchema(80, 90) { Name = "Z" },
+					new ButtonSchema(106, 90) { Name = "X" },
+					new ButtonSchema(130, 90) { Name = "C" },
+					new ButtonSchema(154, 90) { Name = "V" },
+					new ButtonSchema(178, 90) { Name = "B" },
+					new ButtonSchema(202, 90) { Name = "N" },
+					new ButtonSchema(226, 90) { Name = "M" },
+					new ButtonSchema(252, 90) { Name = "," },
+					new ButtonSchema(272, 90) { Name = "." },
+					new ButtonSchema(292, 90) { Name = "/" },
+					new ButtonSchema(315, 90) { Name = "Shift", DisplayName = "    Shift    " },
 
 					/************************** Row 5 **************************/
 
-					new ButtonSchema
+					new ButtonSchema(10, 114)
 					{
 						Name = "Caps Lock",
-						DisplayName = "Caps",
-						Location = new Point(10, 114)
+						DisplayName = "Caps"
 					},
-					new ButtonSchema
+					new ButtonSchema(52, 114)
 					{
 						Name = "`",
-						DisplayName = "~",
-						Location = new Point(52, 114)
+						DisplayName = "~"
 					},
-					new ButtonSchema
+					new ButtonSchema(96, 114)
 					{
 						Name = "White Apple",
-						DisplayName = "<",
-						Location = new Point(96, 114)
+						DisplayName = "<"
 					},
-
-					new ButtonSchema
+					new ButtonSchema(120, 114)
 					{
 						Name = "Space",
-						DisplayName = "                Space                ",
-						Location = new Point(120, 114)
+						DisplayName = "                Space                "
 					},
-
-					new ButtonSchema
+					new ButtonSchema(265, 114)
 					{
 						Name = "Black Apple",
-						DisplayName = ">",
-						Location = new Point(265, 114)
+						DisplayName = ">"
 					},
-
-					new ButtonSchema
-					{
-						Name = "Left",
-						Icon = Properties.Resources.Back,
-						Location = new Point(289, 114)
-					},
-
-					new ButtonSchema
-					{
-						Name = "Right",
-						Icon = Properties.Resources.Forward,
-						Location = new Point(311, 114)
-					},
-
-					new ButtonSchema
-					{
-						Name = "Down",
-						Icon = Properties.Resources.BlueDown,
-						Location = new Point(333, 114)
-					},
-
-					new ButtonSchema
-					{
-						Name = "Up",
-						Icon = Properties.Resources.BlueUp,
-						Location = new Point(355, 114)
-					}
+					ButtonSchema.Left("Left", 289, 114),
+					ButtonSchema.Right("Right", 311, 114),
+					ButtonSchema.Down("Down", 333, 114),
+					ButtonSchema.Up("Up", 355, 114), 
 				}
 			};
 		}
@@ -378,17 +130,15 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(120, 50),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(10, 18)
 					{
 						Name = "Next Disk",
-						DisplayName = "Next",
-						Location = new Point(10, 18)
+						DisplayName = "Next"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 18)
 					{
 						Name = "Previous Disk",
-						DisplayName = "Previous",
-						Location = new Point(50, 18)
+						DisplayName = "Previous"
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
index 6a41027693..63e5fa6288 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
@@ -16,6 +16,12 @@ namespace BizHawk.Client.EmuHawk
 
 	public class ButtonSchema
 	{
+		public ButtonSchema()
+		{
+		}
+
+		public ButtonSchema(int x, int y) => Location = new Point(x, y);
+
 		public string Name { get; set; }
 		public string DisplayName { get; set; }
 		public PadInputType Type { get; set; } = PadInputType.Boolean;
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
index 802a9e1c3c..9eba6b8d2a 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
@@ -30,11 +30,10 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 23, 36),
 					ButtonSchema.Left($"P{controller} Left", 2, 24),
 					ButtonSchema.Right($"P{controller} Right", 44, 24), 
-					new ButtonSchema
+					new ButtonSchema(124, 24)
 					{
 						Name = $"P{controller} Button",
-						DisplayName = "B",
-						Location = new Point(124, 24)
+						DisplayName = "B"
 					}
 				}
 			};
@@ -49,401 +48,335 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(500, 150),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(16, 18)
 					{
 						Name = "Key Left Arrow",
-						DisplayName = "←",
-						Location = new Point(16, 18)
+						DisplayName = "←"
 					},
-					new ButtonSchema
+					new ButtonSchema(46, 18)
 					{
 						Name = "Key 1",
-						DisplayName = "1",
-						Location = new Point(46, 18)
+						DisplayName = "1"
 					},
-					new ButtonSchema
+					new ButtonSchema(70, 18)
 					{
 						Name = "Key 2",
-						DisplayName = "2",
-						Location = new Point(70, 18)
+						DisplayName = "2"
 					},
-					new ButtonSchema
+					new ButtonSchema(94, 18)
 					{
 						Name = "Key 3",
-						DisplayName = "3",
-						Location = new Point(94, 18)
+						DisplayName = "3"
 					},
-					new ButtonSchema
+					new ButtonSchema(118, 18)
 					{
 						Name = "Key 4",
-						DisplayName = "4",
-						Location = new Point(118, 18)
+						DisplayName = "4"
 					},
-					new ButtonSchema
+					new ButtonSchema(142, 18)
 					{
 						Name = "Key 5",
-						DisplayName = "5",
-						Location = new Point(142, 18)
+						DisplayName = "5"
 					},
-					new ButtonSchema
+					new ButtonSchema(166, 18)
 					{
 						Name = "Key 6",
-						DisplayName = "6",
-						Location = new Point(166, 18)
+						DisplayName = "6"
 					},
-					new ButtonSchema
+					new ButtonSchema(190, 18)
 					{
 						Name = "Key 7",
-						DisplayName = "7",
-						Location = new Point(190, 18)
+						DisplayName = "7"
 					},
-					new ButtonSchema
+					new ButtonSchema(214, 18)
 					{
 						Name = "Key 8",
-						DisplayName = "8",
-						Location = new Point(214, 18)
+						DisplayName = "8"
 					},
-					new ButtonSchema
+					new ButtonSchema(238, 18)
 					{
 						Name = "Key 9",
-						DisplayName = "9",
-						Location = new Point(238, 18)
+						DisplayName = "9"
 					},
-					new ButtonSchema
+					new ButtonSchema(262, 18)
 					{
 						Name = "Key 0",
-						DisplayName = "0",
-						Location = new Point(262, 18)
+						DisplayName = "0"
 					},
-					new ButtonSchema
+					new ButtonSchema(286, 18)
 					{
 						Name = "Key Plus",
-						DisplayName = "+",
-						Location = new Point(286, 18)
+						DisplayName = "+"
 					},
-					new ButtonSchema
+					new ButtonSchema(310, 18)
 					{
 						Name = "Key Minus",
-						DisplayName = "-",
-						Location = new Point(310, 18)
+						DisplayName = "-"
 					},
-					new ButtonSchema
+					new ButtonSchema(330, 18)
 					{
 						Name = "Key Pound",
-						DisplayName = "£",
-						Location = new Point(330, 18)
+						DisplayName = "£"
 					},
-					new ButtonSchema
+					new ButtonSchema(354, 18)
 					{
 						Name = "Key Clear/Home",
-						DisplayName = "C/H",
-						Location = new Point(354, 18)
+						DisplayName = "C/H"
 					},
-					new ButtonSchema
+					new ButtonSchema(392, 18)
 					{
 						Name = "Key Insert/Delete",
-						DisplayName = "I/D",
-						Location = new Point(392, 18)
+						DisplayName = "I/D"
 					},
-					new ButtonSchema
+					new ButtonSchema(450, 18)
 					{
 						Name = "Key F1",
-						DisplayName = "F 1",
-						Location = new Point(450, 18)
+						DisplayName = "F 1"
 					},
-					new ButtonSchema
+					new ButtonSchema(450, 42)
 					{
 						Name = "Key F3",
-						DisplayName = "F 3",
-						Location = new Point(450, 42)
+						DisplayName = "F 3"
 					},
-					new ButtonSchema
+					new ButtonSchema(450, 66)
 					{
 						Name = "Key F5",
-						DisplayName = "F 5",
-						Location = new Point(450, 66)
+						DisplayName = "F 5"
 					},
-					new ButtonSchema
+					new ButtonSchema(450, 90)
 					{
 						Name = "Key F7",
-						DisplayName = "F 7",
-						Location = new Point(450, 90)
+						DisplayName = "F 7"
 					},
-					new ButtonSchema
+					new ButtonSchema(16, 42)
 					{
 						Name = "Key Control",
-						DisplayName = "CTRL",
-						Location = new Point(16, 42)
+						DisplayName = "CTRL"
 					},
-					new ButtonSchema
+					new ButtonSchema(62, 42)
 					{
 						Name = "Key Q",
-						DisplayName = "Q",
-						Location = new Point(62, 42)
+						DisplayName = "Q"
 					},
-					new ButtonSchema
+					new ButtonSchema(88, 42)
 					{
 						Name = "Key W",
-						DisplayName = "W",
-						Location = new Point(88, 42)
+						DisplayName = "W"
 					},
-					new ButtonSchema
+					new ButtonSchema(116, 42)
 					{
 						Name = "Key E",
-						DisplayName = "E",
-						Location = new Point(116, 42)
+						DisplayName = "E"
 					},
-					new ButtonSchema
+					new ButtonSchema(140, 42)
 					{
 						Name = "Key R",
-						DisplayName = "R",
-						Location = new Point(140, 42)
+						DisplayName = "R"
 					},
-					new ButtonSchema
+					new ButtonSchema(166, 42)
 					{
 						Name = "Key T",
-						DisplayName = "T",
-						Location = new Point(166, 42)
+						DisplayName = "T"
 					},
-					new ButtonSchema
+					new ButtonSchema(190, 42)
 					{
 						Name = "Key Y",
-						DisplayName = "Y",
-						Location = new Point(190, 42)
+						DisplayName = "Y"
 					},
-					new ButtonSchema
+					new ButtonSchema(214, 42)
 					{
 						Name = "Key U",
-						DisplayName = "U",
-						Location = new Point(214, 42)
+						DisplayName = "U"
 					},
-					new ButtonSchema
+					new ButtonSchema(240, 42)
 					{
 						Name = "Key I",
-						DisplayName = "I",
-						Location = new Point(240, 42)
+						DisplayName = "I"
 					},
-					new ButtonSchema
+					new ButtonSchema(260, 42)
 					{
 						Name = "Key O",
-						DisplayName = "O",
-						Location = new Point(260, 42)
+						DisplayName = "O"
 					},
-					new ButtonSchema
+					new ButtonSchema(286, 42)
 					{
 						Name = "Key P",
-						DisplayName = "P",
-						Location = new Point(286, 42)
+						DisplayName = "P"
 					},
-					new ButtonSchema
+					new ButtonSchema(310, 42)
 					{
 						Name = "Key At",
-						DisplayName = "@",
-						Location = new Point(310, 42)
+						DisplayName = "@"
 					},
-					new ButtonSchema
+					new ButtonSchema(338, 42)
 					{
 						Name = "Key Asterisk",
-						DisplayName = "*",
-						Location = new Point(338, 42)
+						DisplayName = "*"
 					},
-					new ButtonSchema
+					new ButtonSchema(360, 42)
 					{
 						Name = "Key Up Arrow",
-						DisplayName = "↑",
-						Location = new Point(360, 42)
+						DisplayName = "↑"
 					},
-					new ButtonSchema
+					new ButtonSchema(390, 42)
 					{
 						Name = "Key Restore",
-						DisplayName = "RST",
-						Location = new Point(390, 42)
+						DisplayName = "RST"
 					},
-					new ButtonSchema
+					new ButtonSchema(12, 66)
 					{
 						Name = "Key Run/Stop",
-						DisplayName = "R/S",
-						Location = new Point(12, 66)
+						DisplayName = "R/S"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 66)
 					{
 						Name = "Key Lck",
-						DisplayName = "Lck",
-						Location = new Point(50, 66)
+						DisplayName = "Lck"
 					},
-					new ButtonSchema
+					new ButtonSchema(86, 66)
 					{
 						Name = "Key A",
-						DisplayName = "A",
-						Location = new Point(86, 66)
+						DisplayName = "A"
 					},
-					new ButtonSchema
+					new ButtonSchema(110, 66)
 					{
 						Name = "Key S",
-						DisplayName = "S",
-						Location = new Point(110, 66)
+						DisplayName = "S"
 					},
-					new ButtonSchema
+					new ButtonSchema(134, 66)
 					{
 						Name = "Key D",
-						DisplayName = "D",
-						Location = new Point(134, 66)
+						DisplayName = "D"
 					},
-					new ButtonSchema
+					new ButtonSchema(160, 66)
 					{
 						Name = "Key F",
-						DisplayName = "F",
-						Location = new Point(160, 66)
+						DisplayName = "F"
 					},
-					new ButtonSchema
+					new ButtonSchema(184, 66)
 					{
 						Name = "Key G",
-						DisplayName = "G",
-						Location = new Point(184, 66)
+						DisplayName = "G"
 					},
-					new ButtonSchema
+					new ButtonSchema(210, 66)
 					{
 						Name = "Key H",
-						DisplayName = "H",
-						Location = new Point(210, 66)
+						DisplayName = "H"
 					},
-					new ButtonSchema
+					new ButtonSchema(236, 66)
 					{
 						Name = "Key J",
-						DisplayName = "J",
-						Location = new Point(236, 66)
+						DisplayName = "J"
 					},
-					new ButtonSchema
+					new ButtonSchema(258, 66)
 					{
 						Name = "Key K",
-						DisplayName = "K",
-						Location = new Point(258, 66)
+						DisplayName = "K"
 					},
-					new ButtonSchema
+					new ButtonSchema(282, 66)
 					{
 						Name = "Key L",
-						DisplayName = "L",
-						Location = new Point(282, 66)
+						DisplayName = "L"
 					},
-					new ButtonSchema
+					new ButtonSchema(306, 66)
 					{
 						Name = "Key Colon",
-						DisplayName = ":",
-						Location = new Point(306, 66)
+						DisplayName = ":"
 					},
-					new ButtonSchema
+					new ButtonSchema(326, 66)
 					{
 						Name = "Key Semicolon",
-						DisplayName = ";",
-						Location = new Point(326, 66)
+						DisplayName = ";"
 					},
-					new ButtonSchema
+					new ButtonSchema(346, 66)
 					{
 						Name = "Key Equal",
-						DisplayName = "=",
-						Location = new Point(346, 66)
+						DisplayName = "="
 					},
-					new ButtonSchema
+					new ButtonSchema(370, 66)
 					{
 						Name = "Key Return",
-						DisplayName = "Return",
-						Location = new Point(370, 66)
+						DisplayName = "Return"
 					},
-					new ButtonSchema
+					new ButtonSchema(8, 90)
 					{
 						Name = "Key Commodore",
-						DisplayName = "C64",
-						Location = new Point(8, 90)
+						DisplayName = "C64"
 					},
-					new ButtonSchema
+					new ButtonSchema(44, 90)
 					{
 						Name = "Key Left Shift",
-						DisplayName = "Shift",
-						Location = new Point(44, 90)
+						DisplayName = "Shift"
 					},
-					new ButtonSchema
+					new ButtonSchema(82, 90)
 					{
 						Name = "Key Z",
-						DisplayName = "Z",
-						Location = new Point(82, 90)
+						DisplayName = "Z"
 					},
-					new ButtonSchema
+					new ButtonSchema(106, 90)
 					{
 						Name = "Key X",
-						DisplayName = "X",
-						Location = new Point(106, 90)
+						DisplayName = "X"
 					},
-					new ButtonSchema
+					new ButtonSchema(130, 90)
 					{
 						Name = "Key C",
-						DisplayName = "C",
-						Location = new Point(130, 90)
+						DisplayName = "C"
 					},
-					new ButtonSchema
+					new ButtonSchema(154, 90)
 					{
 						Name = "Key V",
-						DisplayName = "V",
-						Location = new Point(154, 90)
+						DisplayName = "V"
 					},
-					new ButtonSchema
+					new ButtonSchema(178, 90)
 					{
 						Name = "Key B",
-						DisplayName = "B",
-						Location = new Point(178, 90)
+						DisplayName = "B"
 					},
-					new ButtonSchema
+					new ButtonSchema(202, 90)
 					{
 						Name = "Key N",
-						DisplayName = "N",
-						Location = new Point(202, 90)
+						DisplayName = "N"
 					},
-					new ButtonSchema
+					new ButtonSchema(226, 90)
 					{
 						Name = "Key M",
-						DisplayName = "M",
-						Location = new Point(226, 90)
+						DisplayName = "M"
 					},
-					new ButtonSchema
+					new ButtonSchema(252, 90)
 					{
 						Name = "Key Comma",
-						DisplayName = ",",
-						Location = new Point(252, 90)
+						DisplayName = ","
 					},
-					new ButtonSchema
+					new ButtonSchema(272, 90)
 					{
 						Name = "Key Period",
-						DisplayName = ".",
-						Location = new Point(272, 90)
+						DisplayName = "."
 					},
-					new ButtonSchema
+					new ButtonSchema(292, 90)
 					{
 						Name = "Key Slash",
-						DisplayName = "/",
-						Location = new Point(292, 90)
+						DisplayName = "/"
 					},
-					new ButtonSchema
+					new ButtonSchema(314, 90)
 					{
 						Name = "Key Right Shift",
-						DisplayName = "Shift",
-						Location = new Point(314, 90)
+						DisplayName = "Shift"
 					},
-					new ButtonSchema
+					new ButtonSchema(352, 90)
 					{
 						Name = "Key Cursor Up/Down",
-						DisplayName = "Csr U",
-						Location = new Point(352, 90)
+						DisplayName = "Csr U"
 					},
-					new ButtonSchema
+					new ButtonSchema(396, 90)
 					{
 						Name = "Key Cursor Left/Right",
-						DisplayName = "Csr L",
-						Location = new Point(396, 90)
+						DisplayName = "Csr L"
 					},
-					new ButtonSchema
+					new ButtonSchema(120, 114)
 					{
 						Name = "Key Space",
-						DisplayName = "                          Space                          ",
-						Location = new Point(120, 114)
+						DisplayName = "                          Space                          "
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
index 7a5c9fdd8c..411ee3b129 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
@@ -49,93 +49,77 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 50, 32),
 					ButtonSchema.Left($"P{controller} Left", 29, 22),
 					ButtonSchema.Right($"P{controller} Right", 71, 22),
-					new ButtonSchema
+					new ButtonSchema(3, 42)
 					{
 						Name = $"P{controller} L",
-						DisplayName = "L",
-						Location = new Point(3, 42)
+						DisplayName = "L"
 					},
-					new ButtonSchema
+					new ButtonSchema(100, 42)
 					{
 						Name = $"P{controller} R",
-						DisplayName = "R",
-						Location = new Point(100, 42)
+						DisplayName = "R"
 					},
-
-					new ButtonSchema
+					new ButtonSchema(27, 85)
 					{
 						Name = $"P{controller} Key 1",
-						DisplayName = "1",
-						Location = new Point(27, 85)
+						DisplayName = "1"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 85)
 					{
 						Name = $"P{controller} Key 2",
-						DisplayName = "2",
-						Location = new Point(50, 85)
+						DisplayName = "2"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 85)
 					{
 						Name = $"P{controller} Key 3",
-						DisplayName = "3",
-						Location = new Point(73, 85)
+						DisplayName = "3"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(27, 108)
 					{
 						Name = $"P{controller} Key 4",
-						DisplayName = "4",
-						Location = new Point(27, 108)
+						DisplayName = "4"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 108)
 					{
 						Name = $"P{controller} Key 5",
-						DisplayName = "5",
-						Location = new Point(50, 108)
+						DisplayName = "5"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 108)
 					{
 						Name = $"P{controller} Key 6",
-						DisplayName = "6",
-						Location = new Point(73, 108)
+						DisplayName = "6"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(27, 131)
 					{
 						Name = $"P{controller} Key 7",
-						DisplayName = "7",
-						Location = new Point(27, 131)
+						DisplayName = "7"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 131)
 					{
 						Name = $"P{controller} Key 8",
-						DisplayName = "8",
-						Location = new Point(50, 131)
+						DisplayName = "8"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 131)
 					{
 						Name = $"P{controller} Key 9",
-						DisplayName = "9",
-						Location = new Point(73, 131)
+						DisplayName = "9"
 					},
-
-					new ButtonSchema
+					new ButtonSchema(27, 154)
 					{
 						Name = $"P{controller} Star",
-						DisplayName = "*",
-						Location = new Point(27, 154)
+						DisplayName = "*"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 154)
 					{
 						Name = $"P{controller} Key 0",
-						DisplayName = "0",
-						Location = new Point(50, 154)
+						DisplayName = "0"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 154)
 					{
 						Name = $"P{controller} Pound",
-						DisplayName = "#",
-						Location = new Point(73, 154)
+						DisplayName = "#"
 					}
 				}
 			};
@@ -150,19 +134,17 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(275, 260),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(6, 14)
 					{
 						Name = $"P{controller} Disc X",
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
-						Location = new Point(6, 14),
 						Type = PadInputType.AnalogStick
 					},
-					new ButtonSchema
+					new ButtonSchema(6, 224)
 					{
 						Name = $"P{controller} Pedal",
-						DisplayName = "Pedal",
-						Location = new Point(6, 224)
+						DisplayName = "Pedal"
 					}
 				}
 			};
@@ -180,116 +162,99 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 50, 32),
 					ButtonSchema.Left($"P{controller} Left", 29, 22),
 					ButtonSchema.Right($"P{controller} Right", 71, 22),
-					new ButtonSchema
+					new ButtonSchema(27, 85)
 					{
 						Name = $"P{controller} Key 1",
-						DisplayName = "1",
-						Location = new Point(27, 85)
+						DisplayName = "1"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 85)
 					{
 						Name = $"P{controller} Key 2",
-						DisplayName = "2",
-						Location = new Point(50, 85)
+						DisplayName = "2"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 85)
 					{
 						Name = $"P{controller} Key 3",
-						DisplayName = "3",
-						Location = new Point(73, 85)
+						DisplayName = "3"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(27, 108)
 					{
 						Name = $"P{controller} Key 4",
-						DisplayName = "4",
-						Location = new Point(27, 108)
+						DisplayName = "4"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 108)
 					{
 						Name = $"P{controller} Key 5",
-						DisplayName = "5",
-						Location = new Point(50, 108)
+						DisplayName = "5"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 108)
 					{
 						Name = $"P{controller} Key 6",
-						DisplayName = "6",
-						Location = new Point(73, 108)
+						DisplayName = "6"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(27, 131)
 					{
 						Name = $"P{controller} Key 7",
-						DisplayName = "7",
-						Location = new Point(27, 131)
+						DisplayName = "7"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 131)
 					{
 						Name = $"P{controller} Key 8",
-						DisplayName = "8",
-						Location = new Point(50, 131)
+						DisplayName = "8"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 131)
 					{
 						Name = $"P{controller} Key 9",
-						DisplayName = "9",
-						Location = new Point(73, 131)
+						DisplayName = "9"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(27, 154)
 					{
 						Name = $"P{controller} Star",
-						DisplayName = "*",
-						Location = new Point(27, 154)
+						DisplayName = "*"
 					},
-					new ButtonSchema
+					new ButtonSchema(50, 154)
 					{
 						Name = $"P{controller} Key 0",
-						DisplayName = "0",
-						Location = new Point(50, 154)
+						DisplayName = "0"
 					},
-					new ButtonSchema
+					new ButtonSchema(73, 154)
 					{
 						Name = $"P{controller} Pound",
-						DisplayName = "#",
-						Location = new Point(73, 154)
+						DisplayName = "#"
 					},
 
-					new ButtonSchema
+					new ButtonSchema(6, 200)
 					{
 						Name = $"P{controller} Disc X",
 						DisplayName = "Disc",
-						Location = new Point(6, 200),
 						TargetSize = new Size(180, 55),
 						MinValue = -360,
 						MaxValue = 360,
 						Type = PadInputType.FloatSingle
 					},
 
-					new ButtonSchema
+					new ButtonSchema(126, 15)
 					{
 						Name = $"P{controller} Yellow",
-						DisplayName = "Yellow",
-						Location = new Point(126, 15)
+						DisplayName = "Yellow"
 					},
-					new ButtonSchema
+					new ButtonSchema(126, 40)
 					{
 						Name = $"P{controller} Red",
-						DisplayName = "Red",
-						Location = new Point(126, 40)
+						DisplayName = "Red"
 					},
-					new ButtonSchema
+					new ButtonSchema(126, 65)
 					{
 						Name = $"P{controller} Purple",
-						DisplayName = "Purple",
-						Location = new Point(126, 65)
+						DisplayName = "Purple"
 					},
-					new ButtonSchema
+					new ButtonSchema(126, 90)
 					{
 						Name = $"P{controller} Blue",
-						DisplayName = "Blue",
-						Location = new Point(126, 90)
+						DisplayName = "Blue"
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
index c6152ebaa6..57d3725da0 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
@@ -27,29 +27,25 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down($"P{controller} Down", 14, 56),
 					ButtonSchema.Left($"P{controller} Left", 2, 34),
 					ButtonSchema.Right($"P{controller} Right", 24, 34),
-					new ButtonSchema
+					new ButtonSchema(122, 34)
 					{
 						Name = $"P{controller} B",
-						DisplayName = "B",
-						Location = new Point(122, 34)
+						DisplayName = "B"
 					},
-					new ButtonSchema
+					new ButtonSchema(146, 34)
 					{
 						Name = $"P{controller} A",
-						DisplayName = "A",
-						Location = new Point(146, 34)
+						DisplayName = "A"
 					},
-					new ButtonSchema
+					new ButtonSchema(52, 34)
 					{
 						Name = $"P{controller} Select",
-						DisplayName = "s",
-						Location = new Point(52, 34)
+						DisplayName = "s"
 					},
-					new ButtonSchema
+					new ButtonSchema(74, 34)
 					{
 						Name = $"P{controller} Start",
-						DisplayName = "S",
-						Location = new Point(74, 34)
+						DisplayName = "S"
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
index a4f33ae3d6..0a769754cb 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
@@ -31,37 +31,33 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(256, 326),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(10, 15)
 					{
 						Name = "Tilt X",
-						Location = new Point(10, 15),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new ButtonSchema
+					new ButtonSchema(10, 94)
 					{
 						Name = "Tilt Y",
-						Location = new Point(10, 94),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new ButtonSchema
+					new ButtonSchema(10, 173)
 					{
 						Name = "Tilt Z",
-						Location = new Point(10, 173),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new ButtonSchema
+					new ButtonSchema(10, 252)
 					{
 						Name = "Light Sensor",
-						Location = new Point(10, 252),
 						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MaxValue = byte.MaxValue
@@ -82,38 +78,12 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down("Down", 29, 61),
 					ButtonSchema.Left("Left", 17, 39),
 					ButtonSchema.Right("Right", 39, 39),
-					new ButtonSchema
-					{
-						Name = "B",
-						Location = new Point(130, 39)
-					},
-					new ButtonSchema
-					{
-						Name = "A",
-						Location = new Point(154, 39)
-					},
-					new ButtonSchema
-					{
-						Name = "Select",
-						DisplayName = "s",
-						Location = new Point(64, 39)
-					},
-					new ButtonSchema
-					{
-						Name = "Start",
-						DisplayName = "S",
-						Location = new Point(86, 39)
-					},
-					new ButtonSchema
-					{
-						Name = "L",
-						Location = new Point(2, 12)
-					},
-					new ButtonSchema
-					{
-						Name = "R",
-						Location = new Point(166, 12)
-					}
+					new ButtonSchema(130, 39) { Name = "B" },
+					new ButtonSchema(154, 39) { Name = "A" },
+					new ButtonSchema(64, 39) { Name = "Select", DisplayName = "s" },
+					new ButtonSchema(86, 39) { Name = "Start",  DisplayName = "S" },
+					new ButtonSchema(2, 12) { Name = "L" },
+					new ButtonSchema(166, 12) { Name = "R" }
 				}
 			};
 		}
@@ -127,11 +97,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = "Power",
-						Location = new Point(10, 15)
-					}
+					new ButtonSchema(10, 15) { Name = "Power" }
 				}
 			};
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
index 6740692d84..1d4f90a2e7 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
@@ -42,28 +42,10 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down("Down", 14, 56),
 					ButtonSchema.Left("Left", 2, 34),
 					ButtonSchema.Right("Right", 24, 34),
-					new ButtonSchema
-					{
-						Name = "B",
-						Location = new Point(122, 34)
-					},
-					new ButtonSchema
-					{
-						Name = "A",
-						Location = new Point(146, 34)
-					},
-					new ButtonSchema
-					{
-						Name = "Select",
-						DisplayName = "s",
-						Location = new Point(52, 34)
-					},
-					new ButtonSchema
-					{
-						Name = "Start",
-						DisplayName = "S",
-						Location = new Point(74, 34)
-					}
+					new ButtonSchema(122, 34) { Name = "B" },
+					new ButtonSchema(146, 34) { Name = "A" },
+					new ButtonSchema(52, 34)  { Name = "Select",  DisplayName = "s" },
+					new ButtonSchema(74, 34) { Name = "Start",  DisplayName = "S"  }
 				}
 			};
 		}
@@ -77,11 +59,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = "Power",
-						Location = new Point(10, 15)
-					}
+					new ButtonSchema(10, 15) { Name = "Power" }
 				}
 			};
 		}
@@ -99,29 +77,25 @@ namespace BizHawk.Client.EmuHawk
 					ButtonSchema.Down("P1 Down", 14, 56), 
 					ButtonSchema.Left("P1 Left", 2, 34), 
 					ButtonSchema.Right("P1 Right", 24, 34), 
-					new ButtonSchema
+					new ButtonSchema(122, 34)
 					{
 						Name = "P1 B",
-						DisplayName = "B",
-						Location = new Point(122, 34)
+						DisplayName = "B"
 					},
-					new ButtonSchema
+					new ButtonSchema(146, 34)
 					{
 						Name = "P1 A",
-						DisplayName = "A",
-						Location = new Point(146, 34)
+						DisplayName = "A"
 					},
-					new ButtonSchema
+					new ButtonSchema(52, 34)
 					{
 						Name = "P1 Select",
-						DisplayName = "s",
-						Location = new Point(52, 34)
+						DisplayName = "s"
 					},
-					new ButtonSchema
+					new ButtonSchema(74, 34)
 					{
 						Name = "P1 Start",
-						DisplayName = "S",
-						Location = new Point(74, 34)
+						DisplayName = "S"
 					}
 				}
 			};
@@ -136,11 +110,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new ButtonSchema
-					{
-						Name = "P1 Power",
-						Location = new Point(10, 15)
-					}
+					new ButtonSchema(10, 15) { Name = "P1 Power" }
 				}
 			};
 		}
@@ -155,10 +125,9 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new ButtonSchema
+					new ButtonSchema(14, 17)
 					{
 						Name = "P1 Tilt X",
-						Location = new Point(14, 17),
 						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]