diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 7194c06534..4682ee99fd 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -121,8 +121,8 @@ namespace BizHawk.MultiClient
 					{"Key F1", "1"}, {"Key F3", "3"}, {"Key F5", "5"}, {"Key F7", "7"},
 					{"Key Left Arrow", "l"}, {"Key 1", "1"}, {"Key 2", "2"}, {"Key 3", "3"}, {"Key 4", "4"}, {"Key 5", "5"}, {"Key 6", "6"}, {"Key 7", "7"}, {"Key 8", "8"}, {"Key 9", "9"}, {"Key 0", "0"}, {"Key Plus", "+"}, {"Key Minus", "-"}, {"Key Pound", "l"}, {"Key Clear/Home", "c"}, {"Key Insert/Delete", "i"}, 
 					{"Key Control", "c"}, {"Key Q", "Q"}, {"Key W", "W"}, {"Key E", "E"}, {"Key R", "R"}, {"Key T", "T"}, {"Key Y", "Y"}, {"Key U", "U"}, {"Key I", "I"}, {"Key O", "O"}, {"Key P", "P"}, {"Key At", "@"}, {"Key Asterisk", "*"}, {"Key Up Arrow", "u"}, {"Key RST", "r"},
-					{"Key Run/Stop", "s"}, {"Key Lck", "k"}, {"Key A", "A"}, {"Key S", "S"}, {"Key D", "D"}, {"Key F", "F"}, {"Key G", "G"}, {"Key H", "H"}, {"Key J", "J"}, {"Key K", "K"}, {"Key L", "L"}, {"Key Colon", ":"}, {"Key Semicolon", ":"}, {"Key Equal", "="}, {"Key Return", "e"}, 
-					{"Key Commodore", "o"}, {"Key Left Shift", "s"}, {"Key Z", "Z"}, {"Key X", "X"}, {"Key C", "C"}, {"Key V", "V"}, {"Key B", "B"}, {"Key N", "N"}, {"Key M", "M"}, {"Key Comma", ","}, {"Key Period", "."}, {"Key Slash", "/"}, {"Key Right Shift", "s"}, {"Key Cursor Up/Down", "u"}, {"Key Cursor Left/Right", "l"}, 
+					{"Key Run/Stop", "s"}, {"Key Lck", "k"}, {"Key A", "A"}, {"Key S", "S"}, {"Key D", "D"}, {"Key F", "F"}, {"Key G", "G"}, {"Key H", "H"}, {"Key J", "J"}, {"Key K", "K"}, {"Key L", "L"}, {"Key Colon", ":"}, {"Key Semicolon", ";"}, {"Key Equal", "="}, {"Key Return", "e"}, 
+					{"Key Commodore", "o"}, {"Key Left Shift", "s"}, {"Key Z", "Z"}, {"Key X", "X"}, {"Key C", "C"}, {"Key V", "V"}, {"Key B", "B"}, {"Key N", "N"}, {"Key M", "M"}, {"Key Comma", ","}, {"Key Period", ">"}, {"Key Slash", "/"}, {"Key Right Shift", "s"}, {"Key Cursor Up/Down", "u"}, {"Key Cursor Left/Right", "l"}, 
 					{"Key Space", "_"}
 				}
 			},
diff --git a/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs b/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs
index 7f1cfa0c3b..dad433eb43 100644
--- a/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs
+++ b/BizHawk.MultiClient/tools/VirtualPadC64Keyboard.cs
@@ -43,7 +43,306 @@ namespace BizHawk.MultiClient
 			{
 				Global.StickyXORAdapter.SetSticky("Key F7", KF1.Checked);
 			}
