diff --git a/src/emucore/Event.hxx b/src/emucore/Event.hxx
index f7abf1c3b..b07ba788d 100644
--- a/src/emucore/Event.hxx
+++ b/src/emucore/Event.hxx
@@ -38,12 +38,10 @@ class Event
     enum Type
     {
       NoType = 0,
-      ConsoleColor, ConsoleBlackWhite,
-      ConsoleLeftDiffA, ConsoleLeftDiffB,
-      ConsoleRightDiffA, ConsoleRightDiffB,
+      ConsoleColor, ConsoleBlackWhite, ConsoleColorToggle, Console7800Pause,
+      ConsoleLeftDiffA, ConsoleLeftDiffB, ConsoleLeftDiffToggle,
+      ConsoleRightDiffA, ConsoleRightDiffB, ConsoleRightDiffToggle,
       ConsoleSelect, ConsoleReset,
-      ConsoleLeftDiffToggle, ConsoleRightDiffToggle, ConsoleColorToggle,
-      Console7800Pause,
 
       JoystickZeroUp, JoystickZeroDown, JoystickZeroLeft, JoystickZeroRight,
         JoystickZeroFire, JoystickZeroFire5, JoystickZeroFire9,
@@ -65,48 +63,6 @@ class Event
       KeyboardOne7, KeyboardOne8, KeyboardOne9,
       KeyboardOneStar, KeyboardOne0, KeyboardOnePound,
 
-      Combo1, Combo2, Combo3, Combo4, Combo5, Combo6, Combo7, Combo8,
-      Combo9, Combo10, Combo11, Combo12, Combo13, Combo14, Combo15, Combo16,
-
-      MouseAxisXMove, MouseAxisYMove,
-      MouseButtonLeftValue, MouseButtonRightValue,
-
-      ChangeState, LoadState, SaveState, TakeSnapshot, Quit,
-      TogglePauseMode, OptionsMenuMode, CmdMenuMode, TimeMachineMode, DebuggerMode, ExitMode,
-      Fry, VolumeDecrease, VolumeIncrease, SoundToggle, VidmodeDecrease, VidmodeIncrease,
-      RewindPause, UnwindPause,
-
-      UIUp, UIDown, UILeft, UIRight, UIHome, UIEnd, UIPgUp, UIPgDown,
-      UISelect, UINavPrev, UINavNext, UIOK, UICancel, UIPrevDir,
-      UITabPrev, UITabNext,
-
-      ToggleFullScreen,
-      VidmodeStd, VidmodeRGB, VidmodeSVideo, VidModeComposite, VidModeBad, VidModeCustom,
-      PreviousAttribute, NextAttribute, DecreaseAttribute, IncreaseAttribute,
-      ScanlinesDecrease, ScanlinesIncrease, VCenterDecrease, VCenterIncrease,
-      ScanlineAdjustDecrease, ScanlineAdjustIncrease,
-
-      ToggleP0Collision, ToggleP0Bit, ToggleP1Collision, ToggleP1Bit,
-      ToggleM0Collision, ToggleM0Bit, ToggleM1Collision, ToggleM1Bit,
-      ToggleBLCollision, ToggleBLBit, TogglePFCollision, TogglePFBit,
-      ToggleCollisions, ToggleBits, ToggleFixedColors,
-
-      PhosphorDecrease, PhosphorIncrease, TogglePhosphor, ToggleJitter,
-      ToggleFrameStats, ToggleTimeMachine,
-      ToggleContSnapshots, ToggleContSnapshotsFrame,
-      ToggleColorLoss, TogglePalette,
-
-      HandleMouseControl, ToggleGrabMouse, ToggleSAPortOrder,
-      FormatDecrease, FormatIncrease, ReloadConsole,
-
-      Rewind1Menu, Rewind10Menu, RewindAllMenu,
-      Unwind1Menu, Unwind10Menu, UnwindAllMenu,
-
-      StartPauseMode, SaveAllStates, LoadAllStates,
-      OverscanDecrease, OverscanIncrease,
-
-      ToggleAutoSlot,
-
       CompuMateFunc, CompuMateShift,
       CompuMate0, CompuMate1, CompuMate2, CompuMate3, CompuMate4,
       CompuMate5, CompuMate6, CompuMate7, CompuMate8, CompuMate9,
@@ -121,8 +77,47 @@ class Event
       CompuMateQuote, CompuMateBackspace, CompuMateEquals, CompuMatePlus,
       CompuMateSlash,
 
-      ToggleInter,
-      MouseAxisXValue, MouseAxisYValue,
+      Combo1, Combo2, Combo3, Combo4, Combo5, Combo6, Combo7, Combo8,
+      Combo9, Combo10, Combo11, Combo12, Combo13, Combo14, Combo15, Combo16,
+
+      UIUp, UIDown, UILeft, UIRight, UIHome, UIEnd, UIPgUp, UIPgDown,
+      UISelect, UINavPrev, UINavNext, UIOK, UICancel, UIPrevDir,
+      UITabPrev, UITabNext,
+
+      HandleMouseControl, ToggleGrabMouse,
+      MouseAxisXMove, MouseAxisYMove, MouseAxisXValue, MouseAxisYValue,
+      MouseButtonLeftValue, MouseButtonRightValue,
+
+      Quit, ReloadConsole, Fry,
+      TogglePauseMode, StartPauseMode,
+      OptionsMenuMode, CmdMenuMode, DebuggerMode, ExitMode,
+      TakeSnapshot, ToggleContSnapshots, ToggleContSnapshotsFrame,
+
+      ChangeState, LoadState, SaveState,
+      SaveAllStates, LoadAllStates,
+      ToggleAutoSlot, ToggleTimeMachine, TimeMachineMode,
+      Rewind1Menu, Rewind10Menu, RewindAllMenu,
+      Unwind1Menu, Unwind10Menu, UnwindAllMenu,
+      RewindPause, UnwindPause,
+
+      FormatDecrease, FormatIncrease, TogglePalette, ToggleColorLoss,
+      ToggleFullScreen, VidmodeDecrease, VidmodeIncrease,
+      VCenterDecrease, VCenterIncrease, ScanlineAdjustDecrease, ScanlineAdjustIncrease,
+      OverscanDecrease, OverscanIncrease,
+
+      VidmodeStd, VidmodeRGB, VidmodeSVideo, VidModeComposite, VidModeBad, VidModeCustom,
+      PreviousAttribute, NextAttribute, DecreaseAttribute, IncreaseAttribute,
+      ScanlinesDecrease, ScanlinesIncrease,
+      PhosphorDecrease, PhosphorIncrease, TogglePhosphor, ToggleInter, ToggleJitter,
+
+      VolumeDecrease, VolumeIncrease, SoundToggle,
+
+      ToggleP0Collision, ToggleP0Bit, ToggleP1Collision, ToggleP1Bit,
+      ToggleM0Collision, ToggleM0Bit, ToggleM1Collision, ToggleM1Bit,
+      ToggleBLCollision, ToggleBLBit, TogglePFCollision, TogglePFBit,
+      ToggleCollisions, ToggleBits, ToggleFixedColors,
+
+      ToggleFrameStats, ToggleSAPortOrder,
 
       LastType
     };
