diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
index 8b6bfdf18d..dd21b4cc3e 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
@@ -125,9 +125,7 @@ namespace BizHawk.Emulation
 				// on the console
 				"Reset",
 				"Select",
-				"BW", // should be "Color"??
-				"Left Difficulty", // better not put P# on these as they might not correspond to player numbers
-				"Right Difficulty",
+				"Pause",
 				// ports
 				"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Trigger", "P1 Trigger 2",
 				"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Trigger", "P2 Trigger 2"
@@ -141,9 +139,7 @@ namespace BizHawk.Emulation
 				// on the console
 				"Reset",
 				"Select",
-				"BW", // should be "Color"??
-				"Left Difficulty", // better not put P# on these as they might not correspond to player numbers
-				"Right Difficulty",
+				"Pause",
 				// ports
 				"P1 Trigger",
 				"P2 Trigger"
@@ -189,6 +185,12 @@ namespace BizHawk.Emulation
 			s.RaiseInput(0, MachineInput.LeftDifficulty, c["Left Difficulty"]);
 			s.RaiseInput(0, MachineInput.RightDifficulty, c["Right Difficulty"]);
 		}
+		static void ConvertConsoleButtons7800(IController c, InputState s)
+		{
+			s.RaiseInput(0, MachineInput.Reset, c["Reset"]);
+			s.RaiseInput(0, MachineInput.Select, c["Select"]);
+			s.RaiseInput(0, MachineInput.Color, c["Pause"]);
+		}
 		static void ConvertDirections(IController c, InputState s, int p)
 		{
 			string ps = string.Format("P{0} ", p + 1);
@@ -277,7 +279,7 @@ namespace BizHawk.Emulation
 		static void ConvertProLineJoystick(IController c, InputState s)
 		{
 			s.ClearAllInput();
-			ConvertConsoleButtons(c, s);
+			ConvertConsoleButtons7800(c, s);
 			ConvertDirections(c, s, 0);
 			ConvertDirections(c, s, 1);
 			s.RaiseInput(0, MachineInput.Fire, c["P1 Trigger"]);
@@ -288,7 +290,7 @@ namespace BizHawk.Emulation
 		static void ConvertLightgun(IController c, InputState s)
 		{
 			s.ClearAllInput();
-			ConvertConsoleButtons(c, s);
+			ConvertConsoleButtons7800(c, s);
 			ConvertTrigger(c, s, 0);
 			ConvertTrigger(c, s, 1);
 			s.RaiseLightgunPos(0, (int)c.GetFloat("P1 VPos"), (int)c.GetFloat("P1 HPos"));