-			
+			else if (sender == KLeftArrow)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Left Arrow", KLeftArrow.Checked);
+			}
+			else if (sender == K1)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 1", K1.Checked);
+			}
+			else if (sender == K2)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 2", K2.Checked);
+			}
+			else if (sender == K3)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 3", K3.Checked);
+			}
+			else if (sender == K4)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 4", K4.Checked);
+			}
+			else if (sender == K5)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 5", K5.Checked);
+			}
+			else if (sender == K6)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 6", K6.Checked);
+			}
+			else if (sender == K7)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 7", K7.Checked);
+			}
+			else if (sender == K8)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 8", K8.Checked);
+			}
+			else if (sender == K9)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 9", K9.Checked);
+			}
+			else if (sender == K0)
+			{
+				Global.StickyXORAdapter.SetSticky("Key 0", K0.Checked);
+			}
+			else if (sender == KPlus)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Plus", KPlus.Checked);
+			}
+			else if (sender == KMinus)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Minus", KMinus.Checked);
+			}
+			else if (sender == KPound)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Pound", KPound.Checked);
+			}
+			else if (sender == KClear)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Clear/Home", KClear.Checked);
+			}
+			else if (sender == KInsert)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Insert/Delete", KInsert.Checked);
+			}
+			else if (sender == KCtrl)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Control", KCtrl.Checked);
+			}
+			else if (sender == KQ)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Q", KQ.Checked);
+			}
+			else if (sender == KW)
+			{
+				Global.StickyXORAdapter.SetSticky("Key W", KW.Checked);
+			}
+			else if (sender == KE)
+			{
+				Global.StickyXORAdapter.SetSticky("Key E", KE.Checked);
+			}
+			else if (sender == KR)
+			{
+				Global.StickyXORAdapter.SetSticky("Key R", KR.Checked);
+			}
+			else if (sender == KT)
+			{
+				Global.StickyXORAdapter.SetSticky("Key T", KT.Checked);
+			}
+			else if (sender == KY)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Y", KY.Checked);
+			}
+			else if (sender == KU)
+			{
+				Global.StickyXORAdapter.SetSticky("Key U", KU.Checked);
+			}
+			else if (sender == KI)
+			{
+				Global.StickyXORAdapter.SetSticky("Key I", KI.Checked);
+			}
+			else if (sender == KO)
+			{
+				Global.StickyXORAdapter.SetSticky("Key O", KO.Checked);
+			}
+			else if (sender == KP)
+			{
+				Global.StickyXORAdapter.SetSticky("Key P", KP.Checked);
+			}
+			else if (sender == KAt)
+			{
+				Global.StickyXORAdapter.SetSticky("Key At", KAt.Checked);
+			}
+			else if (sender == KAsterisk)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Asterisk", KAsterisk.Checked);
+			}
+			else if (sender == KUpArrow)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Up Arrow", KUpArrow.Checked);
+			}
+			else if (sender == KRST)
+			{
+				Global.StickyXORAdapter.SetSticky("Key RST", KRST.Checked);
+			}
+			else if (sender == KRun)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Run/Stop", KRun.Checked);
+			}
+			else if (sender == KLck)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Lck", KLck.Checked);
+			}
+			else if (sender == KA)
+			{
+				Global.StickyXORAdapter.SetSticky("Key A", KA.Checked);
+			}
+			else if (sender == KS)
+			{
+				Global.StickyXORAdapter.SetSticky("Key S", KS.Checked);
+			}
+			else if (sender == KD)
+			{
+				Global.StickyXORAdapter.SetSticky("Key D", KD.Checked);
+			}
+			else if (sender == KF)
+			{
+				Global.StickyXORAdapter.SetSticky("Key F", KF.Checked);
+			}
+			else if (sender == KG)
+			{
+				Global.StickyXORAdapter.SetSticky("Key G", KG.Checked);
+			}
+			else if (sender == KH)
+			{
+				Global.StickyXORAdapter.SetSticky("Key H", KH.Checked);
+			}
+			else if (sender == KJ)
+			{
+				Global.StickyXORAdapter.SetSticky("Key J", KJ.Checked);
+			}
+			else if (sender == KK)
+			{
+				Global.StickyXORAdapter.SetSticky("Key K", KK.Checked);
+			}
+			else if (sender == KL)
+			{
+				Global.StickyXORAdapter.SetSticky("Key L", KL.Checked);
+			}
+			else if (sender == KColon)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Colon", KColon.Checked);
+			}
+			else if (sender == KSemicolon)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked);
+			}
+			else if (sender == KEquals)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked);
+			}
+			else if (sender == KReturn)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked);
+			}
+			else if (sender == KCommodore)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked);
+			}
+			else if (sender == KLeftShift)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked);
+			}
+			else if (sender == KZ)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Z", KZ.Checked);
+			}
+			else if (sender == KX)
+			{
+				Global.StickyXORAdapter.SetSticky("Key X", KX.Checked);
+			}
+			else if (sender == KC)
+			{
+				Global.StickyXORAdapter.SetSticky("Key C", KC.Checked);
+			}
+			else if (sender == KV)
+			{
+				Global.StickyXORAdapter.SetSticky("Key V", KV.Checked);
+			}
+			else if (sender == KB)
+			{
+				Global.StickyXORAdapter.SetSticky("Key B", KB.Checked);
+			}
+			else if (sender == KN)
+			{
+				Global.StickyXORAdapter.SetSticky("Key N", KN.Checked);
+			}
+			else if (sender == KM)
+			{
+				Global.StickyXORAdapter.SetSticky("Key M", KM.Checked);
+			}
+			else if (sender == KComma)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked);
+			}
+			else if (sender == KSemicolon)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked);
+			}
+			else if (sender == KEquals)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked);
+			}
+			else if (sender == KReturn)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked);
+			}
+			else if (sender == KCommodore)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked);
+			}
+			else if (sender == KLeftShift)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked);
+			}
+			else if (sender == KZ)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Z", KZ.Checked);
+			}
+			else if (sender == KX)
+			{
+				Global.StickyXORAdapter.SetSticky("Key X", KX.Checked);
+			}
+			else if (sender == KC)
+			{
+				Global.StickyXORAdapter.SetSticky("Key C", KC.Checked);
+			}
+			else if (sender == KV)
+			{
+				Global.StickyXORAdapter.SetSticky("Key V", KV.Checked);
+			}
+			else if (sender == KB)
+			{
+				Global.StickyXORAdapter.SetSticky("Key B", KB.Checked);
+			}
+			else if (sender == KN)
+			{
+				Global.StickyXORAdapter.SetSticky("Key N", KN.Checked);
+			}
+			else if (sender == KM)
+			{
+				Global.StickyXORAdapter.SetSticky("Key M", KM.Checked);
+			}
+			else if (sender == KComma)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked);
+			}
+			else if (sender == KPeriod)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Period", KPeriod.Checked);
+			}
+			else if (sender == KSlash)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Slash", KSlash.Checked);
+			}
+			else if (sender == KRightShift)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Right Shift", KRightShift.Checked);
+			}
+			else if (sender == KCursorUp)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Cursor Up/Down", KCursorUp.Checked);
+			}
+			else if (sender == KCursorLeft)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Cursor Left/Right", KCursorLeft.Checked);
+			}
+			else if (sender == KSpace)
+			{
+				Global.StickyXORAdapter.SetSticky("Key Space", KSpace.Checked);
+			}
 		}
 
 		public void Clear()