@@ -137,7 +132,7 @@ class Event
     };
 
     // Event list version, update if the id of existing event types changed
-    static constexpr Int32 VERSION = 1;
+    static constexpr Int32 VERSION = 2;
 
     using EventSet = std::set<Event::Type>;
 
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 211da3762..3e92cb700 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1844,15 +1844,15 @@ EventHandler::EmulActionList EventHandler::ourEmulActionList = { {
   { Event::KeyboardOne0,            "P1 Keyboard 0",                         "" },
   { Event::KeyboardOnePound,        "P1 Keyboard #",                         "" },
   // Video
-  { Event::VidmodeDecrease,         "Previous zoom level",                   "" },
-  { Event::VidmodeIncrease,         "Next zoom level",                       "" },
   { Event::ToggleFullScreen,        "Toggle fullscreen",                     "" },
   { Event::OverscanDecrease,        "Decrease overscan in fullscreen mode",  "" },
   { Event::OverscanIncrease,        "Increase overscan in fullscreen mode",  "" },
-  { Event::VCenterIncrease,         "Move display up",                       "" },
-  { Event::VCenterDecrease,         "Move display down",                     "" },
-  { Event::ScanlineAdjustIncrease,  "Increase scanline adjust",              "" },
-  { Event::ScanlineAdjustDecrease,  "Decrease scanline adjust",              "" },
+  { Event::VidmodeDecrease,         "Previous zoom level",                   "" },
+  { Event::VidmodeIncrease,         "Next zoom level",                       "" },
+  { Event::ScanlineAdjustIncrease,  "Increase vertical display size",        "" },
+  { Event::ScanlineAdjustDecrease,  "Decrease vertical display size",        "" },
+  { Event::VCenterDecrease,         "Move display up",                       "" },
+  { Event::VCenterIncrease,         "Move display down",                     "" },
   { Event::FormatDecrease,          "Decrease display format",               "" },
   { Event::FormatIncrease,          "Increase display format",               "" },
   { Event::TogglePalette,           "Switch palette (Standard/Z26/User)",    "" },