diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 50066ad504..88b13f8f9b 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -1074,11 +1074,8 @@ namespace BizHawk.MultiClient
 		public string Down = "";
 		public string Left = "";
 		public string Right = "";
-		public string L1 = "";
-		public string L2 = "";
-		public string R1 = "";
-		public string R2 = "";
-
+		public string L = "";
+		public string R = "";
 		public string _0 = "";
 		public string _1 = "";
 		public string _2 = "";
@@ -1103,10 +1100,8 @@ namespace BizHawk.MultiClient
 				Down = "DownArrow, X1 DpadDown, X1 LStickDown";
 				Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft";
 				Right = "RightArrow, X1 DpadRight, X1 LStickRight";
-				L1 = "Z, J1 B1";
-				L2 = "X, J1 B2";
-				R1 = "C, J1 B1";
-				R2 = "V, J1 B2";
+				L = "Z, J1 B1";
+				R = "X, J1 B1";
 				_0 = "NumberPad0";
 				_1 = "NumberPad1";
 				_2 = "NumberPad2";
diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 3a1c645417..7331f15536 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -112,9 +112,9 @@ namespace BizHawk.MultiClient
 			{
 				"ColecoVision Basic Controller", new Dictionary<string, string>()
 				{
-					{"Up", "U"}, {"Down", "D"}, {"Left", "L"}, {"Right", "R"}, {"L1", "l"}, {"L2", "L"}, {"R1", "r"}, {"R2", "R"}, //adelikat: These mnemonics are terrible but I can't think of anything better
-					{"Key0", "0"}, {"Key1", "1"}, {"Key2", "2"}, {"Key3", "3"}, {"Key4", "4"}, {"Key5", "5"}, {"Key6", "6"}, {"Key7", "7"}, 
-					{"Key8", "8"}, {"Key9", "9"}, {"Star", "*"}, {"Pound", "#"}
+					{"Up", "U"}, {"Down", "D"}, {"Left", "L"}, {"Right", "R"}, {"L", "L"}, {"R", "R"},
+					{"Key0", "0"}, {"Key1", "1"}, {"Key2", "2"}, {"Key3", "3"}, {"Key4", "4"}, {"Key5", "5"}, 
+					{"Key6", "6"}, {"Key7", "7"}, {"Key8", "8"}, {"Key9", "9"}, {"Star", "*"}, {"Pound", "#"}
 				}
 			}
 		};
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index c5ff7b982f..ba58704e49 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -958,10 +958,8 @@ namespace BizHawk.MultiClient
 			colecoControls.BindMulti("P1 Left", Global.Config.ColecoController[0].Left);
 			colecoControls.BindMulti("P1 Right", Global.Config.ColecoController[0].Right);
 			colecoControls.BindMulti("P1 Down", Global.Config.ColecoController[0].Down);
-			colecoControls.BindMulti("P1 L1", Global.Config.ColecoController[0].L1);
-			colecoControls.BindMulti("P1 L2", Global.Config.ColecoController[0].L2);
-			colecoControls.BindMulti("P1 R1", Global.Config.ColecoController[0].R1);
-			colecoControls.BindMulti("P1 R2", Global.Config.ColecoController[0].R2);
+			colecoControls.BindMulti("P1 L", Global.Config.ColecoController[0].L);
+			colecoControls.BindMulti("P1 R", Global.Config.ColecoController[0].R);
 			colecoControls.BindMulti("P1 Key0", Global.Config.ColecoController[0]._0);
 			colecoControls.BindMulti("P1 Key1", Global.Config.ColecoController[0]._1);
 			colecoControls.BindMulti("P1 Key2", Global.Config.ColecoController[0]._2);
@@ -979,10 +977,8 @@ namespace BizHawk.MultiClient
 			colecoControls.BindMulti("P2 Left", Global.Config.ColecoController[1].Left);
 			colecoControls.BindMulti("P2 Right", Global.Config.ColecoController[1].Right);
 			colecoControls.BindMulti("P2 Down", Global.Config.ColecoController[1].Down);