@@ -194,9 +493,71 @@ namespace BizHawk.MultiClient
 			StringBuilder input = new StringBuilder("");
 
 			input.Append(KF1.Checked ? "1" : ".");
-			input.Append(KF1.Checked ? "3" : ".");
-			input.Append(KF1.Checked ? "5" : ".");
-			input.Append(KF1.Checked ? "7" : ".");
+			input.Append(KF3.Checked ? "3" : ".");
+			input.Append(KF5.Checked ? "5" : ".");
+			input.Append(KF7.Checked ? "7" : ".");
+			input.Append(KLeftArrow.Checked ? "l" : ".");
+			input.Append(K1.Checked ? "1" : ".");
+			input.Append(K2.Checked ? "2" : ".");
+			input.Append(K3.Checked ? "3" : ".");
+			input.Append(K4.Checked ? "4" : ".");
+			input.Append(K5.Checked ? "5" : ".");
+			input.Append(K6.Checked ? "6" : ".");
+			input.Append(K7.Checked ? "7" : ".");
+			input.Append(K8.Checked ? "8" : ".");
+			input.Append(K9.Checked ? "9" : ".");
+			input.Append(K0.Checked ? "0" : ".");
+			input.Append(KPlus.Checked ? "+" : ".");
+			input.Append(KMinus.Checked ? "-" : ".");
+			input.Append(KPound.Checked ? "l" : ".");
+			input.Append(KClear.Checked ? "c" : ".");
+			input.Append(KInsert.Checked ? "i" : ".");
+			input.Append(KCtrl.Checked ? "c" : ".");
+			input.Append(KQ.Checked ? "Q" : ".");
+			input.Append(KW.Checked ? "W" : ".");
+			input.Append(KE.Checked ? "E" : ".");
+			input.Append(KR.Checked ? "R" : ".");
+			input.Append(KT.Checked ? "T" : ".");
+			input.Append(KY.Checked ? "Y" : ".");
+			input.Append(KU.Checked ? "U" : ".");
+			input.Append(KI.Checked ? "I" : ".");
+			input.Append(KO.Checked ? "O" : ".");
+			input.Append(KP.Checked ? "P" : ".");
+			input.Append(KAt.Checked ? "@" : ".");
+			input.Append(KAsterisk.Checked ? "*" : ".");
+			input.Append(KUpArrow.Checked ? "u" : ".");
+			input.Append(KRST.Checked ? "r" : ".");
+			input.Append(KRun.Checked ? "s" : ".");
+			input.Append(KLck.Checked ? "k" : ".");
+			input.Append(KA.Checked ? "A" : ".");
+			input.Append(KS.Checked ? "S" : ".");
+			input.Append(KD.Checked ? "D" : ".");
+			input.Append(KF.Checked ? "F" : ".");
+			input.Append(KG.Checked ? "G" : ".");
+			input.Append(KH.Checked ? "H" : ".");
+			input.Append(KJ.Checked ? "J" : ".");
+			input.Append(KK.Checked ? "K" : ".");
+			input.Append(KL.Checked ? "L" : ".");
+			input.Append(KColon.Checked ? ":" : ".");
+			input.Append(KSemicolon.Checked ? ";" : ".");
+			input.Append(KEquals.Checked ? "=" : ".");
+			input.Append(KReturn.Checked ? "e" : ".");
+			input.Append(KCommodore.Checked ? "o" : ".");
+			input.Append(KLeftShift.Checked ? "s" : ".");
+			input.Append(KZ.Checked ? "Z" : ".");
+			input.Append(KX.Checked ? "X" : ".");
+			input.Append(KC.Checked ? "C" : ".");
+			input.Append(KV.Checked ? "V" : ".");
+			input.Append(KB.Checked ? "B" : ".");
+			input.Append(KN.Checked ? "N" : ".");
+			input.Append(KM.Checked ? "M" : ".");
+			input.Append(KComma.Checked ? "," : ".");
+			input.Append(KPeriod.Checked ? ">" : ".");
+			input.Append(KSlash.Checked ? "/" : ".");
+			input.Append(KRightShift.Checked ? "s" : ".");
+			input.Append(KCursorUp.Checked ? "u" : ".");
+			input.Append(KCursorLeft.Checked ? "l" : ".");
+			input.Append(KSpace.Checked ? "_" : ".");
 
 			input.Append("|");
 			return input.ToString();