-			colecoControls.BindMulti("P2 L1", Global.Config.ColecoController[1].L1);
-			colecoControls.BindMulti("P2 L2", Global.Config.ColecoController[1].L2);
-			colecoControls.BindMulti("P2 R1", Global.Config.ColecoController[1].R1);
-			colecoControls.BindMulti("P2 R2", Global.Config.ColecoController[1].R2);
+			colecoControls.BindMulti("P2 L", Global.Config.ColecoController[1].L);
+			colecoControls.BindMulti("P2 R", Global.Config.ColecoController[1].R);
 			colecoControls.BindMulti("P2 Key0", Global.Config.ColecoController[1]._0);
 			colecoControls.BindMulti("P2 Key1", Global.Config.ColecoController[1]._1);
 			colecoControls.BindMulti("P2 Key2", Global.Config.ColecoController[1]._2);
@@ -1002,10 +998,8 @@ namespace BizHawk.MultiClient
 			acolecoControls.BindMulti("P1 Left", Global.Config.ColecoAutoController[0].Left);
 			acolecoControls.BindMulti("P1 Right", Global.Config.ColecoAutoController[0].Right);
 			acolecoControls.BindMulti("P1 Down", Global.Config.ColecoAutoController[0].Down);
-			acolecoControls.BindMulti("P1 L1", Global.Config.ColecoAutoController[0].L1);
-			acolecoControls.BindMulti("P1 L2", Global.Config.ColecoAutoController[0].L2);
-			acolecoControls.BindMulti("P1 R1", Global.Config.ColecoAutoController[0].R1);
-			acolecoControls.BindMulti("P1 R2", Global.Config.ColecoAutoController[0].R2);
+			acolecoControls.BindMulti("P1 L", Global.Config.ColecoAutoController[0].L);
+			acolecoControls.BindMulti("P1 R", Global.Config.ColecoAutoController[0].R);
 			acolecoControls.BindMulti("P1 Key0", Global.Config.ColecoAutoController[0]._0);
 			acolecoControls.BindMulti("P1 Key1", Global.Config.ColecoAutoController[0]._1);
 			acolecoControls.BindMulti("P1 Key2", Global.Config.ColecoAutoController[0]._2);
@@ -1023,10 +1017,8 @@ namespace BizHawk.MultiClient
 			acolecoControls.BindMulti("P2 Left", Global.Config.ColecoAutoController[1].Left);
 			acolecoControls.BindMulti("P2 Right", Global.Config.ColecoAutoController[1].Right);
 			acolecoControls.BindMulti("P2 Down", Global.Config.ColecoAutoController[1].Down);
-			acolecoControls.BindMulti("P2 L1", Global.Config.ColecoAutoController[1].L1);
-			acolecoControls.BindMulti("P2 L2", Global.Config.ColecoAutoController[1].L2);
-			acolecoControls.BindMulti("P2 R1", Global.Config.ColecoAutoController[1].R1);
-			acolecoControls.BindMulti("P2 R2", Global.Config.ColecoAutoController[1].R2);
+			acolecoControls.BindMulti("P2 L", Global.Config.ColecoAutoController[1].L);
+			acolecoControls.BindMulti("P2 R", Global.Config.ColecoAutoController[1].R);
 			acolecoControls.BindMulti("P2 Key0", Global.Config.ColecoAutoController[1]._0);
 			acolecoControls.BindMulti("P2 Key1", Global.Config.ColecoAutoController[1]._1);
 			acolecoControls.BindMulti("P2 Key2", Global.Config.ColecoAutoController[1]._2);
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index 8b49db0b64..1d01a6fce5 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -359,7 +359,7 @@ namespace BizHawk.MultiClient
 				case "SGX":
 					return "|.|........|........|........|........|........|";
 				case "Coleco":
-					return "|....................|....................|";
+					return "|..................|..................|";
 			}
 		}