@@ -213,6 +574,49 @@ namespace BizHawk.MultiClient
 			if (buttons[1] == '.') KF3.Checked = false; else KF3.Checked = true;
 			if (buttons[2] == '.') KF5.Checked = false; else KF5.Checked = true;
 			if (buttons[3] == '.') KF7.Checked = false; else KF7.Checked = true;
+			if (buttons[4] == '.') KLeftArrow.Checked = false; else KLeftArrow.Checked = true;
+			if (buttons[5] == '.') K1.Checked = false; else K1.Checked = true;
+			if (buttons[5] == '.') K2.Checked = false; else K2.Checked = true;
+			if (buttons[6] == '.') K3.Checked = false; else K3.Checked = true;
+			if (buttons[7] == '.') K4.Checked = false; else K4.Checked = true;
+			if (buttons[8] == '.') K5.Checked = false; else K5.Checked = true;
+			if (buttons[9] == '.') K6.Checked = false; else K6.Checked = true;
+			if (buttons[10] == '.') K7.Checked = false; else K7.Checked = true;
+			if (buttons[11] == '.') K8.Checked = false; else K8.Checked = true;
+			if (buttons[12] == '.') K9.Checked = false; else K9.Checked = true;
+			if (buttons[13] == '.') K0.Checked = false; else K0.Checked = true;
+			if (buttons[14] == '.') KPlus.Checked = false; else KPlus.Checked = true;
+			if (buttons[15] == '.') KMinus.Checked = false; else KMinus.Checked = true;
+			if (buttons[16] == '.') KPound.Checked = false; else KPound.Checked = true;
+			if (buttons[17] == '.') KClear.Checked = false; else KClear.Checked = true;
+			if (buttons[18] == '.') KInsert.Checked = false; else KInsert.Checked = true;
+			if (buttons[19] == '.') KCtrl.Checked = false; else KCtrl.Checked = true;
+			if (buttons[20] == '.') KQ.Checked = false; else KQ.Checked = true;
+			if (buttons[21] == '.') KW.Checked = false; else KW.Checked = true;
+			if (buttons[22] == '.') KE.Checked = false; else KE.Checked = true;
+			if (buttons[23] == '.') KR.Checked = false; else KR.Checked = true;
+			if (buttons[24] == '.') KT.Checked = false; else KT.Checked = true;
+			if (buttons[25] == '.') KY.Checked = false; else KY.Checked = true;
+			if (buttons[26] == '.') KU.Checked = false; else KU.Checked = true;
+			if (buttons[27] == '.') KI.Checked = false; else KI.Checked = true;
+			if (buttons[28] == '.') KO.Checked = false; else KO.Checked = true;
+			if (buttons[29] == '.') KP.Checked = false; else KP.Checked = true;
+			if (buttons[30] == '.') KAt.Checked = false; else KAt.Checked = true;
+			if (buttons[31] == '.') KAsterisk.Checked = false; else KAsterisk.Checked = true;
+			if (buttons[32] == '.') KUpArrow.Checked = false; else KUpArrow.Checked = true;
+			if (buttons[33] == '.') KRST.Checked = false; else KRST.Checked = true;
+			if (buttons[34] == '.') KRun.Checked = false; else KRun.Checked = true;
+			if (buttons[35] == '.') KLck.Checked = false; else KLck.Checked = true;
+			if (buttons[36] == '.') KA.Checked = false; else KA.Checked = true;
+			if (buttons[37] == '.') KS.Checked = false; else KS.Checked = true;
+			if (buttons[38] == '.') KD.Checked = false; else KD.Checked = true;
+			if (buttons[39] == '.') KF.Checked = false; else KF.Checked = true;
+			if (buttons[40] == '.') KG.Checked = false; else KG.Checked = true;
+			if (buttons[41] == '.') KH.Checked = false; else KH.Checked = true;
+			if (buttons[42] == '.') KJ.Checked = false; else KJ.Checked = true;
+			if (buttons[43] == '.') KK.Checked = false; else KK.Checked = true;
+			if (buttons[44] == '.') KL.Checked = false; else KL.Checked = true;
+
 		}
 	}
 }