diff --git a/Examples/Example/Example.cs b/Examples/Example/Example.cs
index 4d8552e3a4..e67370f1ca 100644
--- a/Examples/Example/Example.cs
+++ b/Examples/Example/Example.cs
@@ -67,7 +67,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup
diff --git a/Examples/FluentExample/Program.cs b/Examples/FluentExample/Program.cs
index 026a981345..05d1003770 100644
--- a/Examples/FluentExample/Program.cs
+++ b/Examples/FluentExample/Program.cs
@@ -64,7 +64,7 @@ public ColorPickerView ()
             Title = "_OK",
             X = Pos.Align (Alignment.Center),
             Y = Pos.AnchorEnd (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         okButton.Accepting += (s, e) =>
diff --git a/Examples/NativeAot/Program.cs b/Examples/NativeAot/Program.cs
index 501adb2ed8..6fea1ec3d6 100644
--- a/Examples/NativeAot/Program.cs
+++ b/Examples/NativeAot/Program.cs
@@ -93,7 +93,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup
diff --git a/Examples/RunnableWrapperExample/Program.cs b/Examples/RunnableWrapperExample/Program.cs
index 1eb5e9e119..2bc1e64ff2 100644
--- a/Examples/RunnableWrapperExample/Program.cs
+++ b/Examples/RunnableWrapperExample/Program.cs
@@ -125,7 +125,7 @@ View CreateCustomForm ()
         Title = "OK",
         X = Pos.Center (),
         Y = 7,
-        IsDefault = true
+        IsDefaultAcceptView = true
     };
 
     okButton.Accepting += (s, e) =>
diff --git a/Examples/SelfContained/Program.cs b/Examples/SelfContained/Program.cs
index 319ae859fb..17b0011674 100644
--- a/Examples/SelfContained/Program.cs
+++ b/Examples/SelfContained/Program.cs
@@ -92,7 +92,7 @@ public ExampleWindow ()
 
             // center the login button horizontally
             X = Pos.Center (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // When login button is clicked display a message popup
diff --git a/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs b/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
index a8d7c72ade..cd7db2999f 100644
--- a/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
+++ b/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
@@ -152,7 +152,7 @@ private View BuildSingleTab ()
         var tvTerminator = new TextView { X = Pos.Left (label), Y = Pos.Bottom (label), Width = 4, Height = 4, ReadOnly = true };
         w.Add (label, tvTerminator);
 
-        var btnResponse = new Button { X = Pos.Center (), Y = Pos.Bottom (tvResponse) + 2, Text = "Send Request", IsDefault = true };
+        var btnResponse = new Button { X = Pos.Center (), Y = Pos.Bottom (tvResponse) + 2, Text = "Send Request", IsDefaultAcceptView = true };
 
         var lblSuccess = new Label { X = Pos.Center (), Y = Pos.Bottom (btnResponse) + 1 };
         w.Add (lblSuccess);
diff --git a/Examples/UICatalog/Scenarios/Buttons.cs b/Examples/UICatalog/Scenarios/Buttons.cs
index f0078564ad..2b1535dab3 100644
--- a/Examples/UICatalog/Scenarios/Buttons.cs
+++ b/Examples/UICatalog/Scenarios/Buttons.cs
@@ -20,17 +20,17 @@ public override void Main ()
             Title = GetQuitKeyAndName ()
         };
 
-        // Add a label & text field so we can demo IsDefault
-        var editLabel = new Label { X = 0, Y = 0, Text = "TextField (to demo IsDefault):" };
+        // Add a label & text field so we can demo IsDefaultAcceptView
+        var editLabel = new Label { X = 0, Y = 0, Text = "TextField (to demo IsDefaultAcceptView):" };
         main.Add (editLabel);
 
         // Add a TextField using Absolute layout. 
         var edit = new TextField { X = 31, Width = 15, HotKey = Key.Y.WithAlt };
         main.Add (edit);
 
-        // This is the default button (IsDefault = true); if user presses ENTER in the TextField
+        // This is the default button (IsDefaultAcceptView = true); if user presses ENTER in the TextField
         // the scenario will quit
-        var defaultButton = new Button { X = Pos.Center (), Y = Pos.AnchorEnd (), IsDefault = true, Text = "_Quit" };
+        var defaultButton = new Button { X = Pos.Center (), Y = Pos.AnchorEnd (), IsDefaultAcceptView = true, Text = "_Quit" };
 
         main.Add (defaultButton);
 
@@ -48,14 +48,14 @@ public override void Main ()
 
         swapButton.Accepting += (s, e) =>
                              {
-                                 e.Handled = !swapButton.IsDefault;
-                                 defaultButton.IsDefault = !defaultButton.IsDefault;
-                                 swapButton.IsDefault = !swapButton.IsDefault;
+                                 e.Handled = !swapButton.IsDefaultAcceptView;
+                                 defaultButton.IsDefaultAcceptView = !defaultButton.IsDefaultAcceptView;
+                                 swapButton.IsDefaultAcceptView = !swapButton.IsDefaultAcceptView;
                              };
 
         defaultButton.Accepting += (s, e) =>
                                 {
-                                    e.Handled = !defaultButton.IsDefault;
+                                    e.Handled = !defaultButton.IsDefaultAcceptView;
 
                                     if (e.Handled)
                                     {
diff --git a/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs b/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
index fba9130e37..819a33a2a0 100644
--- a/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
+++ b/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
@@ -133,9 +133,15 @@ public override void Main ()
 
         _categoryList.Table = CreateCategoryTable (0, isDescending);
 
-        // if user clicks the mouse in TableView
-        _categoryList.MouseClick += (s, e) =>
+        // if user clicks the mouse in TableView, change sorting by that column
+        _categoryList.Activating += (s, commandEventArgs) =>
                                     {
+                                        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+                                        {
+                                            return;
+                                        }
+
+                                        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
                                         _categoryList.ScreenToCell (e.Position, out int? clickedCol);
 
                                         if (clickedCol != null && e.Flags.HasFlag (MouseFlags.Button1Clicked))
diff --git a/Examples/UICatalog/Scenarios/ContextMenus.cs b/Examples/UICatalog/Scenarios/ContextMenus.cs
index 029798b0a1..1fbeba959b 100644
--- a/Examples/UICatalog/Scenarios/ContextMenus.cs
+++ b/Examples/UICatalog/Scenarios/ContextMenus.cs
@@ -5,7 +5,7 @@
 
 namespace UICatalog.Scenarios;
 
-[ScenarioMetadata ("ContextMenus", "Context Menu Sample.")]
+[ScenarioMetadata ("ContextMenus", "Demonstrates using PopoverMenu as a Context Menu.")]
 [ScenarioCategory ("Menus")]
 public class ContextMenus : Scenario
 {
@@ -35,7 +35,7 @@ public override void Main ()
         Application.Run (_appWindow);
         _appWindow.Dispose ();
         _appWindow.KeyDown -= OnAppWindowOnKeyDown;
-        _appWindow.MouseClick -= OnAppWindowOnMouseClick;
+        _appWindow.MouseEvent -= OnAppWindowOnMouseEvent;
         _winContextMenu?.Dispose ();
 
         // Shutdown - Calling Application.Shutdown is required.
@@ -81,7 +81,7 @@ void AppWindowOnInitialized (object? sender, EventArgs e)
             _appWindow.Add (_tfBottomRight);
 
             _appWindow.KeyDown += OnAppWindowOnKeyDown;
-            _appWindow.MouseClick += OnAppWindowOnMouseClick;
+            _appWindow.MouseEvent += OnAppWindowOnMouseEvent;
 
             CultureInfo originalCulture = Thread.CurrentThread.CurrentUICulture;
             _appWindow.IsRunningChanged += (s, e) => {
@@ -91,7 +91,7 @@ void AppWindowOnInitialized (object? sender, EventArgs e)
                                                } };
         }
 
-        void OnAppWindowOnMouseClick (object? s, MouseEventArgs e)
+        void OnAppWindowOnMouseEvent (object? s, MouseEventArgs e)
         {
             if (e.Flags == MouseFlags.Button3Clicked)
             {
@@ -190,7 +190,12 @@ private Menu GetSupportedCultureMenu ()
         {
             MenuItem culture = new ();
 
-            culture.CommandView = new CheckBox { CanFocus = false };
+            culture.CommandView = new CheckBox
+            {
+                // Best practice for CheckBoxes in menus is to disable focus and highlight states
+                CanFocus = false,
+                HighlightStates = MouseState.None
+            };
 
             if (index == -1)
             {
@@ -206,7 +211,12 @@ private Menu GetSupportedCultureMenu ()
 
                 index++;
                 culture = new ();
-                culture.CommandView = new CheckBox { CanFocus = false };
+                culture.CommandView = new CheckBox
+                {
+                    // Best practice for CheckBoxes in menus is to disable focus and highlight states
+                    CanFocus = false,
+                    HighlightStates = MouseState.None
+                };
             }
 
             culture.Id = $"_{c.Parent.EnglishName}";
diff --git a/Examples/UICatalog/Scenarios/CsvEditor.cs b/Examples/UICatalog/Scenarios/CsvEditor.cs
index 0c676f8051..493adb77c8 100644
--- a/Examples/UICatalog/Scenarios/CsvEditor.cs
+++ b/Examples/UICatalog/Scenarios/CsvEditor.cs
@@ -353,7 +353,7 @@ private bool GetText (string title, string label, string initialText, out string
     {
         var okPressed = false;
 
-        Button ok = new () { Text = "Ok", IsDefault = true };
+        Button ok = new () { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
diff --git a/Examples/UICatalog/Scenarios/Dialogs.cs b/Examples/UICatalog/Scenarios/Dialogs.cs
index fb4a4fbd65..958b62ff40 100644
--- a/Examples/UICatalog/Scenarios/Dialogs.cs
+++ b/Examples/UICatalog/Scenarios/Dialogs.cs
@@ -178,7 +178,7 @@ public override void Main ()
 
         var showDialogButton = new Button
         {
-            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefault = true, Text = "_Show Dialog"
+            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefaultAcceptView = true, Text = "_Show Dialog"
         };
 
         app.Accepting += (s, e) =>
@@ -243,12 +243,12 @@ Label buttonPressedLabel
                     button = new ()
                     {
                         Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
-                        IsDefault = buttonId == 0
+                        IsDefaultAcceptView = buttonId == 0
                     };
                 }
                 else
                 {
-                    button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
+                    button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefaultAcceptView = buttonId == 0 };
                 }
 
                 button.Accepting += (s, e) =>
@@ -297,12 +297,12 @@ Label buttonPressedLabel
                                   button = new ()
                                   {
                                       Text = "_" + NumberToWords.Convert (buttonId) + " " + char.ConvertFromUtf32 (buttonId + CODE_POINT),
-                                      IsDefault = buttonId == 0
+                                      IsDefaultAcceptView = buttonId == 0
                                   };
                               }
                               else
                               {
-                                  button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefault = buttonId == 0 };
+                                  button = new () { Text = "_" + NumberToWords.Convert (buttonId), IsDefaultAcceptView = buttonId == 0 };
                               }
 
                               button.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
index 43b01829f6..b04599c045 100644
--- a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
+++ b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
@@ -178,7 +178,7 @@ public DynamicStatusItem EnterStatusItem ()
                 EditStatusItem (_statusItem);
             }
 
-            var btnOk = new Button { IsDefault = true, Text = "OK" };
+            var btnOk = new Button { IsDefaultAcceptView = true, Text = "OK" };
 
             btnOk.Accepting += (s, e) =>
                               {
diff --git a/Examples/UICatalog/Scenarios/Editor.cs b/Examples/UICatalog/Scenarios/Editor.cs
index ddf16c92e5..b31a27cb76 100644
--- a/Examples/UICatalog/Scenarios/Editor.cs
+++ b/Examples/UICatalog/Scenarios/Editor.cs
@@ -954,7 +954,7 @@ private View CreateFindTab ()
             X = Pos.Align (Alignment.Center),
             Y = Pos.AnchorEnd (),
             Enabled = !string.IsNullOrEmpty (txtToFind.Text),
-            IsDefault = true,
+            IsDefaultAcceptView = true,
             Text = "Find _Next"
         };
         btnFindNext.Accepting += (s, e) => { FindNext (); };
@@ -1041,7 +1041,7 @@ private View CreateReplaceTab ()
             X = Pos.Align (Alignment.Center),
             Y = Pos.AnchorEnd (),
             Enabled = !string.IsNullOrEmpty (txtToFind.Text),
-            IsDefault = true,
+            IsDefaultAcceptView = true,
             Text = "Replace _Next"
         };
         btnFindNext.Accepting += (s, e) => { ReplaceNext (); };
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
index f8f78ac6fe..fdd870c3ec 100644
--- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
@@ -59,7 +59,6 @@ public AllViewsView ()
         KeyBindings.Add (Key.End, Command.End);
         KeyBindings.Add (PopoverMenu.DefaultKey, Command.Context);
 
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
         MouseBindings.ReplaceCommands (MouseFlags.Button3Clicked, Command.Context);
         MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Context);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs
index 9b59d88126..fadeae0243 100644
--- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs
@@ -79,10 +79,9 @@ public View? ViewToLog
                                               Log ($"Initialized: {GetIdentifyingString (sender)}");
                                           };
 
-                _viewToLog.MouseClick += (s, args) => { Log ($"MouseClick: {args}"); };
                 _viewToLog.MouseWheel += (s, args) => { Log ($"MouseWheel: {args}"); };
                 _viewToLog.HandlingHotKey += (s, args) => { Log ($"HandlingHotKey: {args.Context}"); };
-                _viewToLog.Selecting += (s, args) => { Log ($"Selecting: {args.Context}"); };
+                _viewToLog.Activating += (s, args) => { Log ($"Activating: {args.Context}"); };
                 _viewToLog.Accepting += (s, args) => { Log ($"Accepting: {args.Context}"); };
             }
         }
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs
index 0141cbfc9d..637c78aebb 100644
--- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs
@@ -65,7 +65,6 @@ public ThemeViewer ()
         KeyBindings.Add (Key.End, Command.End);
         KeyBindings.Add (PopoverMenu.DefaultKey, Command.Context);
 
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
         MouseBindings.ReplaceCommands (MouseFlags.Button3Clicked, Command.Context);
         MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Context);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);
diff --git a/Examples/UICatalog/Scenarios/FileDialogExamples.cs b/Examples/UICatalog/Scenarios/FileDialogExamples.cs
index 2d9ccbaf70..5082650d4a 100644
--- a/Examples/UICatalog/Scenarios/FileDialogExamples.cs
+++ b/Examples/UICatalog/Scenarios/FileDialogExamples.cs
@@ -123,7 +123,7 @@ public override void Main ()
         _cbFlipButtonOrder = new () { X = x, Y = y++, Text = "Flip Ord_er" };
         win.Add (_cbFlipButtonOrder);
 
-        var btn = new Button { X = 1, Y = 9, IsDefault = true, Text = "Run Dialog" };
+        var btn = new Button { X = 1, Y = 9, IsDefaultAcceptView = true, Text = "Run Dialog" };
 
         win.Accepting += (s, e) =>
                          {
diff --git a/Examples/UICatalog/Scenarios/Generic.cs b/Examples/UICatalog/Scenarios/Generic.cs
index a5a3b81ccf..0b21ec77a7 100644
--- a/Examples/UICatalog/Scenarios/Generic.cs
+++ b/Examples/UICatalog/Scenarios/Generic.cs
@@ -15,14 +15,21 @@ public override void Main ()
         Window appWindow = new ()
         {
             Title = GetQuitKeyAndName (),
-            BorderStyle = LineStyle.None
+            BorderStyle = LineStyle.None,
+            //InvertFocusAttribute = true
         };
 
-        var button = new Button ()
+
+
+        var button = new CheckBox ()
         {
             X = Pos.Center (),
             Y = 1,
             Title = "_Button",
+
+            // Comment this out to see how Issue #4170 is about IsDefaultAcceptView not working with Accepting event.
+            // IsDefaultAcceptView = true,
+            //SchemeName = "Error"
         };
 
         button.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/Scenarios/InteractiveTree.cs b/Examples/UICatalog/Scenarios/InteractiveTree.cs
index e65aec2843..1555725123 100644
--- a/Examples/UICatalog/Scenarios/InteractiveTree.cs
+++ b/Examples/UICatalog/Scenarios/InteractiveTree.cs
@@ -97,7 +97,7 @@ private bool GetText (string title, string label, string initialText, out string
     {
         var okPressed = false;
 
-        Button ok = new () { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
diff --git a/Examples/UICatalog/Scenarios/LineDrawing.cs b/Examples/UICatalog/Scenarios/LineDrawing.cs
index 3badc02dc6..4a9d645c83 100644
--- a/Examples/UICatalog/Scenarios/LineDrawing.cs
+++ b/Examples/UICatalog/Scenarios/LineDrawing.cs
@@ -143,7 +143,7 @@ public static bool PromptForColor (string title, Color current, out Color newCol
             Y = Driver.Force16Colors ? 6 : 4,
             Text = "Ok",
             Width = Dim.Auto (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         btnOk.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/Scenarios/ListColumns.cs b/Examples/UICatalog/Scenarios/ListColumns.cs
index c19e9c3b95..7bd7f13b9b 100644
--- a/Examples/UICatalog/Scenarios/ListColumns.cs
+++ b/Examples/UICatalog/Scenarios/ListColumns.cs
@@ -113,7 +113,7 @@ public override void Main ()
         };
 
         // if user clicks the mouse in TableView
-        _listColView.MouseClick += (s, e) => { _listColView.ScreenToCell (e.Position, out int? clickedCol); };
+        _listColView.MouseEvent += (s, e) => { _listColView.ScreenToCell (e.Position, out int? clickedCol); };
 
         _listColView.KeyBindings.ReplaceCommands (Key.Space, Command.Accept);
 
@@ -309,7 +309,7 @@ private void RunListWidthDialog (string prompt, Action<TableView, int> setter, F
         }
 
         var accepted = false;
-        Button ok = new () { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
diff --git a/Examples/UICatalog/Scenarios/ListViewWithSelection.cs b/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
index dd6ac2bf42..4176c6489b 100644
--- a/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
+++ b/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
@@ -105,7 +105,7 @@ public override void Main ()
         _listView.OpenSelectedItem += (s, a) => LogEvent (s as View, a, "OpenSelectedItem");
         _listView.CollectionChanged += (s, a) => LogEvent (s as View, a, "CollectionChanged");
         _listView.Accepting += (s, a) => LogEvent (s as View, a, "Accept");
-        _listView.Selecting += (s, a) => LogEvent (s as View, a, "Select");
+        _listView.Activating += (s, a) => LogEvent (s as View, a, "Activating");
         _listView.VerticalScrollBar.AutoShow = true;
         _listView.HorizontalScrollBar.AutoShow = true;
 
diff --git a/Examples/UICatalog/Scenarios/Menus.cs b/Examples/UICatalog/Scenarios/Menus.cs
index 4796473ac6..327edd2d60 100644
--- a/Examples/UICatalog/Scenarios/Menus.cs
+++ b/Examples/UICatalog/Scenarios/Menus.cs
@@ -370,7 +370,7 @@ public MenuHost ()
                                            };
 
             // Add a button to open the contextmenu
-            var openBtn = new Button { X = Pos.Center (), Y = 4, Text = "_Open Menu", IsDefault = true };
+            var openBtn = new Button { X = Pos.Center (), Y = 4, Text = "_Open Menu", IsDefaultAcceptView = true };
 
             openBtn.Accepting += (s, e) =>
                                  {
diff --git a/Examples/UICatalog/Scenarios/MessageBoxes.cs b/Examples/UICatalog/Scenarios/MessageBoxes.cs
index 6c691516d3..8aa51bf64d 100644
--- a/Examples/UICatalog/Scenarios/MessageBoxes.cs
+++ b/Examples/UICatalog/Scenarios/MessageBoxes.cs
@@ -228,7 +228,7 @@ public override void Main ()
 
         var showMessageBoxButton = new Button
         {
-            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefault = true, Text = "_Show MessageBox"
+            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefaultAcceptView = true, Text = "_Show MessageBox"
         };
 
         app.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/Scenarios/Mouse.cs b/Examples/UICatalog/Scenarios/Mouse.cs
index d56b3e82a5..d1c2621425 100644
--- a/Examples/UICatalog/Scenarios/Mouse.cs
+++ b/Examples/UICatalog/Scenarios/Mouse.cs
@@ -302,10 +302,17 @@ void DemoPaddingOnInitialized (object o, EventArgs eventArgs)
                               }
                           };
 
-        win.MouseClick += (sender, a) =>
+        win.Activating += (sender, commandEventArgs) =>
                           {
-                              winLogList.Add ($"MouseClick: ({a.Position}) - {a.Flags} {count++}");
+                              if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+                              {
+                                  return;
+                              }
+
+                              MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
+                              winLogList.Add ($"Activating: ({e.Position}) - {e.Flags} {count++}");
                               winLog.MoveDown ();
+                              commandEventArgs.Handled = true;
                           };
 
         Application.Run (win);
diff --git a/Examples/UICatalog/Scenarios/MultiColouredTable.cs b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
index b5bf47d48b..2a60cd5673 100644
--- a/Examples/UICatalog/Scenarios/MultiColouredTable.cs
+++ b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
@@ -110,7 +110,7 @@ private bool GetText (string title, string label, string initialText, out string
     {
         var okPressed = false;
 
-        Button ok = new () { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
diff --git a/Examples/UICatalog/Scenarios/Navigation.cs b/Examples/UICatalog/Scenarios/Navigation.cs
index 899dc22ee6..2d0790690a 100644
--- a/Examples/UICatalog/Scenarios/Navigation.cs
+++ b/Examples/UICatalog/Scenarios/Navigation.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using System.Timers;
+using Timer = System.Timers.Timer;
 
 namespace UICatalog.Scenarios;
 
@@ -75,6 +76,8 @@ public override void Main ()
         testFrame.Add (tiledView3);
 
         View overlappedView1 = CreateOverlappedView (2, 10, Pos.Center ());
+        // Set the button to CanFocus = false to illustrate https://github.com/gui-cs/Terminal.Gui/issues/4179
+        overlappedView1.SubViews.OfType<Button> ().FirstOrDefault ()!.CanFocus = false;
         View tiledSubView = CreateTiledView (4, 0, 2);
         overlappedView1.Add (tiledSubView);
 
@@ -88,24 +91,24 @@ public override void Main ()
         };
         overlappedView1.Add (progressBar);
 
-        //Timer timer = new (1)
-        //{
-        //    AutoReset = true
-        //};
+        Timer timer = new (1)
+        {
+            AutoReset = true
+        };
 
-        //timer.Elapsed += (o, args) =>
-        //                 {
-        //                     if (progressBar.Fraction == 1.0)
-        //                     {
-        //                         progressBar.Fraction = 0;
-        //                     }
+        timer.Elapsed += (o, args) =>
+                         {
+                             if (progressBar.Fraction == 1.0)
+                             {
+                                 progressBar.Fraction = 0;
+                             }
 
-        //                     progressBar.Fraction += 0.01f;
+                             progressBar.Fraction += 0.01f;
 
-        //                     Application.Invoke (() => progressBar.SetNeedsDraw ());
-        //                    ;
-        //                 };
-        //timer.Start ();
+                             Application.Invoke (() => progressBar.SetNeedsDraw ());
+                             ;
+                         };
+        timer.Start ();
 
         Application.Iteration += OnApplicationIteration;
 
@@ -115,6 +118,7 @@ public override void Main ()
         overlappedView2.Add (overlappedInOverlapped1);
 
         View overlappedInOverlapped2 = CreateOverlappedView (5, 10, 7);
+
         overlappedView2.Add (overlappedInOverlapped2);
 
         StatusBar statusBar = new ();
diff --git a/Examples/UICatalog/Scenarios/RunTExample.cs b/Examples/UICatalog/Scenarios/RunTExample.cs
index 1d5f4e5a5a..3fd35ab0e1 100644
--- a/Examples/UICatalog/Scenarios/RunTExample.cs
+++ b/Examples/UICatalog/Scenarios/RunTExample.cs
@@ -55,7 +55,7 @@ public ExampleWindow ()
 
                 // center the login button horizontally
                 X = Pos.Center (),
-                IsDefault = true
+                IsDefaultAcceptView = true
             };
 
             // When login button is clicked display a message popup
diff --git a/Examples/UICatalog/Scenarios/Shortcuts.cs b/Examples/UICatalog/Scenarios/Shortcuts.cs
index a2e241c6cf..cc4c080de7 100644
--- a/Examples/UICatalog/Scenarios/Shortcuts.cs
+++ b/Examples/UICatalog/Scenarios/Shortcuts.cs
@@ -17,6 +17,7 @@ public override void Main ()
 
         app.IsModalChanged += App_Loaded;
 
+        Key originalQuitKey = Application.QuitKey;
         Application.Run (app);
         app.Dispose ();
         Application.Shutdown ();
@@ -425,7 +426,7 @@ private void App_Loaded (object? sender, EventArgs e)
             BoxWidth = 1
         };
 
-        bgColorShortcut.Selecting += (o, args) =>
+        bgColorShortcut.Activating += (o, args) =>
                                      {
                                          //args.Cancel = true;
                                      };
@@ -480,18 +481,18 @@ private void App_Loaded (object? sender, EventArgs e)
 
         foreach (Shortcut shortcut in Application.TopRunnableView.SubViews.OfType<Shortcut> ())
         {
-            shortcut.Selecting += (o, args) =>
+            shortcut.Activating += (o, args) =>
                                   {
                                       if (args.Handled)
                                       {
                                           return;
                                       }
 
-                                      eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                      eventSource.Add ($"{shortcut!.Id}.Activating: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                                       eventLog.MoveDown ();
                                   };
 
-            shortcut.CommandView.Selecting += (o, args) =>
+            shortcut.CommandView.Activating += (o, args) =>
                                               {
                                                   if (args.Handled)
                                                   {
@@ -499,7 +500,7 @@ private void App_Loaded (object? sender, EventArgs e)
                                                   }
 
                                                   eventSource.Add (
-                                                                   $"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                                                   $"{shortcut!.Id}.CommandView.Activating: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
                                                   eventLog.MoveDown ();
                                                   //args.Handled = true;
                                               };
diff --git a/Examples/UICatalog/Scenarios/TableEditor.cs b/Examples/UICatalog/Scenarios/TableEditor.cs
index 4880f4c95a..df44e638da 100644
--- a/Examples/UICatalog/Scenarios/TableEditor.cs
+++ b/Examples/UICatalog/Scenarios/TableEditor.cs
@@ -610,7 +610,7 @@ public override void Main ()
         };
 
         // if user clicks the mouse in TableView
-        _tableView!.MouseClick += (s, e) =>
+        _tableView!.MouseEvent += (s, e) =>
                                   {
                                       if (_currentTable == null)
                                       {
@@ -631,6 +631,8 @@ public override void Main ()
                                               // right click in a header
                                               ShowHeaderContextMenu (clickedCol.Value, e);
                                           }
+
+                                          e.Handled = true;
                                       }
                                   };
 
@@ -996,7 +998,7 @@ private void EditCurrentCell (object? sender, CellActivatedEventArgs e)
         var oldValue = _currentTable.Rows [e.Row] [tableCol].ToString ();
         var okPressed = false;
 
-        var ok = new Button { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
@@ -1194,7 +1196,7 @@ Func<ColumnStyle, int> getter
         }
 
         var accepted = false;
-        var ok = new Button { Text = "Ok", IsDefault = true };
+        var ok = new Button { Text = "Ok", IsDefaultAcceptView = true };
 
         ok.Accepting += (s, e) =>
                         {
diff --git a/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs b/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
index ebd42a3db5..24c93f289d 100644
--- a/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
+++ b/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Terminal.Gui.Input;
 
 namespace UICatalog.Scenarios;
 
@@ -447,7 +448,7 @@ public override void Main ()
             Text = txt
         };
 
-        editText.MouseClick += (s, m) =>
+        editText.Activating += (s, m) =>
                                {
                                    foreach (View v in singleLineLabels)
                                    {
@@ -458,6 +459,8 @@ public override void Main ()
                                    {
                                        v.Text = editText.Text;
                                    }
+                                   m.Handled = true;
+
                                };
 
         app.KeyUp += (s, m) =>
diff --git a/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs b/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
index 64102a9358..b45b63f8e3 100644
--- a/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
+++ b/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
@@ -60,7 +60,7 @@ public override void Main ()
         };
 
         win.Add (_detailsFrame);
-        _treeViewFiles.MouseClick += TreeViewFiles_MouseClick;
+        _treeViewFiles.MouseEvent += TreeViewFiles_MouseEvent;
         _treeViewFiles.KeyDown += TreeViewFiles_KeyPress;
         _treeViewFiles.SelectionChanged += TreeViewFiles_SelectionChanged;
 
@@ -556,32 +556,31 @@ private void TreeViewFiles_KeyPress (object? sender, Key obj)
         }
     }
 
-    private void TreeViewFiles_MouseClick (object? sender, MouseEventArgs obj)
+    private void TreeViewFiles_MouseEvent (object? sender, MouseEventArgs obj)
     {
-        if (_treeViewFiles is null)
+        // if user right clicks
+        if (!obj.Flags.HasFlag (MouseFlags.Button3Clicked))
         {
             return;
         }
 
-        // if user right clicks
-        if (obj.Flags.HasFlag (MouseFlags.Button3Clicked))
+        IFileSystemInfo? rightClicked = _treeViewFiles?.GetObjectOnRow (obj.Position.Y);
+
+        // nothing was clicked
+        if (rightClicked is null)
         {
-            IFileSystemInfo? rightClicked = _treeViewFiles.GetObjectOnRow (obj.Position.Y);
+            return;
+        }
 
-            // nothing was clicked
-            if (rightClicked is null)
-            {
-                return;
-            }
+        ShowContextMenu (
+                         new (
+                              obj.Position.X + _treeViewFiles!.Frame.X,
+                              obj.Position.Y + _treeViewFiles.Frame.Y + 2
+                             ),
+                         rightClicked
+                        );
+        obj.Handled = true;
 
-            ShowContextMenu (
-                             new (
-                                  obj.Position.X + _treeViewFiles.Frame.X,
-                                  obj.Position.Y + _treeViewFiles.Frame.Y + 2
-                                 ),
-                             rightClicked
-                            );
-        }
     }
 
     private void TreeViewFiles_SelectionChanged (object? sender, SelectionChangedEventArgs<IFileSystemInfo> e) { ShowPropertiesOf (e.NewValue); }
diff --git a/Examples/UICatalog/Scenarios/ViewExperiments.cs b/Examples/UICatalog/Scenarios/ViewExperiments.cs
index c36fce3e7c..fe772d8b3a 100644
--- a/Examples/UICatalog/Scenarios/ViewExperiments.cs
+++ b/Examples/UICatalog/Scenarios/ViewExperiments.cs
@@ -86,7 +86,7 @@ void ButtonAccepting (object sender, CommandEventArgs e)
             //App?.Popover!.Visible = true;
         }
 
-        testFrame.MouseClick += TestFrameOnMouseClick;
+        testFrame.MouseEvent += TestFrameOnMouseClick;
 
         void TestFrameOnMouseClick (object sender, MouseEventArgs e)
         {
@@ -94,8 +94,9 @@ void TestFrameOnMouseClick (object sender, MouseEventArgs e)
             {
                 popoverView.X = e.ScreenPosition.X;
                 popoverView.Y = e.ScreenPosition.Y;
-                //App?.Popover = popoverView;
-                //App?.Popover!.Visible = true;
+                //Application.Popover = popoverView;
+                //Application.Popover!.Visible = true;
+                e.Handled = true;
             }
         }
 
diff --git a/Examples/UICatalog/Scenarios/Wizards.cs b/Examples/UICatalog/Scenarios/Wizards.cs
index c97591de32..5f3f2e877f 100644
--- a/Examples/UICatalog/Scenarios/Wizards.cs
+++ b/Examples/UICatalog/Scenarios/Wizards.cs
@@ -100,7 +100,7 @@ void Win_Loaded (object sender, EventArgs args)
 
         var showWizardButton = new Button
         {
-            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefault = true, Text = "_Show Wizard"
+            X = Pos.Center (), Y = Pos.Bottom (frame) + 2, IsDefaultAcceptView = true, Text = "_Show Wizard"
         };
 
         showWizardButton.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/UICatalogRunnable.cs b/Examples/UICatalog/UICatalogRunnable.cs
index 748c2a5dcc..3df05b8ae7 100644
--- a/Examples/UICatalog/UICatalogRunnable.cs
+++ b/Examples/UICatalog/UICatalogRunnable.cs
@@ -298,7 +298,7 @@ View [] CreateDiagnosticMenuItems ()
             _diagnosticFlagsSelector.UsedHotKeys.Add (Key.D);
             _diagnosticFlagsSelector.AssignHotKeys = true;
             _diagnosticFlagsSelector.Value = Diagnostics;
-            _diagnosticFlagsSelector.Selecting += (sender, args) =>
+            _diagnosticFlagsSelector.Activating += (sender, args) =>
                                                   {
                                                       _diagnosticFlags = (ViewDiagnosticFlags)((int)args.Context!.Source!.Data!);// (ViewDiagnosticFlags)_diagnosticFlagsSelector.Value;
                                                       Diagnostics = _diagnosticFlags;
@@ -330,7 +330,7 @@ View [] CreateDiagnosticMenuItems ()
             };
 
             //_disableMouseCb.CheckedStateChanged += (_, args) => { Application.IsMouseDisabled = args.Value == CheckState.Checked; };
-            _disableMouseCb.Selecting += (sender, args) =>
+            _disableMouseCb.Activating += (sender, args) =>
                                          {
                                              Application.IsMouseDisabled = !Application.IsMouseDisabled;
                                              _disableMouseCb.CheckedState = Application.IsMouseDisabled ? CheckState.Checked : CheckState.None;
diff --git a/Terminal.Gui.Analyzers/TGUI001.md b/Terminal.Gui.Analyzers/TGUI001.md
index 457a321805..7bcb4eccd0 100644
--- a/Terminal.Gui.Analyzers/TGUI001.md
+++ b/Terminal.Gui.Analyzers/TGUI001.md
@@ -10,7 +10,7 @@ When registering an event handler for `Accepting`, you should set Handled to tru
 
 ## Reason for rule
 
-If you do not do this then you may see unpredictable behaviour such as clicking a Button resulting in another `IsDefault` button in the View also firing.
+If you do not do this then you may see unpredictable behaviour such as clicking a Button resulting in another `IsDefaultAcceptView` button in the View also firing.
 
 See:
 
diff --git a/Terminal.Gui/Input/Command.cs b/Terminal.Gui/Input/Command.cs
index 4d1b6d0086..0166b89c10 100644
--- a/Terminal.Gui/Input/Command.cs
+++ b/Terminal.Gui/Input/Command.cs
@@ -32,32 +32,35 @@ public enum Command
     ///     <para>
     ///         The default implementation in <see cref="View"/> calls <see cref="View.RaiseAccepting"/>. If the event is not handled,
     ///         the command is invoked on:
-    ///             - Any peer-view that is a <see cref="Button"/> with <see cref="Button.IsDefault"/> set to <see langword="true"/>.
+    ///             - Any peer-view that is a <see cref="Button"/> with <see cref="Button.IsDefaultAcceptView"/> set to <see langword="true"/>.
     ///             - The <see cref="View.SuperView"/>. This enables default Accept behavior.
     ///     </para>
     /// </summary>
     Accept,
 
     /// <summary>
-    ///     Performs a hot key action (e.g. setting focus, accepting, and/or moving focus to the next View).
+    ///     Activates the View or an item in the View (e.g. a list item or menu item) without necessarily accepting it.
     ///     <para>
-    ///         The default implementation in <see cref="View"/> calls <see cref="View.SetFocus"/> and then
-    ///         <see cref="View.RaiseHandlingHotKey"/>.
+    ///         In some cases, activating a View just sets focus to it, while in others it may trigger an action.
     ///     </para>
-    /// </summary>
-    HotKey,
-
-    /// <summary>
-    ///     Selects the View or an item in the View (e.g. a list item or menu item) without necessarily accepting it.
     ///     <para>
-    ///         The default implementation in <see cref="View"/> calls <see cref="View.RaiseSelecting"/>.
+    ///         The default implementation in <see cref="View"/> calls <see cref="View.RaiseActivating"/>.
     ///     </para>
     /// </summary>
-    Select,
+    Activate,
 
     #endregion
 
-    #region Movement Commands
+    #region Navigation Commands
+
+    /// <summary>
+    ///     Performs a hot key action (e.g. setting focus, accepting, and/or moving focus to the next View).
+    ///     <para>
+    ///         The default implementation in <see cref="View"/> calls <see cref="View.SetFocus"/> and then
+    ///         <see cref="View.RaiseHandlingHotKey"/>.
+    ///     </para>
+    /// </summary>
+    HotKey,
 
     /// <summary>Moves up one (cell, line, etc...).</summary>
     Up,
diff --git a/Terminal.Gui/ViewBase/View.Command.cs b/Terminal.Gui/ViewBase/View.Command.cs
index ca8de67a16..325854396f 100644
--- a/Terminal.Gui/ViewBase/View.Command.cs
+++ b/Terminal.Gui/ViewBase/View.Command.cs
@@ -21,7 +21,7 @@ private void SetupCommands ()
         // HotKey - SetFocus and raise HandlingHotKey
         AddCommand (
                     Command.HotKey,
-                    (ctx) =>
+                    ctx =>
                     {
                         if (RaiseHandlingHotKey (ctx) is true)
                         {
@@ -35,19 +35,19 @@ private void SetupCommands ()
                         return true;
                     });
 
-        // Space or single-click - Raise Selecting
+        // Space or single-click - Raise Activating
         AddCommand (
-                    Command.Select,
+                    Command.Activate,
                     ctx =>
                     {
-                        if (RaiseSelecting (ctx) is true)
+                        if (RaiseActivating (ctx) is true)
                         {
                             return true;
                         }
 
                         if (CanFocus)
                         {
-                            // For Select, if the view is focusable and SetFocus succeeds, by defition,
+                            // For Activate, if the view is focusable and SetFocus succeeds, by defition,
                             // the event is handled. So return what SetFocus returns.
                             return SetFocus ();
                         }
@@ -106,7 +106,7 @@ private void SetupCommands ()
     /// <remarks>
     ///     <para>
     ///         The <see cref="Accepting"/> event should be raised after the state of the View has changed (after
-    ///         <see cref="Selecting"/> is raised).
+    ///         <see cref="Activating"/> is raised).
     ///     </para>
     ///     <para>
     ///         If the Accepting event is not handled, <see cref="Command.Accept"/> will be invoked on the SuperView, enabling
@@ -115,7 +115,7 @@ private void SetupCommands ()
     ///     <para>
     ///         If a peer-View raises the Accepting event and the event is not cancelled, the <see cref="Command.Accept"/> will
     ///         be invoked on the
-    ///         first Button in the SuperView that has <see cref="Button.IsDefault"/> set to <see langword="true"/>.
+    ///         first Button in the SuperView that has <see cref="Button.IsDefaultAcceptView"/> set to <see langword="true"/>.
     ///     </para>
     /// </remarks>
     /// <returns>
@@ -131,31 +131,29 @@ private void SetupCommands ()
 
         // Best practice is to invoke the virtual method first.
         // This allows derived classes to handle the event and potentially cancel it.
-        Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Calling OnAccepting...");
+        //Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Calling OnAccepting...");
         args.Handled = OnAccepting (args) || args.Handled;
 
         if (!args.Handled && Accepting is { })
         {
             // If the event is not canceled by the virtual method, raise the event to notify any external subscribers.
-            Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Raising Accepting...");
+            //Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Raising Accepting...");
             Accepting?.Invoke (this, args);
         }
 
         // Accept is a special case where if the event is not canceled, the event is
-        //  - Invoked on any peer-View with IsDefault == true
-        //  - bubbled up the SuperView hierarchy.
+        //  - Invoked on any peer-View where IDefaultAcceptView.GetIsDefaultAcceptView() returns true
+        //  - propagated up the SuperView hierarchy.
         if (!args.Handled)
         {
-            // If there's an IsDefault peer view in SubViews, try it
-            View? isDefaultView = SuperView?.InternalSubViews.FirstOrDefault (v => v is Button { IsDefault: true });
+            // If there's a default accept view peer view in SubViews, try it
+            View? defaultAcceptView = SuperView?.InternalSubViews.FirstOrDefault (v => v is IDefaultAcceptView defaultAccept && defaultAccept.GetIsDefaultAcceptView ());
 
-            if (isDefaultView != this && isDefaultView is Button { IsDefault: true } button)
+            if (defaultAcceptView != this && defaultAcceptView is IDefaultAcceptView defaultAccept && defaultAccept.GetIsDefaultAcceptView ())
             {
-                // TODO: It's a bit of a hack that this uses KeyBinding. There should be an InvokeCommmand that 
-                // TODO: is generic?
 
-                Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - InvokeCommand on Default View ({isDefaultView.Title})");
-                bool? handled = isDefaultView.InvokeCommand (Command.Accept, ctx);
+                Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - InvokeCommand on Default Accept View ({defaultAcceptView?.Title})");
+                bool? handled = defaultAcceptView?.InvokeCommand (Command.Accept, ctx);
 
                 if (handled == true)
                 {
@@ -165,7 +163,7 @@ private void SetupCommands ()
 
             if (SuperView is { })
             {
-                Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Invoking Accept on SuperView ({SuperView.Title}/{SuperView.Id})...");
+                Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Invoking {Command.Accept} on SuperView ({SuperView.Title}/{SuperView.Id})...");
 
                 return SuperView?.InvokeCommand (Command.Accept, ctx);
             }
@@ -174,6 +172,56 @@ private void SetupCommands ()
         return args.Handled;
     }
 
+    /// <summary>
+    ///     When a View implements this interface, it will act as the default handler for <see cref="Command.Accept"/>.
+    /// </summary>
+    public interface IDefaultAcceptView
+    {
+        /// <summary>
+        ///     Gets whether the <see cref="View"/> will act as the default handler for <see cref="Command.Accept"/>
+        ///     commands on the <see cref="View.SuperView"/>.
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         If <see langword="true"/>:
+        ///     </para>
+        ///     <para>
+        ///         - The View will display an indicator that it is the default View.
+        ///     </para>
+        ///     <para>
+        ///         - If the view does not handle <see cref="Command.Accept"/>, <see cref="Command.Accept"/> will be
+        ///         invoked on the SuperView.
+        ///     </para>
+        ///     <para>
+        ///         - If a peer-View receives <see cref="Command.Accept"/> and does not handle it, the command will be passed to
+        ///         the first View in the SuperView that returns <see langword="true"/>.
+        ///     </para>
+        /// </remarks>
+        public bool GetIsDefaultAcceptView ();
+
+        /// <summary>
+        ///     Sets whether the <see cref="View"/> will act as the default handler for <see cref="Command.Accept"/>
+        ///     commands on the <see cref="View.SuperView"/>.
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         If <see langword="true"/>:
+        ///     </para>
+        ///     <para>
+        ///         - The View will display an indicator that it is the default View.
+        ///     </para>
+        ///     <para>
+        ///         - If the view does not handle <see cref="Command.Accept"/>, <see cref="Command.Accept"/> will be
+        ///         invoked on the SuperView.
+        ///     </para>
+        ///     <para>
+        ///         - If a peer-View receives <see cref="Command.Accept"/> and does not handle it, the command will be passed to
+        ///         the first View in the SuperView that returns <see langword="true"/>.
+        ///     </para>
+        /// </remarks>
+        public void SetIsDefaultAcceptView (bool value);
+    }
+
     /// <summary>
     ///     Called when the user is accepting the state of the View and the <see cref="Command.Accept"/> has been invoked.
     ///     Set CommandEventArgs.Handled to <see langword="true"/> and return <see langword="true"/> to indicate the event was
@@ -202,12 +250,12 @@ private void SetupCommands ()
     public event EventHandler<CommandEventArgs>? Accepting;
 
     /// <summary>
-    ///     Called when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View to change state.
-    ///     Calls <see cref="OnSelecting"/> which can be cancelled; if not cancelled raises <see cref="Accepting"/>.
-    ///     event. The default <see cref="Command.Select"/> handler calls this method.
+    ///     Called when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View to be activated.
+    ///     Calls <see cref="OnActivating"/> which can be cancelled; if not cancelled raises <see cref="Accepting"/>.
+    ///     event. The default <see cref="Command.Activate"/> handler calls this method.
     /// </summary>
     /// <remarks>
-    ///     The <see cref="Selecting"/> event should be raised after the state of the View has been changed and before see
+    ///     The <see cref="Activating"/> event should be raised after the state of the View has been changed and before see
     ///     <see cref="Accepting"/>.
     /// </remarks>
     /// <returns>
@@ -216,47 +264,58 @@ private void SetupCommands ()
     ///     continue.
     ///     <see langword="true"/> if the event was raised and handled (or cancelled); input processing should stop.
     /// </returns>
-    protected bool? RaiseSelecting (ICommandContext? ctx)
+    protected bool? RaiseActivating (ICommandContext? ctx)
     {
-        //Logging.Debug ($"{Title} ({ctx?.Source?.Title})");
+        Logging.Debug ($"{Title} ({ctx?.Source?.Title})");
         CommandEventArgs args = new () { Context = ctx };
 
         // Best practice is to invoke the virtual method first.
         // This allows derived classes to handle the event and potentially cancel it.
-        if (OnSelecting (args) || args.Handled)
+        if (OnActivating (args) || args.Handled)
         {
             return true;
         }
 
         // If the event is not canceled by the virtual method, raise the event to notify any external subscribers.
-        Selecting?.Invoke (this, args);
+        Activating?.Invoke (this, args);
+
+        //// Activate is a special case where if the event is not canceled, the event is
+        ////  - propagated up the SuperView hierarchy.
+        //if (!args.Handled)
+        //{
+        //    if (SuperView is { })
+        //    {
+        //        Logging.Debug ($"{Title} ({ctx?.Source?.Title}) - Invoking {ctx!.Command} on SuperView ({SuperView.Title}/{SuperView.Id})...");
 
-        return Selecting is null ? null : args.Handled;
+        //        return SuperView?.InvokeCommand (ctx!.Command, ctx);
+        //    }
+        //}
+
+        return Activating is null ? null : args.Handled;
     }
 
     /// <summary>
-    ///     Called when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View to change state.
+    ///     Called when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View to be activated.
     ///     Set CommandEventArgs.Handled to <see langword="true"/> and return <see langword="true"/> to indicate the event was
     ///     handled and processing should stop.
     /// </summary>
     /// <param name="args">The event arguments.</param>
     /// <returns><see langword="true"/> to stop processing.</returns>
-    protected virtual bool OnSelecting (CommandEventArgs args) { return false; }
+    protected virtual bool OnActivating (CommandEventArgs args) { return false; }
 
     /// <summary>
-    ///     Cancelable event raised when the user has performed an action (e.g. <see cref="Command.Select"/>) causing the View
-    ///     to change state.
+    ///     Cancelable event raised when the user has performed an action (e.g. <see cref="Command.Activate"/>) causing the View
+    ///     be activated.
     ///     Set CommandEventArgs.Handled to <see langword="true"/> to indicate the event was handled and processing should
     ///     stop.
     /// </summary>
-    public event EventHandler<CommandEventArgs>? Selecting;
+    public event EventHandler<CommandEventArgs>? Activating;
 
     /// <summary>
     ///     Called when the View is handling the user pressing the View's <see cref="HotKey"/>s. Calls
     ///     <see cref="OnHandlingHotKey"/> which can be cancelled; if not cancelled raises <see cref="Accepting"/>.
     ///     event. The default <see cref="Command.HotKey"/> handler calls this method.
     /// </summary>
-    /// <param name="ctx">The context to pass with the command.</param>
     /// <returns>
     ///     <see langword="null"/> if no event was raised; input processing should continue.
     ///     <see langword="false"/> if the event was raised and was not handled (or cancelled); input processing should
@@ -265,6 +324,7 @@ private void SetupCommands ()
     /// </returns>
     protected bool? RaiseHandlingHotKey (ICommandContext? ctx)
     {
+        //CommandEventArgs args = new () { Context = new CommandContext<KeyBinding> { Command = Command.HotKey } };
         CommandEventArgs args = new () { Context = ctx };
         //Logging.Debug ($"{Title} ({args.Context?.Source?.Title})");
 
@@ -372,7 +432,7 @@ private void SetupCommands ()
     ///     <see langword="true"/> if the command was invoked the command was handled (or cancelled); input processing should
     ///     stop.
     /// </returns>
-    public bool? InvokeCommands<TBindingType> (Command [] commands, TBindingType binding)
+    public bool? InvokeCommands<TBindingType> (Command [] commands, TBindingType binding) where TBindingType : IInputBinding
     {
         bool? toReturn = null;
 
@@ -411,7 +471,7 @@ private void SetupCommands ()
     ///     <see langword="true"/> if the command was invoked the command was handled (or cancelled); input processing should
     ///     stop.
     /// </returns>
-    public bool? InvokeCommand<TBindingType> (Command command, TBindingType binding)
+    public bool? InvokeCommand<TBindingType> (Command command, TBindingType binding) where TBindingType : IInputBinding
     {
         if (!_commandImplementations.TryGetValue (command, out CommandImplementation? implementation))
         {
@@ -475,4 +535,4 @@ private void SetupCommands ()
                                     Binding = null
                                 });
     }
-}
+}
\ No newline at end of file
diff --git a/Terminal.Gui/ViewBase/View.Keyboard.cs b/Terminal.Gui/ViewBase/View.Keyboard.cs
index 8f9a5127ae..f1547df552 100644
--- a/Terminal.Gui/ViewBase/View.Keyboard.cs
+++ b/Terminal.Gui/ViewBase/View.Keyboard.cs
@@ -9,7 +9,7 @@ public partial class View // Keyboard APIs
     private void SetupKeyboard ()
     {
         KeyBindings = new (this);
-        KeyBindings.Add (Key.Space, Command.Select);
+        KeyBindings.Add (Key.Space, Command.Activate);
         KeyBindings.Add (Key.Enter, Command.Accept);
 
         HotKeyBindings = new (this);
@@ -277,6 +277,7 @@ private void SetHotKeyFromTitle ()
     /// <returns><see langword="true"/> if the event was handled.</returns>
     public bool NewKeyDownEvent (Key key)
     {
+        Logging.Debug($"{Id} - {key}");
         if (!Enabled)
         {
             return false;
diff --git a/Terminal.Gui/ViewBase/View.Layout.cs b/Terminal.Gui/ViewBase/View.Layout.cs
index 175c35e34b..1744528638 100644
--- a/Terminal.Gui/ViewBase/View.Layout.cs
+++ b/Terminal.Gui/ViewBase/View.Layout.cs
@@ -1419,6 +1419,11 @@ out int ny
         return result;
     }
 
+    internal static View? GetDeepestViewUnderLocation (View? root, in Point location, ViewportSettingsFlags excludeViewportSettingsFlags = ViewportSettingsFlags.None)
+    {
+       return GetViewsUnderLocation (root, location, excludeViewportSettingsFlags).LastOrDefault ();
+    }
+
     #endregion Utilities
 
     #region Diagnostics and Verification
diff --git a/Terminal.Gui/ViewBase/View.Mouse.cs b/Terminal.Gui/ViewBase/View.Mouse.cs
index c899c2d2e6..e27e772308 100644
--- a/Terminal.Gui/ViewBase/View.Mouse.cs
+++ b/Terminal.Gui/ViewBase/View.Mouse.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Diagnostics;
 
 namespace Terminal.Gui.ViewBase;
 
@@ -18,12 +19,14 @@ private void SetupMouse ()
         MouseHeldDown = new MouseHeldDown (this, App?.TimedEvents, App?.Mouse);
         MouseBindings = new ();
 
-        // TODO: Should the default really work with any button or just button1?
-        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button2Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button3Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button4Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Select);
+        // In-line with Keyboard:
+        //    - Single click: Activate the View (e.g. focus it)
+        //    - Double click: Accept the View (e.g. invoke Accept event)
+        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Activate);
+        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
+
+        // TODO: Determine why this was added. What reason is there for Ctrl+Click to activate a View by default?
+        //MouseBindings.Add (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Activate);
     }
 
     /// <summary>
@@ -45,9 +48,11 @@ private void SetupMouse ()
             return null;
         }
 
+        //Logging.Debug ($"{mouseEventArgs.Flags};{mouseEventArgs.Position}");
+
         binding.MouseEventArgs = mouseEventArgs;
 
-        return InvokeCommands (binding.Commands, binding);
+        return InvokeCommands<MouseBinding> (binding.Commands, binding);
     }
 
     #region MouseEnterLeave
@@ -237,7 +242,8 @@ protected virtual void OnMouseLeave () { }
     ///     </para>
     ///     <para>
     ///         This method raises <see cref="RaiseMouseEvent"/>/<see cref="MouseEvent"/>; if not handled, and one of the
-    ///         mouse buttons was clicked, the <see cref="RaiseMouseClickEvent"/>/<see cref="MouseClick"/> event will be raised
+    ///         mouse buttons was clicked, the <see cref="RaiseMouseClickedAndActivatingEvents"/>/<see cref="MouseClick"/>
+    ///         event will be raised
     ///     </para>
     ///     <para>
     ///         If <see cref="WantContinuousButtonPressed"/> is <see langword="true"/>, and the user presses and holds the
@@ -273,17 +279,18 @@ protected virtual void OnMouseLeave () { }
         }
 
         // Post-Conditions
+
+        // Deal with cases where we need to highlight or continuous press events are desired
         if (HighlightStates != MouseState.None || WantContinuousButtonPressed)
         {
             if (WhenGrabbedHandlePressed (mouseEvent))
             {
-                return mouseEvent.Handled;
+                // If we raised Clicked/Activated on the grabbed view, we are done
+                // regardless of whether the event was handled.
+                return true;
             }
 
-            if (WhenGrabbedHandleReleased (mouseEvent))
-            {
-                return mouseEvent.Handled;
-            }
+            WhenGrabbedHandleReleased (mouseEvent);
 
             if (WhenGrabbedHandleClicked (mouseEvent))
             {
@@ -295,7 +302,9 @@ protected virtual void OnMouseLeave () { }
         // it did not handle the press/release/clicked events via HandlePress/HandleRelease/HandleClicked
         if (mouseEvent.IsSingleDoubleOrTripleClicked)
         {
-            return RaiseMouseClickEvent (mouseEvent);
+            Logging.Debug ($"{mouseEvent.Flags};{mouseEvent.Position}");
+
+            return RaiseMouseClickedAndActivatingEvents (mouseEvent);
         }
 
         if (mouseEvent.IsWheel)
@@ -354,119 +363,149 @@ public bool RaiseMouseEvent (MouseEventArgs mouseEvent)
     /// </remarks>
     public event EventHandler<MouseEventArgs>? MouseEvent;
 
+
+    /// <summary>
+    ///     INTERNAL: Raises a new mouse event for the deepest view under the specified mouse position. Useful for unit tests
+    ///     where using Application.RaiseMouseEvent is not possible.
+    /// </summary>
+    /// <param name="view"></param>
+    /// <param name="mouseEvent"></param>
+    /// <returns></returns>
+    internal static bool? NewMouseEvent (View? view, MouseEventArgs mouseEvent)
+    {
+        View? deepestView = GetDeepestViewUnderLocation (view, mouseEvent.Position);
+
+        return deepestView?.NewMouseEvent (mouseEvent);
+    }
+
     #endregion Low Level Mouse Events
 
-    #region Mouse Pressed Events
+    #region Mouse Grabbed Handling
 
     /// <summary>
-    ///     INTERNAL For cases where the view is grabbed and the mouse is clicked, this method handles the released event
-    ///     (typically
-    ///     when <see cref="WantContinuousButtonPressed"/> or <see cref="HighlightStates"/> are set).
+    ///     INTERNAL: For cases where the view is grabbed and the mouse is pressed, this method handles the pressed events from
+    ///     the driver.
+    ///     When  <see cref="WantContinuousButtonPressed"/> is set, this method will raise the Clicked/Activating event
+    ///     each time it is called (after the first time the mouse is pressed).
     /// </summary>
-    /// <remarks>
-    ///     Marked internal just to support unit tests
-    /// </remarks>
     /// <param name="mouseEvent"></param>
-    /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
-    internal bool WhenGrabbedHandleReleased (MouseEventArgs mouseEvent)
+    /// <returns><see langword="true"/>, if processing should stop, <see langword="false"/> otherwise.</returns>
+    private bool WhenGrabbedHandlePressed (MouseEventArgs mouseEvent)
     {
+        if (!mouseEvent.IsPressed)
+        {
+            return false;
+        }
+
+        Debug.Assert (!mouseEvent.Handled);
         mouseEvent.Handled = false;
 
-        if (mouseEvent.IsReleased)
+        // The first time we get pressed event, grab the mouse and set focus
+        if (App?.Mouse.MouseGrabView != this)
         {
-            if (App?.Mouse.MouseGrabView == this)
+            App?.Mouse.GrabMouse (this);
+
+            if (!HasFocus && CanFocus)
             {
-                //Logging.Debug ($"{Id} - {MouseState}");
-                MouseState &= ~MouseState.Pressed;
-                MouseState &= ~MouseState.PressedOutside;
+                // Set the focus, but don't invoke Accept
+                SetFocus ();
             }
 
-            return mouseEvent.Handled = true;
+            // This prevents raising Clicked/Activating the first time the mouse is pressed.
+            mouseEvent.Handled = true;
         }
 
-        return false;
+        if (Viewport.Contains (mouseEvent.Position))
+        {
+            //Logging.Debug ($"{Id} - Inside Viewport: {MouseState}");
+            // The mouse is inside.
+            if (HighlightStates.HasFlag (MouseState.Pressed))
+            {
+                MouseState |= MouseState.Pressed;
+            }
+
+            // Always clear PressedOutside when the mouse is pressed inside the Viewport
+            MouseState &= ~MouseState.PressedOutside;
+        }
+
+        if (!Viewport.Contains (mouseEvent.Position))
+        {
+            // Logging.Debug ($"{Id} - Outside Viewport: {MouseState}");
+            // The mouse is outside.
+            // When WantContinuousButtonPressed is set we want to keep the mouse state as pressed (e.g. a repeating button).
+            // This shows the user that the button is doing something, even if the mouse is outside the Viewport.
+            if (HighlightStates.HasFlag (MouseState.PressedOutside) && !WantContinuousButtonPressed)
+            {
+                MouseState |= MouseState.PressedOutside;
+            }
+        }
+
+        return mouseEvent.Handled = true;
     }
 
     /// <summary>
-    ///     INTERNAL For cases where the view is grabbed and the mouse is clicked, this method handles the released event
+    ///     INTERNAL: For cases where the view is grabbed, this method handles the released events from the driver
     ///     (typically
     ///     when <see cref="WantContinuousButtonPressed"/> or <see cref="HighlightStates"/> are set).
     /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         Marked internal just to support unit tests
-    ///     </para>
-    /// </remarks>
     /// <param name="mouseEvent"></param>
-    /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
-    private bool WhenGrabbedHandlePressed (MouseEventArgs mouseEvent)
+    /// <returns><see langword="true"/>, the mouse  <see langword="false"/> otherwise.</returns>
+    internal void WhenGrabbedHandleReleased (MouseEventArgs mouseEvent)
     {
-        mouseEvent.Handled = false;
-
-        if (mouseEvent.IsPressed)
+        if (Application.Mouse.MouseGrabView == this)
         {
-            // The first time we get pressed event, grab the mouse and set focus
-            if (App?.Mouse.MouseGrabView != this)
-            {
-                App?.Mouse.GrabMouse (this);
+            //Logging.Debug ($"{Id} - {MouseState}");
+            MouseState &= ~MouseState.Pressed;
+            MouseState &= ~MouseState.PressedOutside;
+        }
+    }
 
-                if (!HasFocus && CanFocus)
-                {
-                    // Set the focus, but don't invoke Accept
-                    SetFocus ();
-                }
 
-                mouseEvent.Handled = true;
-            }
+    /// <summary>
+    ///     INTERNAL: For cases where the view is grabbed, this method handles the click events from the driver
+    ///     (typically
+    ///     when <see cref="WantContinuousButtonPressed"/> or <see cref="HighlightStates"/> are set).
+    /// </summary>
+    /// <param name="mouseEvent"></param>
+    /// <returns><see langword="true"/>, if processing should stop; <see langword="false"/> otherwise.</returns>
+    internal bool WhenGrabbedHandleClicked (MouseEventArgs mouseEvent)
+    {
+        if (Application.Mouse.MouseGrabView != this || !mouseEvent.IsSingleClicked)
+        {
+            return false;
+        }
 
-            if (Viewport.Contains (mouseEvent.Position))
-            {
-                //Logging.Debug ($"{Id} - Inside Viewport: {MouseState}");
-                // The mouse is inside.
-                if (HighlightStates.HasFlag (MouseState.Pressed))
-                {
-                    MouseState |= MouseState.Pressed;
-                }
-
-                // Always clear PressedOutside when the mouse is pressed inside the Viewport
-                MouseState &= ~MouseState.PressedOutside;
-            }
+        Logging.Debug ($"{mouseEvent.Flags};{mouseEvent.Position}");
 
-            if (!Viewport.Contains (mouseEvent.Position))
-            {
-                // Logging.Debug ($"{Id} - Outside Viewport: {MouseState}");
-                // The mouse is outside.
-                // When WantContinuousButtonPressed is set we want to keep the mouse state as pressed (e.g. a repeating button).
-                // This shows the user that the button is doing something, even if the mouse is outside the Viewport.
-                if (HighlightStates.HasFlag (MouseState.PressedOutside) && !WantContinuousButtonPressed)
-                {
-                    MouseState |= MouseState.PressedOutside;
-                }
-            }
+        // We're grabbed. Clicked event comes after the last Release. This is our signal to ungrab
+        Application.Mouse.UngrabMouse ();
 
-            return mouseEvent.Handled = true;
-        }
+        // TODO: Prove we need to unset MouseState.Pressed and MouseState.PressedOutside here
+        // TODO: There may be perf gains if we don't unset these flags here
+        MouseState &= ~MouseState.Pressed;
+        MouseState &= ~MouseState.PressedOutside;
 
-        return false;
+        // If mouse is still in bounds, return false to indicate a click should be raised.
+        return WantMousePositionReports || !Viewport.Contains (mouseEvent.Position);
     }
 
-    #endregion Mouse Pressed Events
+    #endregion Mouse Grabbed Handling
 
     #region Mouse Click Events
 
-    /// <summary>Raises the <see cref="OnMouseClick"/>/<see cref="MouseClick"/> event.</summary>
+    /// <summary>
+    ///     Low-level API. Raises <see cref="OnMouseClick"/>/<see cref="MouseClick"/> an followed by
+    ///     <see cref="OnActivating"/>/<see cref="Activating"/>.
+    /// </summary>
     /// <remarks>
     ///     <para>
-    ///         Called when the mouse is either clicked or double-clicked.
-    ///     </para>
-    ///     <para>
     ///         If <see cref="WantContinuousButtonPressed"/> is <see langword="true"/>, will be invoked on every mouse event
     ///         where
     ///         the mouse button is pressed.
     ///     </para>
     /// </remarks>
     /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
-    protected bool RaiseMouseClickEvent (MouseEventArgs args)
+    protected bool RaiseMouseClickedAndActivatingEvents (MouseEventArgs args)
     {
         // Pre-conditions
         if (!Enabled)
@@ -475,7 +514,11 @@ protected bool RaiseMouseClickEvent (MouseEventArgs args)
             return args.Handled = false;
         }
 
-        // Cancellable event
+        Debug.Assert (!args.Handled);
+
+        Logging.Debug ($"{args.Flags};{args.Position}");
+
+#if MOUSE_CLICK
         if (OnMouseClick (args) || args.Handled)
         {
             return args.Handled;
@@ -487,23 +530,48 @@ protected bool RaiseMouseClickEvent (MouseEventArgs args)
         {
             return true;
         }
+#endif
 
-        // Post-conditions
+        MouseEventArgs clickedArgs = new ();
 
-        // By default, this will raise Selecting/OnSelecting - Subclasses can override this via AddCommand (Command.Select ...).
-        args.Handled = InvokeCommandsBoundToMouse (args) == true;
+        if (args.IsPressed)
+        {
+            // If the mouse is pressed, we want to invoke the related clicked event.
+            clickedArgs.Flags = args.Flags switch
+            {
+                MouseFlags.Button1Pressed => MouseFlags.Button1Clicked,
+                MouseFlags.Button2Pressed => MouseFlags.Button2Clicked,
+                MouseFlags.Button3Pressed => MouseFlags.Button3Clicked,
+                MouseFlags.Button4Pressed => MouseFlags.Button4Clicked,
+                _ => clickedArgs.Flags
+            };
+        }
+        else
+        {
+            clickedArgs.Flags = args.Flags;
+        }
+
+        clickedArgs.Position = args.Position;
+        clickedArgs.ScreenPosition = args.ScreenPosition;
+        clickedArgs.View = args.View;
+
+        // By default, this will raise Activating/OnActivating - Subclasses can override this via
+        // ReplaceCommand (Command.Activate ...).
+        args.Handled = InvokeCommandsBoundToMouse (clickedArgs) == true;
 
         return args.Handled;
     }
 
+    // see https://github.com/gui-cs/Terminal.Gui/issues/4167#issuecomment-2997271982
+#if MOUSE_CLICK
     /// <summary>
-    ///     Called when a mouse click occurs. Check <see cref="MouseEventArgs.Flags"/> to see which button was clicked.
+    ///     Low-level conveience API. Called when any mouse button has been clicked. Inspect the event args to determine
+    ///     which button was clicked. Note, creating a <see cref="MouseBindings"/> and using to <see cref="OnActivating"/>/
+    ///     <see cref="Activating"/> is
+    ///     recommended instead of using this event directly.
     /// </summary>
     /// <remarks>
     ///     <para>
-    ///         Called when the mouse is either clicked or double-clicked.
-    ///     </para>
-    ///     <para>
     ///         If <see cref="WantContinuousButtonPressed"/> is <see langword="true"/>, will be called on every mouse event
     ///         where
     ///         the mouse button is pressed.
@@ -513,12 +581,14 @@ protected bool RaiseMouseClickEvent (MouseEventArgs args)
     /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
     protected virtual bool OnMouseClick (MouseEventArgs args) { return false; }
 
-    /// <summary>Raised when a mouse click occurs.</summary>
+    /// <summary>
+    ///     Low-level conveience API. Raised when any mouse button has been clicked. Inspect the event args to determine
+    ///     which button was clicked. Note, creating a <see cref="MouseBindings"/> and using to <see cref="OnActivating"/>/
+    ///     <see cref="Activating"/> is
+    ///     recommended instead of using this event directly.
+    /// </summary>
     /// <remarks>
     ///     <para>
-    ///         Raised when the mouse is either clicked or double-clicked.
-    ///     </para>
-    ///     <para>
     ///         If <see cref="WantContinuousButtonPressed"/> is <see langword="true"/>, will be raised on every mouse event
     ///         where
     ///         the mouse button is pressed.
@@ -562,11 +632,17 @@ internal bool WhenGrabbedHandleClicked (MouseEventArgs mouseEvent)
         return false;
     }
 
+#endif
+
     #endregion Mouse Clicked Events
 
     #region Mouse Wheel Events
 
-    /// <summary>Raises the <see cref="OnMouseWheel"/>/<see cref="MouseWheel"/> event.</summary>
+    /// <summary>
+    ///     Low-level API. Raises the <see cref="OnMouseWheel"/>/<see cref="MouseWheel"/> event.
+    ///     Binding to a movement or scolling command (e.g. <see cref="Command.ScrollDown"/>) with
+    ///     <see cref="MouseBindings"/> is recommended instead of using this event directly.
+    /// </summary>
     /// <remarks>
     /// </remarks>
     /// <returns><see langword="true"/>, if the event was handled, <see langword="false"/> otherwise.</returns>
@@ -642,6 +718,8 @@ internal set
         }
     }
 
+    private MouseState _highlightStates;
+
     /// <summary>
     ///     Gets or sets which <see cref="MouseState"/> changes should cause the View to change its appearance.
     /// </summary>
@@ -664,7 +742,35 @@ internal set
     ///         <see langword="true"/>, in which case the flag has no effect.
     ///     </para>
     /// </remarks>
-    public MouseState HighlightStates { get; set; }
+    public MouseState HighlightStates
+    {
+        get => _highlightStates;
+        set
+        {
+            CWPPropertyHelper.ChangeProperty (
+                                                             ref _highlightStates,
+                                                             value,
+                                                             null,
+                                                             null,
+                                                             newValue => _highlightStates = newValue,
+                                                             OnHighlightStatesChanged,
+                                                             HighlightStatesChanged,
+                                                             out MouseState finalValue);
+        }
+    }
+
+    /// <summary>
+    ///     Called after the <see cref="HighlightStates"/> property changes, allowing subclasses to react to the change.
+    /// </summary>
+    /// <param name="args">The event arguments containing the old and new scheme name.</param>
+    protected virtual void OnHighlightStatesChanged (ValueChangedEventArgs<MouseState> args)
+    {
+    }
+
+    /// <summary>
+    ///     Raised after the <see cref="HighlightStates"/> property changes, notifying handlers of the completed change.
+    /// </summary>
+    public event EventHandler<ValueChangedEventArgs<MouseState>>? HighlightStatesChanged;
 
     /// <summary>
     ///     INTERNAL Raises the <see cref="MouseStateChanged"/> event.
@@ -680,13 +786,15 @@ private void RaiseMouseStateChanged (EventArgs<MouseState> args)
     }
 
     /// <summary>
-    ///     Called when <see cref="MouseState"/> has changed, indicating the View should be highlighted or not. The <see cref="MouseState"/> passed in the event
+    ///     Called when <see cref="MouseState"/> has changed, indicating the View should be highlighted or not. The
+    ///     <see cref="MouseState"/> passed in the event
     ///     indicates the highlight style that will be applied.
     /// </summary>
     protected virtual void OnMouseStateChanged (EventArgs<MouseState> args) { }
 
     /// <summary>
-    ///     RaisedCalled when <see cref="MouseState"/> has changed, indicating the View should be highlighted or not. The <see cref="MouseState"/> passed in the event
+    ///     RaisedCalled when <see cref="MouseState"/> has changed, indicating the View should be highlighted or not. The
+    ///     <see cref="MouseState"/> passed in the event
     ///     indicates the highlight style that will be applied.
     /// </summary>
     public event EventHandler<EventArgs<MouseState>>? MouseStateChanged;
diff --git a/Terminal.Gui/Views/Bar.cs b/Terminal.Gui/Views/Bar.cs
index 3c04a16dc4..b6bae7810e 100644
--- a/Terminal.Gui/Views/Bar.cs
+++ b/Terminal.Gui/Views/Bar.cs
@@ -313,10 +313,12 @@ public virtual bool EnableForDesign ()
             Text = "Czech",
             CommandView = new CheckBox ()
             {
-                Title = "_Check"
+                Title = "_Check",
+                // Best practice for CheckBoxes in bars is to disable focus and highlight states
+                CanFocus = false,
+                HighlightStates = MouseState.None
             },
             Key = Key.F9,
-            CanFocus = false
         };
 
         Add (shortcut);
diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs
index b003d0c759..65d6600be3 100644
--- a/Terminal.Gui/Views/Button.cs
+++ b/Terminal.Gui/Views/Button.cs
@@ -13,7 +13,7 @@ namespace Terminal.Gui.Views;
 ///     <para>Use <see cref="View.HotKeySpecifier"/> to change the hot key specifier from the default of ('_').</para>
 ///     <para>
 ///         Button can act as the default <see cref="Command.Accept"/> handler for all peer-Views. See
-///         <see cref="IsDefault"/>.
+///         <see cref="IsDefaultAcceptView"/>.
 ///     </para>
 ///     <para>
 ///         Set <see cref="View.WantContinuousButtonPressed"/> to <see langword="true"/> to have the
@@ -21,7 +21,7 @@ namespace Terminal.Gui.Views;
 ///         invoked repeatedly while the button is pressed.
 ///     </para>
 /// </remarks>
-public class Button : View, IDesignable
+public class Button : View, IDesignable, View.IDefaultAcceptView
 {
     private static ShadowStyle _defaultShadow = ShadowStyle.Opaque; // Resources/config.json overrides
     private static MouseState _defaultHighlightStates = MouseState.In | MouseState.Pressed | MouseState.PressedOutside; // Resources/config.json overrides
@@ -30,7 +30,7 @@ public class Button : View, IDesignable
     private readonly Rune _leftDefault;
     private readonly Rune _rightBracket;
     private readonly Rune _rightDefault;
-    private bool _isDefault;
+    private bool _isDefaultAcceptView;
 
     /// <summary>
     ///     Gets or sets whether <see cref="Button"/>s are shown with a shadow effect by default.
@@ -75,8 +75,13 @@ public Button ()
         KeyBindings.Remove (Key.Enter);
         KeyBindings.Add (Key.Enter, Command.HotKey);
 
+        MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked, Command.HotKey);
+        MouseBindings.ReplaceCommands (MouseFlags.Button2Clicked, Command.HotKey);
+        MouseBindings.ReplaceCommands (MouseFlags.Button3Clicked, Command.HotKey);
+        MouseBindings.ReplaceCommands (MouseFlags.Button4Clicked, Command.HotKey);
+
         TitleChanged += Button_TitleChanged;
-        MouseClick += Button_MouseClick;
+        //MouseClick += Button_MouseClick;
 
         base.ShadowStyle = DefaultShadow;
         HighlightStates = DefaultHighlightStates;
@@ -89,9 +94,9 @@ public Button ()
 
     private bool? HandleHotKeyCommand (ICommandContext commandContext)
     {
-        bool cachedIsDefault = IsDefault; // Supports "Swap Default" in Buttons scenario where IsDefault changes
+        bool cachedIsDefault = IsDefaultAcceptView; // Supports "Swap Default" in Buttons scenario where IsDefaultAcceptView changes
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
@@ -105,7 +110,7 @@ public Button ()
 
         SetFocus ();
 
-        // TODO: If `IsDefault` were a property on `View` *any* View could work this way. That's theoretical as
+        // TODO: If `IsDefaultAcceptView` were a property on `View` *any* View could work this way. That's theoretical as
         // TODO: no use-case has been identified for any View other than Button to act like this.
         // If Accept was not handled...
         if (cachedIsDefault && SuperView is { })
@@ -147,47 +152,35 @@ public override Rune HotKeySpecifier
     }
 
     /// <summary>
-    ///     Gets or sets whether the <see cref="Button"/> will act as the default handler for <see cref="Command.Accept"/>
-    ///     commands on the <see cref="View.SuperView"/>.
+    ///     Helper for <see cref="GetIsDefaultAcceptView"/> and <see cref="SetIsDefaultAcceptView"/>.
     /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         If <see langword="true"/>:
-    ///     </para>
-    ///     <para>
-    ///         - The Button will display an indicator that it is the default Button.
-    ///     </para>
-    ///     <para>
-    ///         - When clicked, if the Accepting event is not handled, <see cref="Command.Accept"/> will be
-    ///         invoked on the SuperView.
-    ///     </para>
-    ///     <para>
-    ///         - If a peer-View receives <see cref="Command.Accept"/> and does not handle it, the command will be passed to
-    ///         the
-    ///         first Button in the SuperView that has <see cref="IsDefault"/> set to <see langword="true"/>. See
-    ///         <see cref="View.RaiseAccepting"/> for more information.
-    ///     </para>
-    /// </remarks>
-    public bool IsDefault
+    public bool IsDefaultAcceptView
     {
-        get => _isDefault;
-        set
-        {
-            if (_isDefault == value)
-            {
-                return;
-            }
+        get => GetIsDefaultAcceptView ();
+        set => SetIsDefaultAcceptView (value);
+    }
+
 
-            _isDefault = value;
+    /// <inheritdoc />
+    public bool GetIsDefaultAcceptView () { return _isDefaultAcceptView; }
 
-            UpdateTextFormatterText ();
-            SetNeedsLayout ();
+    /// <inheritdoc />
+    public void SetIsDefaultAcceptView (bool value)
+    {
+        if (_isDefaultAcceptView == value)
+        {
+            return;
         }
+
+        _isDefaultAcceptView = value;
+
+        UpdateTextFormatterText ();
+        SetNeedsLayout ();
     }
 
     /// <summary>
     ///     Gets or sets whether the Button will show decorations or not. If <see langword="true"/> the glyphs that normally
-    ///     bracket the Button Title and the <see cref="IsDefault"/> indicator will not be shown.
+    ///     bracket the Button Title and the <see cref="IsDefaultAcceptView"/> indicator will not be shown.
     /// </summary>
     public bool NoDecorations { get; set; }
 
@@ -224,7 +217,7 @@ protected override void UpdateTextFormatterText ()
         {
             TextFormatter.Text = Text;
         }
-        else if (IsDefault)
+        else if (IsDefaultAcceptView)
         {
             TextFormatter.Text = $"{_leftBracket}{_leftDefault} {Text} {_rightDefault}{_rightBracket}";
         }
diff --git a/Terminal.Gui/Views/CharMap/CharMap.cs b/Terminal.Gui/Views/CharMap/CharMap.cs
index c9adeedb3e..55ef6cd322 100644
--- a/Terminal.Gui/Views/CharMap/CharMap.cs
+++ b/Terminal.Gui/Views/CharMap/CharMap.cs
@@ -45,7 +45,7 @@ public CharMap ()
         AddCommand (Command.ScrollLeft, () => ScrollHorizontal (-1));
 
         AddCommand (Command.Accept, HandleAcceptCommand);
-        AddCommand (Command.Select, HandleSelectCommand);
+        AddCommand (Command.Activate, HandleSelectCommand);
         AddCommand (Command.Context, HandleContextCommand);
 
         KeyBindings.Add (Key.CursorUp, Command.Up);
@@ -58,7 +58,6 @@ public CharMap ()
         KeyBindings.Add (Key.End, Command.End);
         KeyBindings.Add (PopoverMenu.DefaultKey, Command.Context);
 
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
         MouseBindings.ReplaceCommands (MouseFlags.Button3Clicked, Command.Context);
         MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked | MouseFlags.ButtonCtrl, Command.Context);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);
@@ -286,7 +285,7 @@ public UnicodeCategory? ShowUnicodeCategory
 
     private bool? Move (ICommandContext? commandContext, int cpOffset)
     {
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
@@ -865,7 +864,7 @@ public static string ToCamelCase (string str)
             }
         }
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs
index 0dfb47e51a..c9b0103e73 100644
--- a/Terminal.Gui/Views/CheckBox.cs
+++ b/Terminal.Gui/Views/CheckBox.cs
@@ -33,12 +33,12 @@ public CheckBox ()
         // Activate (Space key and single-click) - Raise Activate event and Advance
         // - DO NOT raise Accept
         // - DO NOT SetFocus
-        AddCommand (Command.Select, ActivateAndAdvance);
+        AddCommand (Command.Activate, ActivateAndAdvance);
 
         // Accept (Enter key and double-click) - Raise Accept event
         // - DO NOT advance state
         // The default Accept handler does that.
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Accept);
+        MouseBindings.ReplaceCommands (MouseFlags.Button1DoubleClicked, Command.Accept);
 
         TitleChanged += Checkbox_TitleChanged;
 
@@ -49,7 +49,7 @@ public CheckBox ()
     protected override bool OnHandlingHotKey (CommandEventArgs args)
     {
         // Invoke Activate on ourselves
-        if (InvokeCommand (Command.Select, args.Context) is true)
+        if (InvokeCommand (Command.Activate, args.Context) is true)
         {
             // Default behavior for View is to set Focus on hotkey. We need to return
             // true here to indicate Activate was handled. That will prevent the default
@@ -62,7 +62,7 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
 
     private bool? ActivateAndAdvance (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
diff --git a/Terminal.Gui/Views/Color/ColorPicker.16.cs b/Terminal.Gui/Views/Color/ColorPicker.16.cs
index 23620cfe01..43b27dca8b 100644
--- a/Terminal.Gui/Views/Color/ColorPicker.16.cs
+++ b/Terminal.Gui/Views/Color/ColorPicker.16.cs
@@ -70,7 +70,7 @@ public Point Cursor
     /// <returns></returns>
     private bool MoveDown (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -86,7 +86,7 @@ private bool MoveDown (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveLeft (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -103,7 +103,7 @@ private bool MoveLeft (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveRight (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -119,7 +119,7 @@ private bool MoveRight (ICommandContext? commandContext)
     /// <returns></returns>
     private bool MoveUp (ICommandContext? commandContext)
     {
-        if (RaiseSelecting (commandContext) == true)
+        if (RaiseActivating (commandContext) == true)
         {
             return true;
         }
@@ -195,7 +195,7 @@ private void AddCommands ()
         AddCommand (Command.Up, (ctx) => MoveUp (ctx));
         AddCommand (Command.Down, (ctx) => MoveDown (ctx));
 
-        AddCommand (Command.Select, (ctx) =>
+        AddCommand (Command.Activate, (ctx) =>
                                     {
                                         var set = false;
 
diff --git a/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs b/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
index 5874bec712..1c4a11a44d 100644
--- a/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
+++ b/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
@@ -31,7 +31,7 @@ public static bool Prompt (IApplication app, string title, Attribute? currentAtt
             Y = app.Driver!.Force16Colors ? 6 : 4,
             Text = "Ok",
             Width = Dim.Auto (),
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         btnOk.Accepting += (s, e) =>
diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs
index b2cac5dd1d..6e5e4ca668 100644
--- a/Terminal.Gui/Views/ComboBox.cs
+++ b/Terminal.Gui/Views/ComboBox.cs
@@ -172,7 +172,7 @@ public int SelectedItem
                     SetValue ("", true);
                 }
 
-                OnSelectedChanged ();
+                OnActivatedChanged ();
             }
         }
     }
@@ -351,7 +351,7 @@ public virtual bool OnOpenSelectedItem ()
 
     /// <summary>Invokes the SelectedChanged event if it is defined.</summary>
     /// <returns></returns>
-    public virtual bool OnSelectedChanged ()
+    public virtual bool OnActivatedChanged ()
     {
         // Note: Cannot rely on "listview.SelectedItem != lastSelectedItem" because the list is dynamic. 
         // So we cannot optimize. Ie: Don't call if not changed
@@ -436,7 +436,7 @@ private bool CancelSelected ()
         {
             Text = string.Empty;
             _selectedItem = _lastSelectedItem;
-            OnSelectedChanged ();
+            OnActivatedChanged ();
         }
 
         return Collapse ();
@@ -789,7 +789,7 @@ private void SetValue (object text, bool isFromSelectedItem = false)
         if (!isFromSelectedItem)
         {
             _selectedItem = GetSelectedItemFromSource (_text);
-            OnSelectedChanged ();
+            OnActivatedChanged ();
         }
     }
 
@@ -976,9 +976,9 @@ protected override void OnHasFocusChanged (bool newHasFocus, [CanBeNull] View pr
             }
         }
 
-        public override bool OnSelectedChanged ()
+        public override bool OnActivatedChanged ()
         {
-            bool res = base.OnSelectedChanged ();
+            bool res = base.OnActivatedChanged ();
 
             if (SelectedItem is null)
             {
diff --git a/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs b/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
index 25214cf17e..a84d2ee718 100644
--- a/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
+++ b/Terminal.Gui/Views/FileDialogs/DefaultFileOperations.cs
@@ -133,7 +133,7 @@ public IFileSystemInfo New (IApplication app, IFileSystem fileSystem, IDirectory
     private bool Prompt (string title, string defaultText, out string result)
     {
         var confirm = false;
-        var btnOk = new Button { IsDefault = true, Text = Strings.btnOk };
+        var btnOk = new Button { IsDefaultAcceptView = true, Text = Strings.btnOk };
 
         btnOk.Accepting += (s, e) =>
                          {
diff --git a/Terminal.Gui/Views/FileDialogs/FileDialog.cs b/Terminal.Gui/Views/FileDialogs/FileDialog.cs
index 9f93cdda21..2fc25cbf88 100644
--- a/Terminal.Gui/Views/FileDialogs/FileDialog.cs
+++ b/Terminal.Gui/Views/FileDialogs/FileDialog.cs
@@ -75,7 +75,7 @@ internal FileDialog (IFileSystem? fileSystem)
         {
             X = Pos.Align (Alignment.End, AlignmentModes.AddSpaceBetweenItems, ALIGNMENT_GROUP_COMPLETE),
             Y = Pos.AnchorEnd (),
-            IsDefault = true, Text = Style.OkButtonText
+            IsDefaultAcceptView = true, Text = Style.OkButtonText
         };
 
         _btnOk.Accepting += (s, e) =>
@@ -194,8 +194,8 @@ internal FileDialog (IFileSystem? fileSystem)
             Id = "_tableView"
         };
         _tableView.CollectionNavigator = new FileDialogCollectionNavigator (this, _tableView);
-        _tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
-        _tableView.MouseClick += OnTableViewMouseClick;
+        _tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
+        _tableView.Activating += OnTableViewActivating;
         Style.TableStyle = _tableView.Style;
 
         ColumnStyle nameStyle = Style.TableStyle.GetOrCreateColumnStyle (0);
@@ -1046,29 +1046,38 @@ private void New ()
         }
     }
 
-    private void OnTableViewMouseClick (object? sender, MouseEventArgs e)
+    private void OnTableViewActivating (object? sender, CommandEventArgs commandEventArgs)
     {
-        Point? clickedCell = _tableView.ScreenToCell (e.Position.X, e.Position.Y, out int? clickedCol);
+        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+        {
+            return;
+        }
+
+        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
 
-        if (clickedCol is { })
         {
-            if (e.Flags.HasFlag (MouseFlags.Button1Clicked))
-            {
-                // left click in a header
-                SortColumn (clickedCol.Value);
-            }
-            else if (e.Flags.HasFlag (MouseFlags.Button3Clicked))
+            Point? clickedCell = _tableView.ScreenToCell (e.Position.X, e.Position.Y, out int? clickedCol);
+
+            if (clickedCol is { })
             {
-                // right click in a header
-                ShowHeaderContextMenu (clickedCol.Value, e);
+                if (e.Flags.HasFlag (MouseFlags.Button1Clicked))
+                {
+                    // left click in a header
+                    SortColumn (clickedCol.Value);
+                }
+                else if (e.Flags.HasFlag (MouseFlags.Button3Clicked))
+                {
+                    // right click in a header
+                    ShowHeaderContextMenu (clickedCol.Value, e);
+                }
             }
-        }
-        else
-        {
-            if (clickedCell is { } && e.Flags.HasFlag (MouseFlags.Button3Clicked))
+            else
             {
-                // right click in rest of table
-                ShowCellContextMenu (clickedCell, e);
+                if (clickedCell is { } && e.Flags.HasFlag (MouseFlags.Button3Clicked))
+                {
+                    // right click in rest of table
+                    ShowCellContextMenu (clickedCell, e);
+                }
             }
         }
     }
diff --git a/Terminal.Gui/Views/HexView.cs b/Terminal.Gui/Views/HexView.cs
index b05f0b506e..6f471c7297 100644
--- a/Terminal.Gui/Views/HexView.cs
+++ b/Terminal.Gui/Views/HexView.cs
@@ -57,7 +57,7 @@ public HexView (Stream? source)
         _leftSideHasFocus = true;
         _firstNibble = true;
 
-        AddCommand (Command.Select, HandleMouseClick);
+        AddCommand (Command.Activate, HandleMouseClick);
         AddCommand (Command.Left, () => MoveLeft ());
         AddCommand (Command.Right, () => MoveRight ());
         AddCommand (Command.Down, () => MoveDown (BytesPerLine));
@@ -100,9 +100,7 @@ public HexView (Stream? source)
         KeyBindings.Remove (Key.Space);
         KeyBindings.Remove (Key.Enter);
 
-        // The Select handler deals with both single and double clicks
-        MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked, Command.Select);
-        MouseBindings.Add (MouseFlags.Button1DoubleClicked, Command.Select);
+        MouseBindings.ReplaceCommands (MouseFlags.Button1DoubleClicked, Command.Activate);
         MouseBindings.Add (MouseFlags.WheeledUp, Command.ScrollUp);
         MouseBindings.Add (MouseFlags.WheeledDown, Command.ScrollDown);
 
@@ -363,7 +361,7 @@ public int AddressWidth
             return false;
         }
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
diff --git a/Terminal.Gui/Views/Label.cs b/Terminal.Gui/Views/Label.cs
index c11347f9fc..7d693ec6f2 100644
--- a/Terminal.Gui/Views/Label.cs
+++ b/Terminal.Gui/Views/Label.cs
@@ -23,22 +23,16 @@ public Label ()
         Height = Dim.Auto (DimAutoStyle.Text);
         Width = Dim.Auto (DimAutoStyle.Text);
 
-        // On HoKey, pass it to the next view
-        AddCommand (Command.HotKey, InvokeHotKeyOnNextPeer!);
+        // On HotKey, pass it to the next view
+        AddCommand (Command.HotKey, RaiseHotKeyOnNextPeer);
 
-        TitleChanged += Label_TitleChanged;
-        MouseClick += Label_MouseClick;
-    }
+        // On click, invoke the HotKey command on the next view
+        MouseBindings.ReplaceCommands (MouseFlags.Button1Clicked, Command.HotKey);
 
-    private void Label_MouseClick (object? sender, MouseEventArgs e)
-    {
-        if (!CanFocus)
-        {
-            e.Handled = InvokeCommand<KeyBinding> (Command.HotKey, new ([Command.HotKey], this, this)) == true;
-        }
+        TitleChanged += Label_TitleChanged;
     }
 
-    private void Label_TitleChanged (object? sender, EventArgs<string> e)
+    private void Label_TitleChanged (object sender, EventArgs<string> e)
     {
         base.Text = e.Value;
         TextFormatter.HotKeySpecifier = HotKeySpecifier;
@@ -58,7 +52,7 @@ public override Rune HotKeySpecifier
         set => TextFormatter.HotKeySpecifier = base.HotKeySpecifier = value;
     }
 
-    private bool? InvokeHotKeyOnNextPeer (ICommandContext commandContext)
+    private bool? RaiseHotKeyOnNextPeer (ICommandContext commandContext)
     {
         if (RaiseHandlingHotKey (commandContext) == true)
         {
@@ -77,12 +71,25 @@ public override Rune HotKeySpecifier
 
         if (HotKey.IsValid)
         {
-            // If the Label has a hotkey, we need to find the next view in the subview list
+            // If the Label has a hotkey, we need to find the next peer-view and pass the
+            // command on to it.
             int me = SuperView?.SubViews.IndexOf (this) ?? -1;
 
             if (me != -1 && me < SuperView?.SubViews.Count - 1)
             {
-                return SuperView?.SubViews.ElementAt (me + 1).InvokeCommand (Command.HotKey) == true;
+                View? nextPeer = SuperView?.SubViews.ElementAt (me + 1);
+                if (nextPeer is null)
+                {
+                    return false;
+                }
+
+                // Swap out the key to the HotKey of the target view
+                CommandContext<KeyBinding>? keyCommandContext = new CommandContext<KeyBinding> ()
+                {
+                    Command = Command.HotKey,
+                    Binding = new ([Command.HotKey], nextPeer, data: null),
+                };
+                return nextPeer.InvokeCommand (Command.HotKey, keyCommandContext) == true;
             }
         }
 
diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs
index 453737c85d..970e6842ae 100644
--- a/Terminal.Gui/Views/ListView.cs
+++ b/Terminal.Gui/Views/ListView.cs
@@ -59,10 +59,10 @@ public ListView ()
 
         // Things this view knows how to do
         // 
-        AddCommand (Command.Up, ctx => RaiseSelecting (ctx) == true || MoveUp ());
-        AddCommand (Command.Down, ctx => RaiseSelecting (ctx) == true || MoveDown ());
+        AddCommand (Command.Up, ctx => RaiseActivating (ctx) == true || MoveUp ());
+        AddCommand (Command.Down, ctx => RaiseActivating (ctx) == true || MoveDown ());
 
-        // TODO: add RaiseSelecting to all of these
+        // TODO: add RaiseActivating to all of these
         AddCommand (Command.ScrollUp, () => ScrollVertical (-1));
         AddCommand (Command.ScrollDown, () => ScrollVertical (1));
         AddCommand (Command.PageUp, () => MovePageUp ());
@@ -87,7 +87,7 @@ public ListView ()
 
         // Select (Space key and single-click) - If markable, change mark and raise Select event
         AddCommand (
-                    Command.Select,
+                    Command.Activate,
                     ctx =>
                     {
                         if (!_allowsMarking)
@@ -95,7 +95,7 @@ public ListView ()
                             return false;
                         }
 
-                        if (RaiseSelecting (ctx) == true)
+                        if (RaiseActivating (ctx) == true)
                         {
                             return true;
                         }
@@ -115,7 +115,7 @@ public ListView ()
 
                         SelectedItem = 0;
 
-                        if (RaiseSelecting (ctx) == true)
+                        if (RaiseActivating (ctx) == true)
                         {
                             return true;
                         }
@@ -151,8 +151,8 @@ public ListView ()
 
         KeyBindings.Add (Key.End, Command.End);
 
-        // Key.Space is already bound to Command.Select; this gives us select then move down
-        KeyBindings.Add (Key.Space.WithShift, Command.Select, Command.Down);
+        // Key.Space is already bound to Command.Activate; this gives us select then move down
+        KeyBindings.Add (Key.Space.WithShift, Command.Activate, Command.Down);
 
         // Use the form of Add that lets us pass context to the handler
         KeyBindings.Add (Key.A.WithCtrl, new KeyBinding ([Command.SelectAll], true));
@@ -547,7 +547,7 @@ public int? SelectedItem
             }
 
             _selectedItem = value;
-            OnSelectedChanged ();
+            OnActivatedChanged ();
             SetNeedsDraw ();
         }
     }
@@ -555,7 +555,7 @@ public int? SelectedItem
     // TODO: Use standard event model
     /// <summary>Invokes the <see cref="SelectedItemChanged"/> event if it is defined.</summary>
     /// <returns></returns>
-    public virtual bool OnSelectedChanged ()
+    public virtual bool OnActivatedChanged ()
     {
         if (SelectedItem != _lastSelectedItem)
         {
diff --git a/Terminal.Gui/Views/Menu/MenuBar.cs b/Terminal.Gui/Views/Menu/MenuBar.cs
index 7e45d2d6ff..2cfd1e165d 100644
--- a/Terminal.Gui/Views/Menu/MenuBar.cs
+++ b/Terminal.Gui/Views/Menu/MenuBar.cs
@@ -520,17 +520,26 @@ public bool EnableForDesign<TContext> (ref TContext targetView) where TContext :
         var bordersCb = new CheckBox
         {
             Title = "_Borders",
-            CheckedState = CheckState.Checked
+            CheckedState = CheckState.Checked,
+            // Best practice for CheckBoxes in menus is to disable focus and highlight states
+            CanFocus = false,
+            HighlightStates = MouseState.None
         };
 
         var autoSaveCb = new CheckBox
         {
-            Title = "_Auto Save"
+            Title = "_Auto Save",
+            // Best practice for CheckBoxes in menus is to disable focus and highlight states
+            CanFocus = false,
+            HighlightStates = MouseState.None
         };
 
         var enableOverwriteCb = new CheckBox
         {
-            Title = "Enable _Overwrite"
+            Title = "Enable _Overwrite",
+            // Best practice for CheckBoxes in menus is to disable focus and highlight states
+            CanFocus = false,
+            HighlightStates = MouseState.None
         };
 
         var mutuallyExclusiveOptionsSelector = new OptionSelector
@@ -623,7 +632,6 @@ public bool EnableForDesign<TContext> (ref TContext targetView) where TContext :
                                                            {
                                                                HelpText = "MenuBar BG Color",
                                                                CommandView = menuBgColorCp,
-                                                               Key = Key.F8
                                                            }
                                                        ]
                                                       )
@@ -722,7 +730,10 @@ MenuItem [] ConfigureDetailsSubMenu ()
                 Command = Command.Edit,
                 CommandView = new CheckBox
                 {
-                    Title = "E_dit Mode"
+                    Title = "E_dit Mode",
+                    // Best practice for CheckBoxes in menus is to disable focus and highlight states
+                    CanFocus = false,
+                    HighlightStates = MouseState.None
                 }
             };
 
diff --git a/Terminal.Gui/Views/Menu/PopoverMenu.cs b/Terminal.Gui/Views/Menu/PopoverMenu.cs
index ef07672182..ea7d220a08 100644
--- a/Terminal.Gui/Views/Menu/PopoverMenu.cs
+++ b/Terminal.Gui/Views/Menu/PopoverMenu.cs
@@ -202,6 +202,9 @@ public void SetPosition (Point? idealScreenPosition = null)
             Root.App ??= App;
             Root.BeginInit ();
             Root.EndInit ();
+
+            // TODO: See https://github.com/gui-cs/Terminal.Gui/issues/3951 which, if fixed, will
+            // TODO: negate need for this hack
             Root.Layout ();
         }
 
@@ -389,13 +392,14 @@ internal void ShowSubMenu (MenuItem? menuItem)
 
         // Logging.Debug ($"{Title} - menuItem: {menuItem?.Title}, menu: {menu?.Title}");
 
+        // TODO: See https://github.com/gui-cs/Terminal.Gui/issues/3951 which, if fixed, will 
+        // TODO: negate need for this hack
         menu?.Layout ();
 
         // If there's a visible peer, remove / hide it
         if (menu?.SubViews.FirstOrDefault (v => v is MenuItem { SubMenu.Visible: true }) is MenuItem visiblePeer)
         {
             HideAndRemoveSubMenu (visiblePeer.SubMenu);
-            visiblePeer.ForceFocusColors = false;
         }
 
         if (menuItem is { SubMenu: { Visible: false } })
@@ -411,7 +415,6 @@ internal void ShowSubMenu (MenuItem? menuItem)
             menuItem.SubMenu.X = pos.X;
             menuItem.SubMenu.Y = pos.Y;
 
-            menuItem.ForceFocusColors = true;
         }
     }
 
@@ -458,6 +461,8 @@ private void AddAndShowSubMenu (Menu? menu)
             // to set focus to it.
             menu.Visible = true;
 
+            // TODO: See https://github.com/gui-cs/Terminal.Gui/issues/3951 which, if fixed, will 
+            // TODO: negate need for this hack
             menu.Layout ();
         }
     }
@@ -472,7 +477,6 @@ private void HideAndRemoveSubMenu (Menu? menu)
             if (menu.SubViews.FirstOrDefault (v => v is MenuItem { SubMenu.Visible: true }) is MenuItem visiblePeer)
             {
                 HideAndRemoveSubMenu (visiblePeer.SubMenu);
-                visiblePeer.ForceFocusColors = false;
             }
 
             menu.Visible = false;
diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs
index 07fccc0695..cbc48ae9f8 100644
--- a/Terminal.Gui/Views/MessageBox.cs
+++ b/Terminal.Gui/Views/MessageBox.cs
@@ -592,8 +592,7 @@ params string [] buttons
 
                 if (count == defaultButton)
                 {
-                    b.IsDefault = true;
-
+                    b.IsDefaultAcceptView = true;
                     b.Accepting += (s, e) =>
                                    {
                                        if (e?.Context?.Source is Button button)
diff --git a/Terminal.Gui/Views/NumericUpDown.cs b/Terminal.Gui/Views/NumericUpDown.cs
index adb94d5549..0fa64bff8d 100644
--- a/Terminal.Gui/Views/NumericUpDown.cs
+++ b/Terminal.Gui/Views/NumericUpDown.cs
@@ -98,7 +98,7 @@ public NumericUpDown ()
                         }
 
                         // BUGBUG: If this is uncommented, the numericupdown in a shortcut will not work
-                        //if (RaiseSelecting (ctx) is true)
+                        //if (RaiseActivating (ctx) is true)
                         //{
                         //    return true;
                         //}
@@ -120,7 +120,7 @@ public NumericUpDown ()
                         }
 
                         // BUGBUG: If this is uncommented, the numericupdown in a shortcut will not work
-                        //if (RaiseSelecting (ctx) is true)
+                        //if (RaiseActivating (ctx) is true)
                         //{
                         //    return true;
                         //}
diff --git a/Terminal.Gui/Views/ScrollBar/ScrollBar.cs b/Terminal.Gui/Views/ScrollBar/ScrollBar.cs
index 4d74684341..b1aec3e8e7 100644
--- a/Terminal.Gui/Views/ScrollBar/ScrollBar.cs
+++ b/Terminal.Gui/Views/ScrollBar/ScrollBar.cs
@@ -515,14 +515,18 @@ protected override bool OnClearingViewport ()
         return true;
     }
 
-    // TODO: Change this to work OnMouseEvent with continuouse press and grab so it's continous.
-    /// <inheritdoc/>
-    protected override bool OnMouseClick (MouseEventArgs args)
+    // TODO: Ensure contninous button pressed works correctly with the slider.
+    /// <inheritdoc />
+    protected override bool OnActivating (CommandEventArgs args)
     {
+        if (args.Context is not CommandContext<MouseBinding> mouseCommandContext)
+        {
+            return base.OnActivating (args);
+        }
         // Check if the mouse click is a single click
-        if (!args.IsSingleClicked)
+        if (!mouseCommandContext.Binding!.MouseEventArgs!.IsSingleClicked)
         {
-            return false;
+            return base.OnActivating (args);
         }
 
         int sliderCenter;
@@ -531,12 +535,12 @@ protected override bool OnMouseClick (MouseEventArgs args)
         if (Orientation == Orientation.Vertical)
         {
             sliderCenter = 1 + _slider.Frame.Y + _slider.Frame.Height / 2;
-            distanceFromCenter = args.Position.Y - sliderCenter;
+            distanceFromCenter = mouseCommandContext.Binding!.MouseEventArgs.Position.Y - sliderCenter;
         }
         else
         {
             sliderCenter = 1 + _slider.Frame.X + _slider.Frame.Width / 2;
-            distanceFromCenter = args.Position.X - sliderCenter;
+            distanceFromCenter = mouseCommandContext.Binding!.MouseEventArgs.Position.X - sliderCenter;
         }
 
 #if PROPORTIONAL_SCROLL_JUMP
diff --git a/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs b/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
index d3d861ac26..a4d1a5f33a 100644
--- a/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
+++ b/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
@@ -236,7 +236,7 @@ private void RaisePositionChangeEvents (int newPosition)
         OnScrolled (distance);
         Scrolled?.Invoke (this, new (in distance));
 
-        RaiseSelecting (new CommandContext<KeyBinding> (Command.Select, this, new KeyBinding ([Command.Select], null, distance)));
+        RaiseActivating (new CommandContext<KeyBinding> (Command.Activate, this, new KeyBinding ([Command.Activate], null, distance)));
     }
 
     /// <summary>
diff --git a/Terminal.Gui/Views/Selectors/FlagSelector.cs b/Terminal.Gui/Views/Selectors/FlagSelector.cs
index c2c8c15f98..e17302bd50 100644
--- a/Terminal.Gui/Views/Selectors/FlagSelector.cs
+++ b/Terminal.Gui/Views/Selectors/FlagSelector.cs
@@ -31,7 +31,7 @@ protected override void OnSubViewAdded (View view)
 
         checkbox.CheckedStateChanging += OnCheckboxOnCheckedStateChanging;
         checkbox.CheckedStateChanged += OnCheckboxOnCheckedStateChanged;
-        checkbox.Selecting += OnCheckboxOnSelecting;
+        checkbox.Accepting += Activating;
         checkbox.Accepting += OnCheckboxOnAccepting;
     }
 
@@ -76,7 +76,7 @@ private void OnCheckboxOnCheckedStateChanged (object? sender, EventArgs<CheckSta
         Value = newValue;
     }
 
-    private void OnCheckboxOnSelecting (object? sender, CommandEventArgs args)
+    private void Activating (object? sender, CommandEventArgs args)
     {
         if (sender is not CheckBox checkbox)
         {
@@ -90,8 +90,8 @@ private void OnCheckboxOnSelecting (object? sender, CommandEventArgs args)
             checkbox.SetFocus ();
         }
 
-        // Selecting doesn't normally propogate, so we do it here
-        if (InvokeCommand (Command.Select, args.Context) is true)
+        // Activating doesn't normally propogate, so we do it here
+        if (InvokeCommand (Command.Activate, args.Context) is true)
         {
             // Do not return here; we want to toggle the checkbox state
             args.Handled = true;
diff --git a/Terminal.Gui/Views/Selectors/OptionSelector.cs b/Terminal.Gui/Views/Selectors/OptionSelector.cs
index ab4159cc3d..1544748c7e 100644
--- a/Terminal.Gui/Views/Selectors/OptionSelector.cs
+++ b/Terminal.Gui/Views/Selectors/OptionSelector.cs
@@ -43,14 +43,14 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
         }
         if (!CanFocus)
         {
-            if (RaiseSelecting (args.Context) is true)
+            if (RaiseActivating (args.Context) is true)
             {
                 return true;
             }
         }
         else if (!HasFocus && Value is null)
         {
-            if (RaiseSelecting (args.Context) is true)
+            if (RaiseActivating (args.Context) is true)
             {
                 return true;
             }
@@ -63,9 +63,9 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
     }
 
     /// <inheritdoc />
-    protected override bool OnSelecting (CommandEventArgs args)
+    protected override bool OnActivating (CommandEventArgs args)
     {
-        if (base.OnSelecting (args) is true)
+        if (base.OnActivating (args) is true)
         {
             return true;
         }
@@ -112,12 +112,12 @@ protected override void OnSubViewAdded (View view)
 
         checkbox.RadioStyle = true;
 
-        checkbox.Selecting += OnCheckboxOnSelecting;
+        checkbox.Activating += OnCheckboxOnActivating;
         checkbox.Accepting += OnCheckboxOnAccepting;
     }
 
 
-    private void OnCheckboxOnSelecting (object? sender, CommandEventArgs args)
+    private void OnCheckboxOnActivating (object? sender, CommandEventArgs args)
     {
         if (sender is not CheckBox checkbox)
         {
@@ -148,8 +148,8 @@ private void OnCheckboxOnSelecting (object? sender, CommandEventArgs args)
             checkbox.SetFocus ();
         }
 
-        // Selecting doesn't normally propogate, so we do it here
-        if (InvokeCommand (Command.Select, args.Context) is true)
+        // Activating doesn't normally propogate, so we do it here
+        if (InvokeCommand (Command.Activate, args.Context) is true)
         {
             // Do not return here; we want to toggle the checkbox state
             args.Handled = true;
diff --git a/Terminal.Gui/Views/Selectors/SelectorBase.cs b/Terminal.Gui/Views/Selectors/SelectorBase.cs
index 03b7ac2bad..f5a672f41e 100644
--- a/Terminal.Gui/Views/Selectors/SelectorBase.cs
+++ b/Terminal.Gui/Views/Selectors/SelectorBase.cs
@@ -80,17 +80,11 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
         if ((HasFocus || !CanFocus) && HotKey == keyCommandContext.Binding.Key?.NoAlt.NoCtrl.NoShift!)
         {
             // It's this.HotKey OR Another View (Label?) forwarded the hotkey command to us - Act just like `Space` (Select)
-            return Focused?.InvokeCommand (Command.Select, args.Context) is true;
+            return Focused?.InvokeCommand (Command.Activate, args.Context) is true;
         }
         return base.OnHandlingHotKey (args);
     }
 
-    /// <inheritdoc />
-    protected override bool OnSelecting (CommandEventArgs args)
-    {
-        return base.OnSelecting (args);
-    }
-
     private int? _value;
 
     /// <summary>
diff --git a/Terminal.Gui/Views/Shortcut.cs b/Terminal.Gui/Views/Shortcut.cs
index 87d0f9f890..54a5ca115f 100644
--- a/Terminal.Gui/Views/Shortcut.cs
+++ b/Terminal.Gui/Views/Shortcut.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.IO.Compression;
 
 namespace Terminal.Gui.Views;
 
@@ -39,7 +40,7 @@ namespace Terminal.Gui.Views;
 ///         If the <see cref="Key"/> is <see cref="Key.Empty"/>, the <see cref="Key"/> text is not displayed.
 ///     </para>
 /// </remarks>
-public class Shortcut : View, IOrientation, IDesignable
+public class Shortcut : View, IDesignable
 {
     /// <summary>
     ///     Creates a new instance of <see cref="Shortcut"/>.
@@ -71,10 +72,6 @@ public Shortcut (Key key, string? commandText, Action? action, string? helpText
         Width = GetWidthDimAuto ();
         Height = Dim.Auto (DimAutoStyle.Content, 1);
 
-        _orientationHelper = new (this);
-        _orientationHelper.OrientationChanging += (sender, e) => OrientationChanging?.Invoke (this, e);
-        _orientationHelper.OrientationChanged += (sender, e) => OrientationChanged?.Invoke (this, e);
-
         AddCommands ();
 
         TitleChanged += Shortcut_TitleChanged; // This needs to be set before CommandView is set
@@ -112,6 +109,13 @@ public override void EndInit ()
         UpdateKeyBindings (Key.Empty);
     }
 
+    /// <inheritdoc />
+    protected override bool OnClearingViewport ()
+    {
+        SetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Normal);
+        return base.OnClearingViewport ();
+    }
+
     // Helper to set Width consistently
     internal Dim GetWidthDimAuto ()
     {
@@ -238,7 +242,8 @@ protected override void OnSubViewLayout (LayoutEventArgs e)
         }
     }
 
-    #region Accept/Select/HotKey Command Handling
+
+    #region Accept/Activate/HotKey Command Handling
 
     private void AddCommands ()
     {
@@ -247,15 +252,26 @@ private void AddCommands ()
 
         // Hotkey -
         AddCommand (Command.HotKey, DispatchCommand);
+        // Activate (Space key or click) -
+        AddCommand (Command.Activate, DispatchCommand);
+    }
+
+    /// <inheritdoc />
+    protected override bool OnHandlingHotKey (CommandEventArgs args)
+    {
+        return base.OnHandlingHotKey (args);
+    }
+
+    /// <inheritdoc />
+    protected override bool OnActivating (CommandEventArgs args)
+    {
 
-        // Select (Space key or click) -
-        AddCommand (Command.Select, DispatchCommand);
+        return base.OnActivating (args);
     }
 
     /// <summary>
-    ///     Dispatches the Command in the <paramref name="commandContext"/> (Raises Selected, then Accepting, then invoke the
-    ///     Action, if any).
-    ///     Called when Command.Select, Accept, or HotKey has been invoked on this Shortcut.
+    ///     Dispatches the Command in the <paramref name="commandContext"/> (Raises Activating, then Accepting, then invoke the Action, if any).
+    ///     Called when Command.Activate, Accept, or HotKey has been invoked on this Shortcut.
     /// </summary>
     /// <param name="commandContext"></param>
     /// <returns>
@@ -270,21 +286,24 @@ private void AddCommands ()
 
         Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) Command: {commandContext?.Command}");
 
-        if (keyCommandContext?.Binding.Data != this)
-        {
-            // TODO: Optimize this to only do this if CommandView is custom (non View)
-            // Invoke Select on the CommandView to cause it to change state if it wants to
-            // If this causes CommandView to raise Accept, we eat it
-            keyCommandContext = keyCommandContext!.Value with { Binding = keyCommandContext.Value.Binding with { Data = this } };
+        //if (keyCommandContext?.Binding.Data != this)
+        //{
+        //    // TODO: Optimize this to only do this if CommandView is custom (non View)
+        //    // Invoke Activate on the CommandView to cause it to change state if it wants to
+        //    // If this causes CommandView to raise Accept, we eat it
+        //    keyCommandContext = keyCommandContext!.Value with { Binding = keyCommandContext.Value.Binding with { Data = this } };
 
-            Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - Invoking Select on CommandView ({CommandView.GetType ().Name}).");
+        //    Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - Invoking Activate on CommandView ({CommandView.GetType ().Name}).");
 
-            CommandView.InvokeCommand (Command.Select, keyCommandContext);
-        }
+        //    if (CommandView.InvokeCommand (Command.Activate, keyCommandContext) is true)
+        //    {
+        //        return true;
+        //    }
+        //}
 
-        Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - RaiseSelecting ...");
+        Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - RaiseActivating ...");
 
-        if (RaiseSelecting (commandContext) is true)
+        if (RaiseActivating (commandContext) is true)
         {
             return true;
         }
@@ -298,18 +317,17 @@ private void AddCommands ()
 
         var cancel = false;
 
-        if (commandContext is { Source: null })
-        {
-            commandContext.Source = this;
-        }
+        //if (commandContext is { Source: null })
+        //{
+        //    commandContext.Source = this;
+        //}
+        //Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - Calling RaiseAccepting...");
+        //cancel = RaiseAccepting (commandContext) is true;
 
-        Logging.Debug ($"{Title} ({commandContext?.Source?.Title}) - Calling RaiseAccepting...");
-        cancel = RaiseAccepting (commandContext) is true;
-
-        if (cancel)
-        {
-            return true;
-        }
+        //if (cancel)
+        //{
+        //    return true;
+        //}
 
         if (Action is { })
         {
@@ -334,38 +352,6 @@ private void AddCommands ()
 
     #endregion Accept/Select/HotKey Command Handling
 
-    #region IOrientation members
-
-    private readonly OrientationHelper _orientationHelper;
-
-    /// <summary>
-    ///     Gets or sets the <see cref="Orientation"/> for this <see cref="Bar"/>. The default is
-    ///     <see cref="Orientation.Horizontal"/>.
-    /// </summary>
-    /// <remarks>
-    /// </remarks>
-    public Orientation Orientation
-    {
-        get => _orientationHelper.Orientation;
-        set => _orientationHelper.Orientation = value;
-    }
-
-    /// <inheritdoc/>
-    public event EventHandler<CancelEventArgs<Orientation>>? OrientationChanging;
-
-    /// <inheritdoc/>
-    public event EventHandler<EventArgs<Orientation>>? OrientationChanged;
-
-    /// <summary>Called when <see cref="Orientation"/> has changed.</summary>
-    /// <param name="newOrientation"></param>
-    public void OnOrientationChanged (Orientation newOrientation)
-    {
-        // TODO: Determine what, if anything, is opinionated about the orientation.
-        SetNeedsLayout ();
-    }
-
-    #endregion
-
     #region Command
 
     private View _commandView = new ();
@@ -426,7 +412,7 @@ public View CommandView
             }
 
             // Clean up old 
-            _commandView.Selecting -= CommandViewOnSelecting;
+            _commandView.Activating -= CommandViewOnActivating;
             _commandView.Accepting -= CommandViewOnAccepted;
             Remove (_commandView);
             _commandView?.Dispose ();
@@ -437,25 +423,25 @@ public View CommandView
 
             // The default behavior is for CommandView to not get focus. I
             // If you want it to get focus, you need to set it.
-            // _commandView.CanFocus = false;
+            _commandView.CanFocus = false;
 
             _commandView.HotKeyChanged += (s, e) =>
-                                          {
-                                              if (e.NewKey != Key.Empty)
-                                              {
-                                                  // Add it
-                                                  AddKeyBindingsForHotKey (e.OldKey, e.NewKey);
-                                              }
-                                          };
+            {
+                if (e.NewKey != Key.Empty)
+                {
+                    // Add it
+                    AddKeyBindingsForHotKey (e.OldKey, e.NewKey);
+                }
+            };
 
             _commandView.HotKeySpecifier = new ('_');
 
             Title = _commandView.Text;
 
-            _commandView.Selecting += CommandViewOnSelecting;
+            _commandView.Activating += CommandViewOnActivating;
             _commandView.Accepting += CommandViewOnAccepted;
 
-            //ShowHide ();
+            ShowHide ();
             UpdateKeyBindings (Key.Empty);
 
             return;
@@ -466,16 +452,16 @@ void CommandViewOnAccepted (object? sender, CommandEventArgs e)
                 e.Handled = true;
             }
 
-            void CommandViewOnSelecting (object? sender, CommandEventArgs e)
+            void CommandViewOnActivating (object? sender, CommandEventArgs e)
             {
                 if ((e.Context is CommandContext<KeyBinding> keyCommandContext && keyCommandContext.Binding.Data != this)
                     || e.Context is CommandContext<MouseBinding>)
                 {
                     // Forward command to ourselves
-                    InvokeCommand<KeyBinding> (Command.Select, new ([Command.Select], null, this));
+                    //InvokeCommand<KeyBinding> (Command.Activate, new ([Command.Activate], null, this));
                 }
 
-                e.Handled = true;
+                // e.Handled = true;
             }
         }
     }
@@ -497,15 +483,25 @@ private void SetCommandViewDefaultLayout ()
         CommandView.TextFormatter.WordWrap = false;
 
         //CommandView.HighlightStates = HighlightStates.None;
-        CommandView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
+        //if (CommandView.InvertFocusAttribute is null)
+        //{
+        //    CommandView.InvertFocusAttribute = CanFocus;
+        //}
+
+        //CommandView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
     }
 
     private void SubViewOnGettingAttributeForRole (object? sender, VisualRoleEventArgs e)
     {
+        //if (!HasFocus)
+        {
+            return;
+        }
+
         switch (e.Role)
         {
             case VisualRole.Normal:
-                if (HasFocus)
+                //if (HasFocus)
                 {
                     e.Handled = true;
                     e.Result = GetAttributeForRole (VisualRole.Focus);
@@ -514,13 +510,30 @@ private void SubViewOnGettingAttributeForRole (object? sender, VisualRoleEventAr
                 break;
 
             case VisualRole.HotNormal:
-                if (HasFocus)
+                // if (HasFocus)
                 {
                     e.Handled = true;
                     e.Result = GetAttributeForRole (VisualRole.HotFocus);
                 }
 
                 break;
+
+            case VisualRole.Focus:
+                //if (HasFocus)
+                {
+                    e.Handled = true;
+                    e.Result = GetAttributeForRole (VisualRole.Normal);
+                }
+                break;
+
+            case VisualRole.HotFocus:
+                // if (HasFocus)
+                {
+                    e.Handled = true;
+                    e.Result = GetAttributeForRole (VisualRole.HotNormal);
+                }
+                break;
+
         }
     }
 
@@ -564,10 +577,11 @@ private void SetHelpViewDefaultLayout ()
         HelpView.Visible = true;
         HelpView.VerticalTextAlignment = Alignment.Center;
         HelpView.TextAlignment = Alignment.Start;
-        HelpView.TextFormatter.WordWrap = false;
-        HelpView.HighlightStates = MouseState.None;
+        HelpView.TextFormatter.WordWrap = true;
+        HelpView.HighlightStates = ViewBase.MouseState.None;
+        //HelpView.InvertFocusAttribute = true;
 
-        HelpView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
+        //HelpView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
     }
 
     /// <summary>
@@ -693,9 +707,11 @@ private void SetKeyViewDefaultLayout ()
             KeyView.Margin!.ViewportSettings &= ~ViewportSettingsFlags.TransparentMouse;
         }
 
+        // KeyView is sized to hold JUST it's text so that only the text is drawn using HotNormal/HotFocus
         KeyView.X = Pos.Align (Alignment.End, AlignmentModes);
-        KeyView.Width = Dim.Auto (DimAutoStyle.Text, Dim.Func (_ => MinimumKeyTextSize));
-        KeyView.Height = Dim.Fill ();
+        KeyView.Y = Pos.Center ();
+        KeyView.Width = Dim.Auto (DimAutoStyle.Text, minimumContentDim: Dim.Func (_ => MinimumKeyTextSize));
+        KeyView.Height = 1;
 
         KeyView.Visible = true;
 
@@ -703,8 +719,24 @@ private void SetKeyViewDefaultLayout ()
         KeyView.TextAlignment = Alignment.End;
         KeyView.VerticalTextAlignment = Alignment.Center;
         KeyView.KeyBindings.Clear ();
-        KeyView.HighlightStates = MouseState.None;
+        KeyView.HighlightStates = ViewBase.MouseState.None;
+        //KeyView.InvertFocusAttribute = true;
+
+        KeyView.DrawingText += (sender, args) =>
+        {
+            var drawRect = new Rectangle (KeyView.ContentToScreen (Point.Empty), KeyView.GetContentSize ());
 
+            Region textRegion = KeyView.TextFormatter.GetDrawRegion (drawRect);
+            KeyView.TextFormatter?.Draw (
+                                         Driver,
+                                         drawRect,
+                                         HasFocus ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal),
+                                         HasFocus ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal),
+                                         Rectangle.Empty
+                                        );
+
+            args.Cancel = true;
+        };
         KeyView.GettingAttributeForRole += (sender, args) =>
                                            {
                                                if (args.Role == VisualRole.Normal)
@@ -755,6 +787,7 @@ private void UpdateKeyBindings (Key oldKey)
 
     #region Focus
 
+    /// <inheritdoc />
     private bool _forceFocusColors;
 
     /// <summary>
@@ -773,11 +806,12 @@ public bool ForceFocusColors
     /// <inheritdoc/>
     protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
     {
-        if (!HasFocus)
+        //if (!HasFocus)
         {
             return base.OnGettingAttributeForRole (role, ref currentAttribute);
         }
 
+
         if (role == VisualRole.Normal)
         {
             currentAttribute = GetAttributeForRole (VisualRole.Focus);
diff --git a/Terminal.Gui/Views/Slider/Slider.cs b/Terminal.Gui/Views/Slider/Slider.cs
index 0535beff09..5c7a9f3479 100644
--- a/Terminal.Gui/Views/Slider/Slider.cs
+++ b/Terminal.Gui/Views/Slider/Slider.cs
@@ -1426,7 +1426,7 @@ private void SetCommands ()
         AddCommand (Command.RightEnd, () => MoveEnd ());
         AddCommand (Command.RightExtend, () => ExtendPlus ());
         AddCommand (Command.LeftExtend, () => ExtendMinus ());
-        AddCommand (Command.Select, () => Select ());
+        AddCommand (Command.Activate, () => Select ());
         AddCommand (Command.Accept, (ctx) => Accept (ctx));
 
         SetKeyBindings ();
@@ -1467,7 +1467,7 @@ private void SetKeyBindings ()
         KeyBindings.Remove (Key.Enter);
         KeyBindings.Add (Key.Enter, Command.Accept);
         KeyBindings.Remove (Key.Space);
-        KeyBindings.Add (Key.Space, Command.Select);
+        KeyBindings.Add (Key.Space, Command.Activate);
     }
 
     private Dictionary<int, SliderOption<T>> GetSetOptionDictionary () { return _setOptions.ToDictionary (e => e, e => _options [e]); }
diff --git a/Terminal.Gui/Views/StatusBar.cs b/Terminal.Gui/Views/StatusBar.cs
index a964058a2e..0fe162664a 100644
--- a/Terminal.Gui/Views/StatusBar.cs
+++ b/Terminal.Gui/Views/StatusBar.cs
@@ -79,7 +79,7 @@ protected override void OnSubViewLayout (LayoutEventArgs args)
 
             if (barItem is Shortcut shortcut)
             {
-                shortcut.Orientation = Orientation.Horizontal;
+             //   shortcut.Orientation = Orientation.Horizontal;
             }
         }
         base.OnSubViewLayout (args);
diff --git a/Terminal.Gui/Views/TabView/TabRow.cs b/Terminal.Gui/Views/TabView/TabRow.cs
index 5534ac5be5..7c57e0fb3d 100644
--- a/Terminal.Gui/Views/TabView/TabRow.cs
+++ b/Terminal.Gui/Views/TabView/TabRow.cs
@@ -24,7 +24,7 @@ public TabRow (TabView host)
             Visible = false,
             Text = Glyphs.RightArrow.ToString ()
         };
-        _rightScrollIndicator.MouseClick += _host.Tab_MouseClick!;
+        _rightScrollIndicator.Activating += _host.TabOnActivating;
 
         _leftScrollIndicator = new View
         {
@@ -34,7 +34,7 @@ public TabRow (TabView host)
             Visible = false,
             Text = Glyphs.LeftArrow.ToString ()
         };
-        _leftScrollIndicator.MouseClick += _host.Tab_MouseClick!;
+        _leftScrollIndicator.Activating += _host.TabOnActivating;
 
         Add (_rightScrollIndicator, _leftScrollIndicator);
     }
diff --git a/Terminal.Gui/Views/TabView/TabView.cs b/Terminal.Gui/Views/TabView/TabView.cs
index ae5b3d89ec..2b6cc481a9 100644
--- a/Terminal.Gui/Views/TabView/TabView.cs
+++ b/Terminal.Gui/Views/TabView/TabView.cs
@@ -563,8 +563,8 @@ internal IEnumerable<Tab> CalculateViewport (Rectangle bounds)
             if (maxWidth == 0)
             {
                 tab.Visible = true;
-                tab.MouseClick += Tab_MouseClick!;
-                tab.Border!.MouseClick += Tab_MouseClick!;
+                tab.Activating += TabOnActivating;
+                tab.Border!.Activating += TabOnActivating;
 
                 yield return tab;
 
@@ -594,8 +594,8 @@ internal IEnumerable<Tab> CalculateViewport (Rectangle bounds)
 
             // there is enough space!
             tab.Visible = true;
-            tab.MouseClick += Tab_MouseClick!;
-            tab.Border!.MouseClick += Tab_MouseClick!;
+            tab.Activating += TabOnActivating;
+            tab.Border!.Activating += TabOnActivating;
 
             yield return tab;
 
@@ -614,6 +614,7 @@ internal IEnumerable<Tab> CalculateViewport (Rectangle bounds)
         }
     }
 
+
     /// <summary>
     ///     Returns the number of rows occupied by rendering the tabs, this depends on <see cref="TabStyle.ShowTopLine"/>
     ///     and can be 0 (e.g. if <see cref="TabStyle.TabsOnBottom"/> and you ask for <paramref name="top"/>).
@@ -636,9 +637,15 @@ private int GetTabHeight (bool top)
         return Style.ShowTopLine ? 3 : 2;
     }
 
-    internal void Tab_MouseClick (object sender, MouseEventArgs e)
+    internal void TabOnActivating (object? sender, CommandEventArgs commandEventArgs)
     {
-        e.Handled = _tabsBar.NewMouseEvent (e) == true;
+        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+        {
+            return;
+        }
+
+        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
+        commandEventArgs.Handled = _tabsBar.NewMouseEvent (e) == true;
     }
 
     private void UnSetCurrentTabs ()
@@ -652,8 +659,8 @@ private void UnSetCurrentTabs ()
 
                 if (tab.Visible)
                 {
-                    tab.MouseClick -= Tab_MouseClick!;
-                    tab.Border!.MouseClick -= Tab_MouseClick!;
+                    tab.Activating -= TabOnActivating!;
+                    tab.Border!.Activating -= TabOnActivating!;
                     tab.Visible = false;
                 }
             }
@@ -662,8 +669,8 @@ private void UnSetCurrentTabs ()
         {
             foreach (Tab tabToRender in _tabLocations)
             {
-                tabToRender.MouseClick -= Tab_MouseClick!;
-                tabToRender.Border!.MouseClick -= Tab_MouseClick!;
+                tabToRender.Activating -= TabOnActivating!;
+                tabToRender.Border!.Activating -= TabOnActivating!;
                 tabToRender.Visible = false;
             }
 
@@ -674,6 +681,4 @@ private void UnSetCurrentTabs ()
     /// <summary>Raises the <see cref="TabClicked"/> event.</summary>
     /// <param name="tabMouseEventArgs"></param>
     internal virtual void OnTabClicked (TabMouseEventArgs tabMouseEventArgs) { TabClicked?.Invoke (this, tabMouseEventArgs); }
-
-
 }
\ No newline at end of file
diff --git a/Terminal.Gui/Views/TableView/CheckBoxTableSourceWrapper.cs b/Terminal.Gui/Views/TableView/CheckBoxTableSourceWrapper.cs
index 5d0b41ed95..9f5dbaac82 100644
--- a/Terminal.Gui/Views/TableView/CheckBoxTableSourceWrapper.cs
+++ b/Terminal.Gui/Views/TableView/CheckBoxTableSourceWrapper.cs
@@ -28,9 +28,9 @@ public CheckBoxTableSourceWrapperBase (TableView tableView, ITableSource toWrap)
         Wrapping = toWrap;
         this.tableView = tableView;
 
-        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
 
-        tableView.MouseClick += TableView_MouseClick;
+        tableView.Activating += Table_Activating;
         tableView.CellToggled += TableView_CellToggled;
     }
 
@@ -152,8 +152,14 @@ private void TableView_CellToggled (object sender, CellToggledEventArgs e)
         tableView.SetNeedsDraw ();
     }
 
-    private void TableView_MouseClick (object sender, MouseEventArgs e)
+    private void Table_Activating (object sender, CommandEventArgs commandEventArgs)
     {
+        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+        {
+            return;
+        }
+
+        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
         // we only care about clicks (not movements)
         if (!e.Flags.HasFlag (MouseFlags.Button1Clicked))
         {
diff --git a/Terminal.Gui/Views/TableView/TableSelection.cs b/Terminal.Gui/Views/TableView/TableSelection.cs
index 2fe21f9cd4..8b5ec0c8e8 100644
--- a/Terminal.Gui/Views/TableView/TableSelection.cs
+++ b/Terminal.Gui/Views/TableView/TableSelection.cs
@@ -14,7 +14,7 @@ public TableSelection (Point origin, Rectangle rect)
     }
 
     /// <summary>
-    ///     True if the selection was made through <see cref="Command.Select"/> and therefore should persist even
+    ///     True if the selection was made through <see cref="Command.Activate"/> and therefore should persist even
     ///     through keyboard navigation.
     /// </summary>
     public bool IsToggled { get; set; }
diff --git a/Terminal.Gui/Views/TableView/TableView.cs b/Terminal.Gui/Views/TableView/TableView.cs
index 4516367994..fef80c5c67 100644
--- a/Terminal.Gui/Views/TableView/TableView.cs
+++ b/Terminal.Gui/Views/TableView/TableView.cs
@@ -240,15 +240,22 @@ public TableView ()
                     }
                    );
 
+        // BUGBUG: OnCellActivated is misnamed, it should be OnCellAccepted? Or is it OnCellSelected?
+        // BUGBUG: Does this mean we still need Command.Activate?
         AddCommand (Command.Accept, () => OnCellActivated (new (Table, SelectedColumn, SelectedRow)));
 
         AddCommand (
-                    Command.Select, // was Command.ToggleChecked
+                    Command.Activate, // was Command.ToggleChecked
                     ctx =>
                     {
+                        if (ctx is CommandContext<MouseBinding>)
+                        {
+                            return RaiseActivating (ctx) is true; 
+                        }
+
                         if (ToggleCurrentCellSelection () is true)
                         {
-                            return RaiseSelecting (ctx) is true;
+                            return RaiseActivating (ctx) is true;
                         }
 
                         return false;
@@ -389,7 +396,7 @@ public int SelectedColumn
 
             if (oldValue != selectedColumn)
             {
-                OnSelectedCellChanged (
+                OnActivatedCellChanged (
                                        new (
                                             Table,
                                             oldValue,
@@ -414,7 +421,7 @@ public int SelectedRow
 
             if (oldValue != selectedRow)
             {
-                OnSelectedCellChanged (
+                OnActivatedCellChanged (
                                        new (
                                             Table,
                                             SelectedColumn,
@@ -461,7 +468,7 @@ public ITableSource Table
     /// </summary>
     public event EventHandler<CellActivatedEventArgs> CellActivated;
 
-    /// <summary>This event is raised when a cell is toggled (see <see cref="Command.Select"/></summary>
+    /// <summary>This event is raised when a cell is toggled (see <see cref="Command.Activate"/></summary>
     public event EventHandler<CellToggledEventArgs> CellToggled;
 
     /// <summary>
@@ -1287,7 +1294,7 @@ protected virtual bool OnCellActivated (CellActivatedEventArgs args)
     protected virtual void OnCellToggled (CellToggledEventArgs args) { CellToggled?.Invoke (this, args); }
 
     /// <summary>Invokes the <see cref="SelectedCellChanged"/> event</summary>
-    protected virtual void OnSelectedCellChanged (SelectedCellChangedEventArgs args) { SelectedCellChanged?.Invoke (this, args); }
+    protected virtual void OnActivatedCellChanged (SelectedCellChangedEventArgs args) { SelectedCellChanged?.Invoke (this, args); }
 
     /// <summary>
     ///     Override to provide custom multi-coloring to cells. Use methods like <see cref="View.AddStr(string)"/>.
@@ -1574,7 +1581,7 @@ private void ClearMultiSelectedRegions (bool keepToggledSelections)
     /// <param name="pt1Y">Origin point for the selection in Y</param>
     /// <param name="pt2X">End point for the selection in X</param>
     /// <param name="pt2Y">End point for the selection in Y</param>
-    /// <param name="toggle">True if selection is result of <see cref="Command.Select"/></param>
+    /// <param name="toggle">True if selection is result of <see cref="Command.Activate"/></param>
     /// <returns></returns>
     private TableSelection CreateTableSelection (int pt1X, int pt1Y, int pt2X, int pt2Y, bool toggle = false)
     {
diff --git a/Terminal.Gui/Views/TableView/TreeTableSource.cs b/Terminal.Gui/Views/TableView/TreeTableSource.cs
index 61e15f78a9..fb443c33b8 100644
--- a/Terminal.Gui/Views/TableView/TreeTableSource.cs
+++ b/Terminal.Gui/Views/TableView/TreeTableSource.cs
@@ -42,7 +42,7 @@ Dictionary<string, Func<T, object>> subsequentColumns
         _tableView = table;
         _tree = tree;
         _tableView.KeyDown += Table_KeyPress;
-        _tableView.MouseClick += Table_MouseClick;
+        _tableView.Activating += Table_Activating;
 
         List<string> colList = subsequentColumns.Keys.ToList ();
         colList.Insert (0, firstColumnName);
@@ -56,7 +56,7 @@ Dictionary<string, Func<T, object>> subsequentColumns
     public void Dispose ()
     {
         _tableView.KeyDown -= Table_KeyPress;
-        _tableView.MouseClick -= Table_MouseClick;
+        _tableView.Activating -= Table_Activating;
         _tree.Dispose ();
     }
 
@@ -129,6 +129,7 @@ private bool IsInTreeColumn (int column, bool isKeyboard)
 
     private Branch<T> RowToBranch (int row) { return _tree.BuildLineMap ().ElementAt (row); }
 
+    // TODO: Replace this logic with KeyBindings
     private void Table_KeyPress (object sender, Key e)
     {
         if (!IsInTreeColumn (_tableView.SelectedColumn, true))
@@ -168,8 +169,14 @@ private void Table_KeyPress (object sender, Key e)
         }
     }
 
-    private void Table_MouseClick (object sender, MouseEventArgs e)
+    private void Table_Activating (object sender, CommandEventArgs commandEventArgs)
     {
+        if (commandEventArgs.Context is not CommandContext<MouseBinding> mouseContext)
+        {
+            return;
+        }
+
+        MouseEventArgs e = mouseContext.Binding.MouseEventArgs!;
         Point? hit = _tableView.ScreenToCell (e.Position.X, e.Position.Y, out int? headerIfAny, out int? offsetX);
 
         if (hit is null || headerIfAny is { } || !IsInTreeColumn (hit.Value.X, false) || offsetX is null)
diff --git a/Terminal.Gui/Views/TreeView/TreeView.cs b/Terminal.Gui/Views/TreeView/TreeView.cs
index a0ca872c17..4212e7541a 100644
--- a/Terminal.Gui/Views/TreeView/TreeView.cs
+++ b/Terminal.Gui/Views/TreeView/TreeView.cs
@@ -291,7 +291,7 @@ public TreeView ()
                     }
                    );
 
-        AddCommand (Command.Select, ActivateSelectedObjectIfAny);
+        AddCommand (Command.Activate, ActivateSelectedObjectIfAny);
         AddCommand (Command.Accept, ActivateSelectedObjectIfAny);
 
         // Default keybindings for this view
@@ -317,7 +317,7 @@ public TreeView ()
         KeyBindings.Add (Key.A.WithCtrl, Command.SelectAll);
 
         KeyBindings.Remove (ObjectActivationKey);
-        KeyBindings.Add (ObjectActivationKey, Command.Select);
+        KeyBindings.Add (ObjectActivationKey, Command.Activate);
     }
 
     /// <summary>
@@ -367,6 +367,7 @@ public TreeView ()
     public MouseFlags? ObjectActivationButton { get; set; } = MouseFlags.Button1DoubleClicked;
 
     // TODO: Update to use Key instead of KeyCode
+    // BUGBUG: Activation is the wrong term here. It's accepting the current selection.
     /// <summary>Key which when pressed triggers <see cref="TreeView{T}.ObjectActivated"/>. Defaults to Enter.</summary>
     public KeyCode ObjectActivationKey
     {
@@ -1141,6 +1142,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
     /// <exception cref="NotImplementedException"></exception>
     public void MovePageUp (bool expandSelection = false) { AdjustSelection (-Viewport.Height, expandSelection); }
 
+    // BUGBUG: Activation is the wrong term here. It's accepting the current selection.
     /// <summary>
     ///     This event is raised when an object is activated e.g. by double clicking or pressing
     ///     <see cref="ObjectActivationKey"/>.
@@ -1444,7 +1446,7 @@ protected override void Dispose (bool disposing)
     /// <param name="e"></param>
     protected virtual void OnObjectActivated (ObjectActivatedEventArgs<T> e) { ObjectActivated?.Invoke (this, e); }
 
-    /// <summary>Raises the SelectionChanged event.</summary>
+    /// <summary>Raises the <see cref="SelectionChanged"/> event.</summary>
     /// <param name="e"></param>
     protected virtual void OnSelectionChanged (SelectionChangedEventArgs<T> e) { SelectionChanged?.Invoke (this, e); }
 
diff --git a/Terminal.Gui/Views/Wizard/Wizard.cs b/Terminal.Gui/Views/Wizard/Wizard.cs
index ef1375be29..d7fc402779 100644
--- a/Terminal.Gui/Views/Wizard/Wizard.cs
+++ b/Terminal.Gui/Views/Wizard/Wizard.cs
@@ -72,7 +72,7 @@ public Wizard ()
         NextFinishButton = new ()
         {
             Text = Strings.wzFinish,
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         // Add a horiz separator
diff --git a/Terminal.Gui/Views/Wizard/WizardStep.cs b/Terminal.Gui/Views/Wizard/WizardStep.cs
index 56dd09a94c..dea441321d 100644
--- a/Terminal.Gui/Views/Wizard/WizardStep.cs
+++ b/Terminal.Gui/Views/Wizard/WizardStep.cs
@@ -10,7 +10,7 @@ namespace Terminal.Gui.Views;
 ///     empty) will fill the wizard step.
 /// </summary>
 /// <remarks>
-///     If <see cref="Button"/>s are added, do not set <see cref="Button.IsDefault"/> to true as this will conflict
+///     If <see cref="Button"/>s are added, do not set <see cref="Button.IsDefaultAcceptView"/> to true as this will conflict
 ///     with the Next button of the Wizard. Subscribe to the <see cref="View.VisibleChanged"/> event to be notified when
 ///     the step is active; see also: <see cref="Wizard.StepChanged"/>. To enable or disable a step from being shown to the
 ///     user, set <see cref="View.Enabled"/>.
diff --git a/Tests/IntegrationTests/FluentTests/GuiTestContextMouseEventTests.cs b/Tests/IntegrationTests/FluentTests/GuiTestContextMouseEventTests.cs
index 0738529449..1a84a0b61c 100644
--- a/Tests/IntegrationTests/FluentTests/GuiTestContextMouseEventTests.cs
+++ b/Tests/IntegrationTests/FluentTests/GuiTestContextMouseEventTests.cs
@@ -213,7 +213,7 @@ public void EnqueueMouseEvent_RapidClicks_AllProcessed (TestDriver d)
             Height = 5
         };
 
-        view.MouseClick += (s, e) => clickCount++;
+        view.MouseEvent += (s, e) => clickCount++;
 
         using GuiTestContext context = With.A<Window> (40, 10, d, _out)
                                            .Add (view);
@@ -240,7 +240,7 @@ public void EnqueueMouseEvent_Click_OutsideView_DoesNotRaiseEvent (TestDriver d)
             Height = 5
         };
 
-        view.MouseClick += (s, e) => clickCount++;
+        view.MouseEvent += (s, e) => clickCount++;
 
         using GuiTestContext context = With.A<Window> (40, 10, d, _out)
                                            .Add (view)
diff --git a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
index 887b10c0de..056640c49f 100644
--- a/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
+++ b/Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs
@@ -119,7 +119,7 @@ bool expectedClicked
 
         var mouseEvent = new MouseEventArgs { ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
 
-        view.MouseClick += (s, e) =>
+        view.MouseEvent += (s, e) =>
                            {
                                Assert.Equal (expectedX, e.Position.X);
                                Assert.Equal (expectedY, e.Position.Y);
diff --git a/Tests/UnitTests/Dialogs/DialogTests.cs b/Tests/UnitTests/Dialogs/DialogTests.cs
index c9d9289fa3..c72de38c6d 100644
--- a/Tests/UnitTests/Dialogs/DialogTests.cs
+++ b/Tests/UnitTests/Dialogs/DialogTests.cs
@@ -1118,7 +1118,7 @@ public void Dialog_Opened_From_Another_Dialog ()
                               btn2.Accepting += (s, e) =>
                                                 {
                                                     // Don't test MessageBox in Dialog unit tests!
-                                                    var subBtn = new Button { Text = "Ok", IsDefault = true };
+                                                    var subBtn = new Button { Text = "Ok", IsDefaultAcceptView = true };
                                                     var subDlg = new Dialog { Text = "ya", Width = 20, Height = 5, Buttons = [subBtn] };
                                                     subBtn.Accepting += (s, e) => Application.RequestStop (subDlg);
                                                     Application.Run (subDlg);
diff --git a/Tests/UnitTests/View/Mouse/MouseTests.cs b/Tests/UnitTests/View/Mouse/MouseTests.cs
index 05326f7eab..fe5ef038b7 100644
--- a/Tests/UnitTests/View/Mouse/MouseTests.cs
+++ b/Tests/UnitTests/View/Mouse/MouseTests.cs
@@ -72,7 +72,7 @@ public void WantContinuousButtonPressed_False_Button_Press_Release_DoesNotClick
 
         var clickedCount = 0;
 
-        view.MouseClick += (s, e) => clickedCount++;
+        view.MouseEvent += (s, e) => clickedCount++;
 
         me.Flags = pressed;
         view.NewMouseEvent (me);
@@ -117,7 +117,7 @@ public void WantContinuousButtonPressed_True_Button_Clicked_Raises_MouseClick (M
 
         var clickedCount = 0;
 
-        view.MouseClick += (s, e) => clickedCount++;
+        view.MouseEvent += (s, e) => clickedCount++;
 
         me.Flags = clicked;
         view.NewMouseEvent (me);
@@ -145,13 +145,13 @@ public void WantContinuousButtonPressed_True_Button_Clicked_Raises_Selecting (Mo
             WantContinuousButtonPressed = true
         };
 
-        var selectingCount = 0;
+        var activatingCount = 0;
 
-        view.Selecting += (s, e) => selectingCount++;
+        view.Activating += (s, e) => activatingCount++;
 
         me.Flags = clicked;
         view.NewMouseEvent (me);
-        Assert.Equal (1, selectingCount);
+        Assert.Equal (1, activatingCount);
 
         view.Dispose ();
 
diff --git a/Tests/UnitTests/View/Navigation/EnabledTests.cs b/Tests/UnitTests/View/Navigation/EnabledTests.cs
index 67f5f52bcd..be5764261f 100644
--- a/Tests/UnitTests/View/Navigation/EnabledTests.cs
+++ b/Tests/UnitTests/View/Navigation/EnabledTests.cs
@@ -10,7 +10,7 @@ public void _Enabled_Sets_Also_Sets_SubViews ()
     {
         var wasClicked = false;
         var button = new Button { Text = "Click Me" };
-        button.IsDefault = true;
+        button.IsDefaultAcceptView = true;
         button.Accepting += (s, e) => wasClicked = !wasClicked;
         var win = new Window { Width = Dim.Fill (), Height = Dim.Fill () };
         win.Add (button);
diff --git a/Tests/UnitTests/View/ViewCommandTests.cs b/Tests/UnitTests/View/ViewCommandTests.cs
index f77f36af1e..494543b7f6 100644
--- a/Tests/UnitTests/View/ViewCommandTests.cs
+++ b/Tests/UnitTests/View/ViewCommandTests.cs
@@ -2,9 +2,120 @@ namespace UnitTests.ViewBaseTests;
 
 public class ViewCommandTests
 {
+    [Fact]
+    public void Command_Accept_Handled_Stops_Propagation_To_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = true };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                                   e.Handled = true;
+                               };
+
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (0, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    [Fact]
+    public void Command_Accept_Not_Handled_Propagates_To_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = true };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                               };
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (1, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    [Fact]
+    public void Command_Accept_Handled_Stops_Propagation_To_Not_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = false };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                                   e.Handled = true;
+                               };
+
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (0, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    [Fact]
+    public void Command_Accept_Not_Handled_Propagates_To_Not_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = false };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                               };
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (0, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    //[Fact]
+    //[AutoInitShutdown]
+    //public void HotKey_From_Non_IsDefaultAcceptView_Button_Raises_Accept_In_The_Default_Button ()
+    //{
+    //    var acceptOk = 0;
+    //    var acceptCancel = 0;
+    //    Button btnOk = new () { Id = "Ok", Text = "_Ok", IsDefaultAcceptView = true };
+    //    btnOk.Accepting += (s, e) => acceptOk++;
+    //    Button btnCancel = new () { Id = "Cancel", Y = 1, Text = "_Cancel" };
+    //    btnCancel.Accepting += (s, e) => acceptCancel++;
+    //    Application.Top = new ();
+    //    Application.Top.Add (btnOk, btnCancel);
+    //    var rs = Application.Begin (Application.Top);
+
+    //    Application.RaiseKeyDownEvent(Key.C);
+    //    Assert.Equal (1, acceptOk);
+    //    Assert.Equal (1, acceptCancel);
+
+    //    Application.End (rs);
+    //    Application.Top.Dispose ();
+    //    Application.ResetState ();
+    //}
+
     // See https://github.com/gui-cs/Terminal.Gui/issues/3913
     [Fact]
-    public void Button_IsDefault_Raises_Accepted_Correctly ()
+    public void Button_IsDefaultAcceptView_Raises_Accepted_Correctly ()
     {
         var aAcceptedCount = 0;
         var aCancelAccepting = false;
@@ -22,7 +133,7 @@ public void Button_IsDefault_Raises_Accepted_Correctly ()
         var btnA = new Button
         {
             Width = 3,
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         btnA.Accepting += (s, e) =>
@@ -53,26 +164,26 @@ public void Button_IsDefault_Raises_Accepted_Correctly ()
         Rectangle btn2Frame = btnB.FrameToScreen ();
 
         Application.RaiseMouseEvent (
-                                     new()
+                                     new ()
                                      {
                                          ScreenPosition = btn2Frame.Location,
                                          Flags = MouseFlags.Button1Clicked
                                      });
 
-        // Button A should have been accepted because B didn't cancel and A IsDefault
+        // Button A should have been accepted because B didn't cancel and A IsDefaultAcceptView
         Assert.Equal (1, aAcceptedCount);
         Assert.Equal (1, bAcceptedCount);
 
         bCancelAccepting = true;
 
         Application.RaiseMouseEvent (
-                                     new()
+                                     new ()
                                      {
                                          ScreenPosition = btn2Frame.Location,
                                          Flags = MouseFlags.Button1Clicked
                                      });
 
-        // Button A (IsDefault) should NOT have been accepted because B canceled
+        // Button A (IsDefaultAcceptView) should NOT have been accepted because B canceled
         Assert.Equal (1, aAcceptedCount);
         Assert.Equal (2, bAcceptedCount);
 
@@ -108,7 +219,7 @@ public void Button_CanFocus_False_Raises_Accepted_Correctly ()
         {
             Title = "Button",
             Width = 3,
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
         btn.CanFocus = true;
 
@@ -129,21 +240,21 @@ public void Button_CanFocus_False_Raises_Accepted_Correctly ()
         Rectangle btnFrame = btn.FrameToScreen ();
 
         Application.RaiseMouseEvent (
-                                     new()
+                                     new ()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Pressed
                                      });
 
         Application.RaiseMouseEvent (
-                                     new()
+                                     new ()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Released
                                      });
 
         Application.RaiseMouseEvent (
-                                     new()
+                                     new ()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Clicked
diff --git a/Tests/UnitTests/Views/ButtonTests.cs b/Tests/UnitTests/Views/ButtonTests.cs
index 6e3690eee7..ebdcf7b8d1 100644
--- a/Tests/UnitTests/Views/ButtonTests.cs
+++ b/Tests/UnitTests/Views/ButtonTests.cs
@@ -23,14 +23,14 @@ public void Constructors_Defaults ()
         btn.SetRelativeLayout (new (100, 100));
 
         Assert.Equal ($"{Glyphs.LeftBracket}  {Glyphs.RightBracket}", btn.TextFormatter.Text);
-        Assert.False (btn.IsDefault);
+        Assert.False (btn.IsDefaultAcceptView);
         Assert.Equal (Alignment.Center, btn.TextAlignment);
         Assert.Equal ('_', btn.HotKeySpecifier.Value);
         Assert.True (btn.CanFocus);
         Assert.Equal (new (0, 0, 4, 1), btn.Viewport);
         Assert.Equal (new (0, 0, 4, 1), btn.Frame);
         Assert.Equal ($"{Glyphs.LeftBracket}  {Glyphs.RightBracket}", btn.TextFormatter.Text);
-        Assert.False (btn.IsDefault);
+        Assert.False (btn.IsDefaultAcceptView);
         Assert.Equal (Alignment.Center, btn.TextAlignment);
         Assert.Equal ('_', btn.HotKeySpecifier.Value);
         Assert.True (btn.CanFocus);
@@ -49,7 +49,7 @@ public void Constructors_Defaults ()
         btn.Dispose ();
 
         btn = new () { App = ApplicationImpl.Instance,
-            Text = "_Test", IsDefault = true };
+            Text = "_Test", IsDefaultAcceptView = true };
         btn.Layout ();
         Assert.Equal (new (10, 1), btn.TextFormatter.ConstrainToSize);
 
@@ -63,7 +63,7 @@ public void Constructors_Defaults ()
                       $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} Test {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}",
                       btn.TextFormatter.Format ()
                      );
-        Assert.True (btn.IsDefault);
+        Assert.True (btn.IsDefaultAcceptView);
         Assert.Equal (Alignment.Center, btn.TextAlignment);
         Assert.True (btn.CanFocus);
 
@@ -82,7 +82,7 @@ public void Constructors_Defaults ()
         btn.Dispose ();
 
         btn = new () { App = ApplicationImpl.Instance,
-            X = 1, Y = 2, Text = "_abc", IsDefault = true };
+            X = 1, Y = 2, Text = "_abc", IsDefaultAcceptView = true };
         btn.BeginInit ();
         btn.EndInit ();
         Assert.Equal ("_abc", btn.Text);
@@ -92,7 +92,7 @@ public void Constructors_Defaults ()
                       $"{Glyphs.LeftBracket}{Glyphs.LeftDefaultIndicator} abc {Glyphs.RightDefaultIndicator}{Glyphs.RightBracket}",
                       btn.TextFormatter.Format ()
                      );
-        Assert.True (btn.IsDefault);
+        Assert.True (btn.IsDefaultAcceptView);
         Assert.Equal (Alignment.Center, btn.TextAlignment);
         Assert.Equal ('_', btn.HotKeySpecifier.Value);
         Assert.True (btn.CanFocus);
@@ -194,16 +194,16 @@ public void KeyBindings_Command ()
         Assert.True (clicked);
         clicked = false;
 
-        // IsDefault = false
+        // IsDefaultAcceptView = false
         // Space and Enter should work
-        Assert.False (btn.IsDefault);
+        Assert.False (btn.IsDefaultAcceptView);
         Assert.False (btn.NewKeyDownEvent (Key.Enter));
         Assert.True (clicked);
         clicked = false;
 
-        // IsDefault = true
+        // IsDefaultAcceptView = true
         // Space and Enter should work
-        btn.IsDefault = true;
+        btn.IsDefaultAcceptView = true;
         Assert.False (btn.NewKeyDownEvent (Key.Enter));
         Assert.True (clicked);
         clicked = false;
@@ -287,7 +287,7 @@ public void WantContinuousButtonPressed_True_ButtonClick_Accepts (MouseFlags pre
 
         var selectingCount = 0;
 
-        button.Selecting += (s, e) => selectingCount++;
+        button.Activating += (s, e) => selectingCount++;
         var acceptedCount = 0;
 
         button.Accepting += (s, e) =>
@@ -343,7 +343,7 @@ public void WantContinuousButtonPressed_True_ButtonPressRelease_Does_Not_Raise_S
 
         var selectingCount = 0;
 
-        button.Selecting += (s, e) =>
+        button.Activating += (s, e) =>
                             {
                                 selectingCount++;
                                 e.Handled = true;
diff --git a/Tests/UnitTests/Views/CheckBoxTests.cs b/Tests/UnitTests/Views/CheckBoxTests.cs
index a14d1c45d3..c9eda37e47 100644
--- a/Tests/UnitTests/Views/CheckBoxTests.cs
+++ b/Tests/UnitTests/Views/CheckBoxTests.cs
@@ -10,15 +10,107 @@ public class CheckBoxTests (ITestOutputHelper output)
 {
     private static readonly Size _size25x1 = new (25, 1);
 
+    [Theory]
+    [InlineData ("01234", 0, 0, 0, 0)]
+    [InlineData ("01234", 1, 0, 1, 0)]
+    [InlineData ("01234", 0, 1, 0, 1)]
+    [InlineData ("01234", 1, 1, 1, 1)]
+    [InlineData ("01234", 10, 1, 10, 1)]
+    [InlineData ("01234", 10, 3, 10, 3)]
+    [InlineData ("0_1234", 0, 0, 0, 0)]
+    [InlineData ("0_1234", 1, 0, 1, 0)]
+    [InlineData ("0_1234", 0, 1, 0, 1)]
+    [InlineData ("0_1234", 1, 1, 1, 1)]
+    [InlineData ("0_1234", 10, 1, 10, 1)]
+    [InlineData ("0_12你", 10, 3, 10, 3)]
+    [InlineData ("0_12你", 0, 0, 0, 0)]
+    [InlineData ("0_12你", 1, 0, 1, 0)]
+    [InlineData ("0_12你", 0, 1, 0, 1)]
+    [InlineData ("0_12你", 1, 1, 1, 1)]
+    [InlineData ("0_12你", 10, 1, 10, 1)]
+    public void CheckBox_AbsoluteSize_Text (string text, int width, int height, int expectedWidth, int expectedHeight)
+    {
+        var checkBox = new CheckBox
+        {
+            X = 0,
+            Y = 0,
+            Width = width,
+            Height = height,
+            Text = text
+        };
+        checkBox.Layout ();
 
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.Frame.Size);
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.Viewport.Size);
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.TextFormatter.ConstrainToSize);
 
-    #region Mouse Tests
+        checkBox.Dispose ();
+    }
 
+    [Theory]
+    [InlineData (0, 0, 0, 0)]
+    [InlineData (1, 0, 1, 0)]
+    [InlineData (0, 1, 0, 1)]
+    [InlineData (1, 1, 1, 1)]
+    [InlineData (10, 1, 10, 1)]
+    [InlineData (10, 3, 10, 3)]
+    public void CheckBox_AbsoluteSize_DefaultText (int width, int height, int expectedWidth, int expectedHeight)
+    {
+        var checkBox = new CheckBox
+        {
+            X = 0,
+            Y = 0,
+            Width = width,
+            Height = height
+        };
 
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.Frame.Size);
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.Viewport.Size);
+        Assert.Equal (new (expectedWidth, expectedHeight), checkBox.TextFormatter.ConstrainToSize);
 
+        checkBox.Dispose ();
+    }
 
+    // Test that Title and Text are the same
+    [Fact]
+    public void Text_Mirrors_Title ()
+    {
+        var view = new CheckBox ();
+        view.Title = "Hello";
+        Assert.Equal ("Hello", view.Title);
+        Assert.Equal ("Hello", view.TitleTextFormatter.Text);
 
-    #endregion Mouse Tests
+        Assert.Equal ("Hello", view.Text);
+        Assert.Equal ($"{Glyphs.CheckStateUnChecked} Hello", view.TextFormatter.Text);
+    }
+
+    [Fact]
+    public void Title_Mirrors_Text ()
+    {
+        var view = new CheckBox ();
+        view.Text = "Hello";
+        Assert.Equal ("Hello", view.Text);
+        Assert.Equal ($"{Glyphs.CheckStateUnChecked} Hello", view.TextFormatter.Text);
+
+        Assert.Equal ("Hello", view.Title);
+        Assert.Equal ("Hello", view.TitleTextFormatter.Text);
+    }
+
+    [Fact]
+    public void Constructors_Defaults ()
+    {
+        var ckb = new CheckBox ();
+        Assert.True (ckb.Width is DimAuto);
+        Assert.True (ckb.Height is DimAuto);
+        ckb.Layout ();
+        Assert.Equal (CheckState.UnChecked, ckb.CheckedState);
+        Assert.False (ckb.AllowCheckStateNone);
+        Assert.Equal (string.Empty, ckb.Text);
+        Assert.Equal ($"{Glyphs.CheckStateUnChecked} ", ckb.TextFormatter.Text);
+        Assert.True (ckb.CanFocus);
+        Assert.Equal (new (0, 0, 2, 1), ckb.Frame);
+
+    }
 
     [Fact]
     [AutoInitShutdown]
@@ -244,21 +336,6 @@ public void TextAlignment_Right ()
         top.Dispose ();
     }
 
-    [Fact]
-    public void HotKey_Command_Does_Not_Fire_Accept ()
-    {
-        var cb = new CheckBox ();
-        var accepted = false;
-
-        cb.Accepting += CheckBoxOnAccept;
-        cb.InvokeCommand (Command.HotKey);
-
-        Assert.False (accepted);
-
-        return;
-
-        void CheckBoxOnAccept (object sender, CommandEventArgs e) { accepted = true; }
-    }
 
     [Theory]
     [InlineData (CheckState.Checked)]
@@ -271,10 +348,10 @@ public void Activated_Handle_Event_Prevents_Change (CheckState initialState)
 
         ckb.CheckedState = initialState;
 
-        ckb.Selecting += OnActivating;
+        ckb.Activating += OnActivating;
 
         Assert.Equal (initialState, ckb.CheckedState);
-        bool? ret = ckb.InvokeCommand (Command.Select);
+        bool? ret = ckb.InvokeCommand (Command.Activate);
         Assert.True (ret);
         Assert.True (checkedInvoked);
         Assert.Equal (initialState, ckb.CheckedState);
diff --git a/Tests/UnitTests/Views/MenuBarTests.cs b/Tests/UnitTests/Views/MenuBarTests.cs
index 9657a3b445..4156912d5a 100644
--- a/Tests/UnitTests/Views/MenuBarTests.cs
+++ b/Tests/UnitTests/Views/MenuBarTests.cs
@@ -5,7 +5,7 @@ namespace UnitTests.ViewsTests;
 
 public class MenuBarTests ()
 {
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void DefaultKey_Activates_And_Opens ()
     {
@@ -53,7 +53,7 @@ public void DefaultKey_Activates_And_Opens ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void DefaultKey_Deactivates ()
     {
@@ -80,7 +80,7 @@ public void DefaultKey_Deactivates ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void QuitKey_Deactivates ()
     {
@@ -118,7 +118,7 @@ public void QuitKey_Deactivates ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuBarItem_HotKey_Activates_And_Opens ()
     {
@@ -150,7 +150,7 @@ public void MenuBarItem_HotKey_Activates_And_Opens ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuBarItem_HotKey_Deactivates ()
     {
@@ -188,7 +188,7 @@ public void MenuBarItem_HotKey_Deactivates ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuItems_HotKey_RaisesAction ()
     {
@@ -222,7 +222,7 @@ public void MenuItems_HotKey_RaisesAction ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuItems_HotKey_Deactivates ()
     {
@@ -259,7 +259,7 @@ public void MenuItems_HotKey_Deactivates ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void HotKey_Makes_PopoverMenu_Visible_Only_Once ()
     {
@@ -296,7 +296,7 @@ public void HotKey_Makes_PopoverMenu_Visible_Only_Once ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void WhenOpen_Other_MenuBarItem_HotKey_Activates_And_Opens ()
     {
@@ -341,7 +341,7 @@ public void WhenOpen_Other_MenuBarItem_HotKey_Activates_And_Opens ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Mouse_Enter_Activates_But_Does_Not_Open ()
     {
@@ -377,7 +377,7 @@ public void Mouse_Enter_Activates_But_Does_Not_Open ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Mouse_Click_Activates_And_Opens ()
     {
@@ -455,7 +455,7 @@ public void Mouse_Click_Deactivates ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Dynamic_Change_MenuItem_Title ()
     {
@@ -498,7 +498,7 @@ public void Dynamic_Change_MenuItem_Title ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Disabled_MenuBar_Is_Not_Activated ()
     {
@@ -529,7 +529,7 @@ public void Disabled_MenuBar_Is_Not_Activated ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuBarItem_Disabled_MenuBarItem_HotKey_No_Activate_Or_Open ()
     {
@@ -561,7 +561,7 @@ public void MenuBarItem_Disabled_MenuBarItem_HotKey_No_Activate_Or_Open ()
     }
 
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void MenuBarItem_Disabled_Popover_Is_Activated ()
     {
@@ -599,7 +599,7 @@ public void Resizing_Closes_Menus ()
 
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Update_MenuBarItem_HotKey_Works ()
     {
@@ -648,7 +648,7 @@ public void Update_MenuBarItem_HotKey_Works ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Visible_False_HotKey_Does_Not_Activate ()
     {
@@ -682,7 +682,7 @@ public void Visible_False_HotKey_Does_Not_Activate ()
         top.Dispose ();
     }
 
-    [Fact]
+    [Fact (Skip="Obsolete")]
     [AutoInitShutdown]
     public void Visible_False_MenuItem_Key_Does_Action ()
     {
diff --git a/Tests/UnitTests/Views/ShortcutTests.cs b/Tests/UnitTests/Views/ShortcutTests.cs
index c517afc96f..2aac7ca962 100644
--- a/Tests/UnitTests/Views/ShortcutTests.cs
+++ b/Tests/UnitTests/Views/ShortcutTests.cs
@@ -86,12 +86,12 @@ int expectedShortcutSelected
         var commandViewAcceptCount = 0;
         shortcut.CommandView.Accepting += (s, e) => { commandViewAcceptCount++; };
         var commandViewSelectCount = 0;
-        shortcut.CommandView.Selecting += (s, e) => { commandViewSelectCount++; };
+        shortcut.CommandView.Activating += (s, e) => { commandViewSelectCount++; };
 
         var shortcutAcceptCount = 0;
         shortcut.Accepting += (s, e) => { shortcutAcceptCount++; };
         var shortcutSelectCount = 0;
-        shortcut.Selecting += (s, e) => { shortcutSelectCount++; };
+        shortcut.Activating += (s, e) => { shortcutSelectCount++; };
 
         Application.TopRunnableView.Add (shortcut);
         Application.TopRunnableView.SetRelativeLayout (new (100, 100));
@@ -203,7 +203,7 @@ public void MouseClick_CheckBox_CommandView_Raises_Shortcut_Accepted_Selected_Co
         shortcut.CommandView.Accepting += (s, e) => { checkboxAccepted++; };
 
         var checkboxSelected = 0;
-        shortcut.CommandView.Selecting += (s, e) =>
+        shortcut.CommandView.Activating += (s, e) =>
                                          {
                                              if (e.Handled)
                                              {
@@ -217,7 +217,7 @@ public void MouseClick_CheckBox_CommandView_Raises_Shortcut_Accepted_Selected_Co
         Application.TopRunnableView.LayoutSubViews ();
 
         var selected = 0;
-        shortcut.Selecting += (s, e) =>
+        shortcut.Activating += (s, e) =>
         {
             selected++;
         };
@@ -278,7 +278,7 @@ public void KeyDown_Raises_Accepted_Selected (bool canFocus, KeyCode key, int ex
         shortcut.Accepting += (s, e) => accepted++;
 
         var selected = 0;
-        shortcut.Selecting += (s, e) => selected++;
+        shortcut.Activating += (s, e) => selected++;
 
         Application.RaiseKeyDownEvent (key);
 
diff --git a/Tests/UnitTests/Views/TableViewTests.cs b/Tests/UnitTests/Views/TableViewTests.cs
index 791501a088..ec3fed7ed2 100644
--- a/Tests/UnitTests/Views/TableViewTests.cs
+++ b/Tests/UnitTests/Views/TableViewTests.cs
@@ -3048,7 +3048,7 @@ public void TestToggleCells_MultiSelectOn ()
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
 
         tableView.MultiSelect = true;
-        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
 
         Point selectedCell = tableView.GetAllSelectedCells ().Single ();
         Assert.Equal (0, selectedCell.X);
@@ -3120,7 +3120,7 @@ public void TestToggleCells_MultiSelectOn_FullRowSelect ()
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
         tableView.FullRowSelect = true;
         tableView.MultiSelect = true;
-        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
 
         // Toggle Select Cell 0,0
         tableView.NewKeyDownEvent (new () { KeyCode = KeyCode.Space });
@@ -3160,7 +3160,7 @@ public void TestToggleCells_MultiSelectOn_SquareSelectToggled ()
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
         tableView.MultiSelect = true;
-        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
 
         // Make a square selection
         tableView.NewKeyDownEvent (new () { KeyCode = KeyCode.ShiftMask | KeyCode.CursorDown });
@@ -3201,7 +3201,7 @@ public void TestToggleCells_MultiSelectOn_Two_SquareSelects_BothToggled ()
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
         dt.Rows.Add (1, 2, 3, 4, 5, 6);
         tableView.MultiSelect = true;
-        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Select);
+        tableView.KeyBindings.ReplaceCommands (Key.Space, Command.Activate);
 
         // Make first square selection (0,0 to 1,1)
         tableView.NewKeyDownEvent (new () { KeyCode = KeyCode.ShiftMask | KeyCode.CursorDown });
diff --git a/Tests/UnitTests/Views/TextFieldTests.cs b/Tests/UnitTests/Views/TextFieldTests.cs
index 1207a9ae0d..99a2b96d0d 100644
--- a/Tests/UnitTests/Views/TextFieldTests.cs
+++ b/Tests/UnitTests/Views/TextFieldTests.cs
@@ -771,7 +771,7 @@ public void Accepted_Handler_Handled_Prevents_Default_Button_Accept (bool handle
         var button = new Button
         {
             Id = "button",
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         superView.Add (tf, button);
@@ -917,7 +917,7 @@ public void MouseEvent_Handled_Prevents_RightClick ()
 
         var tf = new TextField { Width = 10 };
         var clickCounter = 0;
-        tf.MouseClick += (s, m) => { clickCounter++; };
+        tf.Activating += (s, m) => { clickCounter++; };
 
         var top = new Runnable ();
         top.Add (tf);
diff --git a/Tests/UnitTestsParallelizable/Application/MouseTests.cs b/Tests/UnitTestsParallelizable/Application/MouseTests.cs
index 71dbd6b092..de63cbc20b 100644
--- a/Tests/UnitTestsParallelizable/Application/MouseTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/MouseTests.cs
@@ -208,7 +208,7 @@ bool expectedClicked
 
         var mouseEvent = new MouseEventArgs { Position = new (clickX, clickY), ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
 
-        view.MouseClick += (s, e) =>
+        view.MouseEvent += (s, e) =>
         {
             Assert.Equal (expectedX, e.Position.X);
             Assert.Equal (expectedY, e.Position.Y);
diff --git a/Tests/UnitTestsParallelizable/Text/RuneTests.cs b/Tests/UnitTestsParallelizable/Text/RuneTests.cs
index a2ec053f92..cf20931a91 100644
--- a/Tests/UnitTestsParallelizable/Text/RuneTests.cs
+++ b/Tests/UnitTestsParallelizable/Text/RuneTests.cs
@@ -950,7 +950,7 @@ public void TestSplit ()
     [InlineData ("𝔹", "utf-8", 4)]
     [InlineData ("𝔹", "utf-16", 4)]
     [InlineData ("𝔹", "utf-32", 3)]
-    public void GetEncodingLength_ReturnsLengthBasedOnSelectedEncoding (string runeStr, string encodingName, int expectedLength)
+    public void GetEncodingLength_ReturnsLengthBasedOnActivatedEncoding (string runeStr, string encodingName, int expectedLength)
     {
         Rune rune = runeStr.EnumerateRunes ().Single ();
         var encoding = Encoding.GetEncoding (encodingName);
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyBindingsTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyBindingsTests.cs
index 588654222f..e41a0840b9 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyBindingsTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Keyboard/KeyBindingsTests.cs
@@ -147,7 +147,7 @@ public void HotKey_Raises_HotKeyCommand ()
         app.Begin (new Runnable<bool> ());
         var hotKeyRaised = false;
         var acceptRaised = false;
-        var selectRaised = false;
+        var activatingRaised = false;
 
         var view = new View
         {
@@ -159,26 +159,26 @@ public void HotKey_Raises_HotKeyCommand ()
 
         view.HandlingHotKey += (s, e) => hotKeyRaised = true;
         view.Accepting += (s, e) => acceptRaised = true;
-        view.Selecting += (s, e) => selectRaised = true;
+        view.Activating += (s, e) => activatingRaised = true;
 
         Assert.Equal (KeyCode.T, view.HotKey);
         Assert.True (app.Keyboard.RaiseKeyDownEvent (Key.T));
         Assert.True (hotKeyRaised);
         Assert.False (acceptRaised);
-        Assert.False (selectRaised);
+        Assert.False (activatingRaised);
 
         hotKeyRaised = false;
         Assert.True (app.Keyboard.RaiseKeyDownEvent (Key.T.WithAlt));
         Assert.True (hotKeyRaised);
         Assert.False (acceptRaised);
-        Assert.False (selectRaised);
+        Assert.False (activatingRaised);
 
         hotKeyRaised = false;
         view.HotKey = KeyCode.E;
         Assert.True (app.Keyboard.RaiseKeyDownEvent (Key.E.WithAlt));
         Assert.True (hotKeyRaised);
         Assert.False (acceptRaised);
-        Assert.False (selectRaised);
+        Assert.False (activatingRaised);
     }
 
     // tests that test KeyBindingScope.Focus and KeyBindingScope.HotKey (tests for KeyBindingScope.Application are in Application/KeyboardTests.cs)
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
index 5f8450efad..ff916b46aa 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseEventRoutingTests.cs
@@ -195,7 +195,7 @@ public void MouseClick_OnSubView_RaisesMouseClickEvent ()
         superView.Add (subView);
 
         var clickCount = 0;
-        subView.MouseClick += (sender, args) => clickCount++;
+        subView.Activating += (sender, args) => clickCount++;
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -231,7 +231,7 @@ public void View_HandledEvent_StopsPropagation ()
             args.Handled = true; // Mark as handled
         };
 
-        view.MouseClick += (sender, args) => { clickHandlerCalled = true; };
+        view.Activating += (sender, args) => { clickHandlerCalled = true; };
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -264,7 +264,7 @@ public void View_UnhandledEvent_ContinuesProcessing ()
             // Don't set Handled = true
         };
 
-        view.MouseClick += (sender, args) => { clickHandlerCalled = true; };
+        view.Activating += (sender, args) => { clickHandlerCalled = true; };
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -311,7 +311,7 @@ public void View_MouseButtonEvents_RaiseCorrectHandlers (MouseFlags flags, int e
             }
         };
 
-        view.MouseClick += (sender, args) => { clickedCount++; };
+        view.Activating += (sender, args) => { clickedCount++; };
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -332,16 +332,13 @@ public void View_MouseButtonEvents_RaiseCorrectHandlers (MouseFlags flags, int e
 
     [Theory]
     [InlineData (MouseFlags.Button1Clicked)]
-    [InlineData (MouseFlags.Button2Clicked)]
-    [InlineData (MouseFlags.Button3Clicked)]
-    [InlineData (MouseFlags.Button4Clicked)]
     public void View_AllMouseButtons_TriggerClickEvent (MouseFlags clickFlag)
     {
         // Arrange
         View view = new () { Width = 10, Height = 10 };
         var clickCount = 0;
 
-        view.MouseClick += (sender, args) => clickCount++;
+        view.Activating += (sender, args) => clickCount++;
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -403,7 +400,7 @@ public void View_Disabled_DoesNotRaiseMouseClickEvent ()
         };
 
         var clickCalled = false;
-        view.MouseClick += (sender, args) => { clickCalled = true; };
+        view.Activating += (sender, args) => { clickCalled = true; };
 
         MouseEventArgs mouseEvent = new ()
         {
@@ -476,7 +473,7 @@ public void MouseClick_RaisesSelecting_WhenCanFocus ()
         superView.Add (view);
 
         var selectingCount = 0;
-        view.Selecting += (sender, args) => selectingCount++;
+        view.Activating += (sender, args) => selectingCount++;
 
         MouseEventArgs mouseEvent = new ()
         {
diff --git a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
index 9fa3d824f3..8370418635 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/Mouse/MouseTests.cs
@@ -39,7 +39,7 @@ public void MouseClick_SetsFocus_If_CanFocus (bool canFocus, bool setFocus, bool
     [InlineData (false, false, 1)]
     [InlineData (true, false, 1)]
     [InlineData (true, true, 1)]
-    public void MouseClick_Raises_Selecting (bool canFocus, bool setFocus, int expectedSelectingCount)
+    public void MouseClick_Raises_Accepting (bool canFocus, bool setFocus, int expectedSelectingCount)
     {
         var superView = new View { CanFocus = true, Height = 1, Width = 15 };
         var focusedView = new View { CanFocus = true, Width = 1, Height = 1 };
@@ -57,12 +57,12 @@ public void MouseClick_Raises_Selecting (bool canFocus, bool setFocus, int expec
             testView.SetFocus ();
         }
 
-        var selectingCount = 0;
-        testView.Selecting += (sender, args) => selectingCount++;
+        var activatingCount = 0;
+        testView.Activating += (sender, args) => activatingCount++;
 
         testView.NewMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked });
         Assert.True (superView.HasFocus);
-        Assert.Equal (expectedSelectingCount, selectingCount);
+        Assert.Equal (expectedSelectingCount, activatingCount);
     }
 
     [Theory]
diff --git a/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs b/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
index f358f58ed3..fc50a5dee3 100644
--- a/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
+++ b/Tests/UnitTestsParallelizable/ViewBase/ViewCommandTests.cs
@@ -127,7 +127,7 @@ public void MouseClick_Does_Not_Invoke_Accept_Command ()
 
     #endregion OnAccept/Accept tests
 
-    #region OnSelect/Select tests
+    #region OnActivate/Select tests
 
     [Theory]
     [CombinatorialData]
@@ -141,9 +141,9 @@ public void Select_Command_Raises_SetsFocus (bool canFocus)
         Assert.Equal (canFocus, view.CanFocus);
         Assert.False (view.HasFocus);
 
-        view.InvokeCommand (Command.Select);
+        view.InvokeCommand (Command.Activate);
 
-        Assert.Equal (1, view.OnSelectingCount);
+        Assert.Equal (1, view.OnActivatingCount);
 
         Assert.Equal (1, view.SelectingCount);
 
@@ -151,36 +151,36 @@ public void Select_Command_Raises_SetsFocus (bool canFocus)
     }
 
     [Fact]
-    public void Select_Command_Handle_OnSelecting_NoEvent ()
+    public void Select_Command_Handle_OnActivating_NoEvent ()
     {
         var view = new ViewEventTester ();
         Assert.False (view.HasFocus);
 
-        view.HandleOnSelecting = true;
-        Assert.True (view.InvokeCommand (Command.Select));
+        view.HandleOnActivating = true;
+        Assert.True (view.InvokeCommand (Command.Activate));
 
-        Assert.Equal (1, view.OnSelectingCount);
+        Assert.Equal (1, view.OnActivatingCount);
 
         Assert.Equal (0, view.SelectingCount);
     }
 
     [Fact]
-    public void Select_Handle_Event_OnSelecting_Returns_True ()
+    public void Select_Handle_Event_OnActivating_Returns_True ()
     {
         var view = new View ();
-        var selectingInvoked = false;
+        var activatingInvoked = false;
 
-        view.Selecting += ViewOnSelect;
+        view.Activating += ViewOnActivate;
 
-        bool? ret = view.InvokeCommand (Command.Select);
+        bool? ret = view.InvokeCommand (Command.Activate);
         Assert.True (ret);
-        Assert.True (selectingInvoked);
+        Assert.True (activatingInvoked);
 
         return;
 
-        void ViewOnSelect (object? sender, CommandEventArgs e)
+        void ViewOnActivate (object? sender, CommandEventArgs e)
         {
-            selectingInvoked = true;
+            activatingInvoked = true;
             e.Handled = true;
         }
     }
@@ -189,16 +189,16 @@ void ViewOnSelect (object? sender, CommandEventArgs e)
     public void Select_Command_Invokes_Selecting_Event ()
     {
         var view = new View ();
-        var selecting = false;
+        var activating = false;
 
-        view.Selecting += ViewOnSelecting;
+        view.Activating += ViewOnActivating;
 
-        view.InvokeCommand (Command.Select);
-        Assert.True (selecting);
+        view.InvokeCommand (Command.Activate);
+        Assert.True (activating);
 
         return;
 
-        void ViewOnSelecting (object? sender, CommandEventArgs e) { selecting = true; }
+        void ViewOnActivating (object? sender, CommandEventArgs e) { activating = true; }
     }
 
     [Fact]
@@ -207,10 +207,10 @@ public void MouseClick_Invokes_Select_Command ()
         var view = new ViewEventTester ();
         view.NewMouseEvent (new () { Flags = MouseFlags.Button1Clicked, Position = Point.Empty, View = view });
 
-        Assert.Equal (1, view.OnSelectingCount);
+        Assert.Equal (1, view.OnActivatingCount);
     }
 
-    #endregion OnSelect/Select tests
+    #endregion OnActivate/Select tests
 
     #region OnHotKey/HotKey tests
 
@@ -287,7 +287,7 @@ public ViewEventTester ()
                                   HandlingHotKeyCount++;
                               };
 
-            Selecting += (s, a) =>
+            Activating += (s, a) =>
                          {
                              a.Handled = HandleSelecting;
                              SelectingCount++;
@@ -328,18 +328,18 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
 
         public bool HandleHandlingHotKey { get; set; }
 
-        public int OnSelectingCount { get; set; }
+        public int OnActivatingCount { get; set; }
         public int SelectingCount { get; set; }
-        public bool HandleOnSelecting { get; set; }
+        public bool HandleOnActivating { get; set; }
         public bool HandleSelecting { get; set; }
 
 
         /// <inheritdoc/>
-        protected override bool OnSelecting (CommandEventArgs args)
+        protected override bool OnActivating (CommandEventArgs args)
         {
-            OnSelectingCount++;
+            OnActivatingCount++;
 
-            return HandleOnSelecting;
+            return HandleOnActivating;
         }
 
         public int OnCommandNotBoundCount { get; set; }
diff --git a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
index 2aa9a09c0a..7b57b1c41e 100644
--- a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
@@ -130,7 +130,7 @@ bool TestAllConstructorsOfType (Type type)
 
     [Theory]
     [MemberData (nameof (AllViewTypes))]
-    public void AllViews_Command_Select_Raises_Selecting (Type viewType)
+    public void AllViews_Command_Select_Raises_Accepting (Type viewType)
     {
         var view = CreateInstanceIfNotGeneric (viewType);
 
@@ -146,15 +146,15 @@ public void AllViews_Command_Select_Raises_Selecting (Type viewType)
             designable.EnableForDesign ();
         }
 
-        var selectingCount = 0;
-        view.Selecting += (s, e) => selectingCount++;
+        var activatingCount = 0;
+        view.Activating += (s, e) => activatingCount++;
 
         var acceptedCount = 0;
         view.Accepting += (s, e) => { acceptedCount++; };
 
-        if (view.InvokeCommand (Command.Select) == true)
+        if (view.InvokeCommand (Command.Activate) == true)
         {
-            Assert.Equal (1, selectingCount);
+            Assert.Equal (1, activatingCount);
             Assert.Equal (0, acceptedCount);
         }
         view?.Dispose ();
@@ -178,15 +178,15 @@ public void AllViews_Command_Accept_Raises_Accepting (Type viewType)
             designable.EnableForDesign ();
         }
 
-        var selectingCount = 0;
-        view.Selecting += (s, e) => selectingCount++;
+        var activatingCount = 0;
+        view.Activating += (s, e) => activatingCount++;
 
         var acceptingCount = 0;
         view.Accepting += (s, e) => { acceptingCount++; };
 
         if (view.InvokeCommand (Command.Accept) == true)
         {
-            Assert.Equal (0, selectingCount);
+            Assert.Equal (0, activatingCount);
             Assert.Equal (1, acceptingCount);
         }
         view?.Dispose ();
diff --git a/Tests/UnitTestsParallelizable/Views/CheckBoxTests.cs b/Tests/UnitTestsParallelizable/Views/CheckBoxTests.cs
index 047f2d8db7..28a54cf051 100644
--- a/Tests/UnitTestsParallelizable/Views/CheckBoxTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/CheckBoxTests.cs
@@ -21,15 +21,15 @@ public void Commands_Select ()
         var checkedStateChangingCount = 0;
         ckb.CheckedStateChanging += (s, e) => checkedStateChangingCount++;
 
-        var selectCount = 0;
-        ckb.Selecting += (s, e) => selectCount++;
+        var activatingCount = 0;
+        ckb.Activating += (s, e) => activatingCount++;
 
         var acceptCount = 0;
         ckb.Accepting += (s, e) => acceptCount++;
 
         Assert.Equal (CheckState.UnChecked, ckb.CheckedState);
         Assert.Equal (0, checkedStateChangingCount);
-        Assert.Equal (0, selectCount);
+        Assert.Equal (0, activatingCount);
         Assert.Equal (0, acceptCount);
         Assert.Equal (Key.Empty, ckb.HotKey);
 
@@ -39,24 +39,24 @@ public void Commands_Select ()
         ckb.NewKeyDownEvent (Key.T);
         Assert.Equal (CheckState.Checked, ckb.CheckedState);
         Assert.Equal (1, checkedStateChangingCount);
-        Assert.Equal (1, selectCount);
+        Assert.Equal (1, activatingCount);
         Assert.Equal (0, acceptCount);
 
         ckb.Text = "T_est";
         Assert.Equal (Key.E, ckb.HotKey);
         ckb.NewKeyDownEvent (Key.E.WithAlt);
         Assert.Equal (2, checkedStateChangingCount);
-        Assert.Equal (2, selectCount);
+        Assert.Equal (2, activatingCount);
         Assert.Equal (0, acceptCount);
 
         ckb.NewKeyDownEvent (Key.Space);
         Assert.Equal (3, checkedStateChangingCount);
-        Assert.Equal (3, selectCount);
+        Assert.Equal (3, activatingCount);
         Assert.Equal (0, acceptCount);
 
         ckb.NewKeyDownEvent (Key.Enter);
         Assert.Equal (3, checkedStateChangingCount);
-        Assert.Equal (3, selectCount);
+        Assert.Equal (3, activatingCount);
         Assert.Equal (1, acceptCount);
     }
 
@@ -250,7 +250,7 @@ public void Mouse_Click_Selects ()
         checkBox.CheckedStateChanging += (s, e) => checkedStateChangingCount++;
 
         var selectCount = 0;
-        checkBox.Selecting += (s, e) => selectCount++;
+        checkBox.Activating += (s, e) => selectCount++;
 
         var acceptCount = 0;
         checkBox.Accepting += (s, e) => acceptCount++;
@@ -292,7 +292,7 @@ public void Mouse_DoubleClick_Accepts ()
         checkBox.CheckedStateChanging += (s, e) => checkedStateChangingCount++;
 
         var selectCount = 0;
-        checkBox.Selecting += (s, e) => selectCount++;
+        checkBox.Activating += (s, e) => selectCount++;
 
         var acceptCount = 0;
 
diff --git a/Tests/UnitTestsParallelizable/Views/ListViewTests.cs b/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
index 90ab19d417..2eca9556b5 100644
--- a/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ListViewTests.cs
@@ -1239,7 +1239,7 @@ Item 3
                                                        _output, app.Driver
                                                       );
 
-        // EnsureSelectedItemVisible is auto enabled on the OnSelectedChanged
+        // EnsureSelectedItemVisible is auto enabled on the OnActivatedChanged
         lv.SelectedItem = 6;
         app.LayoutAndDraw ();
 
diff --git a/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
index 47bdcf8be6..60ad2adab8 100644
--- a/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
@@ -604,7 +604,7 @@ public void Button_IsDefault_True_Return_His_Index_On_Accepting (Key key)
         try
         {
             app.Iteration += OnApplicationOnIteration;
-            int? res = MessageBox.Query (app, "hey", "IsDefault", "Yes", "No");
+            int? res = MessageBox.Query (app, "hey", "IsDefaultAcceptView", "Yes", "No");
             app.Iteration -= OnApplicationOnIteration;
 
             Assert.Equal (0, res);
diff --git a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
index 2e6bfe7fa6..78812102b3 100644
--- a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
@@ -326,18 +326,18 @@ public void BindKeyToApplication_Changing_Adjusts_KeyBindings ()
         Assert.False (shortcut.App?.Keyboard.KeyBindings.TryGet (Key.A, out _));
     }
 
-    [Theory]
-    [InlineData (Orientation.Horizontal)]
-    [InlineData (Orientation.Vertical)]
-    public void Orientation_SetsCorrectly (Orientation orientation)
-    {
-        var shortcut = new Shortcut
-        {
-            Orientation = orientation
-        };
-
-        Assert.Equal (orientation, shortcut.Orientation);
-    }
+    //[Theory]
+    //[InlineData (Orientation.Horizontal)]
+    //[InlineData (Orientation.Vertical)]
+    //public void Orientation_SetsCorrectly (Orientation orientation)
+    //{
+    //    var shortcut = new Shortcut
+    //    {
+    //        Orientation = orientation
+    //    };
+
+    //    Assert.Equal (orientation, shortcut.Orientation);
+    //}
 
     [Theory]
     [InlineData (AlignmentModes.StartToEnd)]
@@ -417,15 +417,24 @@ public void Focus_CanFocus_Default_Is_True ()
         Assert.False (shortcut.CommandView.CanFocus);
     }
 
+
     [Fact]
-    public void Focus_CanFocus_CommandView_Add_Tracks ()
+    public void Focus_CommandView_Always_CanFocus_False_When_Added ()
     {
         Shortcut shortcut = new ();
         Assert.True (shortcut.CanFocus);
         Assert.False (shortcut.CommandView.CanFocus);
 
         shortcut.CommandView = new () { CanFocus = true };
-        Assert.True (shortcut.CommandView.CanFocus);
+        Assert.False (shortcut.CommandView.CanFocus);
+    }
+
+    [Fact]
+    public void Focus_Set_CanFocus_False_Does_Not_Impact_CommandView ()
+    {
+        Shortcut shortcut = new ();
+        Assert.True (shortcut.CanFocus);
+        Assert.False (shortcut.CommandView.CanFocus);
 
         shortcut.CommandView.CanFocus = true;
         Assert.True (shortcut.CommandView.CanFocus);
@@ -434,13 +443,21 @@ public void Focus_CanFocus_CommandView_Add_Tracks ()
         Assert.False (shortcut.CanFocus);
         Assert.True (shortcut.CommandView.CanFocus);
 
+        shortcut.CanFocus = true;
+        Assert.True (shortcut.CanFocus);
+        Assert.True (shortcut.CommandView.CanFocus);
+
         shortcut.CommandView.CanFocus = false;
-        Assert.False (shortcut.CanFocus);
+        Assert.True (shortcut.CanFocus);
         Assert.False (shortcut.CommandView.CanFocus);
 
-        shortcut.CommandView.CanFocus = true;
+        shortcut.CanFocus = false;
         Assert.False (shortcut.CanFocus);
-        Assert.True (shortcut.CommandView.CanFocus);
+        Assert.False (shortcut.CommandView.CanFocus);
+
+        shortcut.CanFocus = true;
+        Assert.True (shortcut.CanFocus);
+        Assert.False (shortcut.CommandView.CanFocus);
     }
 
     [Theory (Skip = "Broke somehow!")]
@@ -483,13 +500,13 @@ public void KeyDown_CheckBox_Raises_Accepted_Selected (bool canFocus, KeyCode ke
                                   e.Handled = true;
                               };
 
-        var selected = 0;
-        shortcut.Selecting += (s, e) => selected++;
+        var activatingCount = 0;
+        shortcut.Activating += (s, e) => activatingCount++;
 
         app.Keyboard.RaiseKeyDownEvent (key);
 
         Assert.Equal (expectedAccept, accepted);
-        Assert.Equal (expectedSelect, selected);
+        Assert.Equal (expectedSelect, activatingCount);
     }
 
 }
diff --git a/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs b/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
index bd49aa1d58..e995871404 100644
--- a/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextFieldTests.cs
@@ -49,7 +49,7 @@ public void Space_Does_Not_Raise_Selected ()
     {
         TextField tf = new ();
 
-        tf.Selecting += (sender, args) => Assert.Fail ("Selected should not be raied.");
+        tf.Activating += (sender, args) => Assert.Fail ("Activating should not be raised.");
 
         Runnable top = new ();
         top.Add (tf);
@@ -64,15 +64,15 @@ public void Enter_Does_Not_Raise_Selected ()
     {
         TextField tf = new ();
 
-        var selectingCount = 0;
-        tf.Selecting += (sender, args) => selectingCount++;
+        var activatingCount = 0;
+        tf.Activating += (sender, args) => activatingCount++;
 
         Runnable top = new ();
         top.Add (tf);
         tf.SetFocus ();
         top.NewKeyDownEvent (Key.Enter);
 
-        Assert.Equal (0, selectingCount);
+        Assert.Equal (0, activatingCount);
 
         top.Dispose ();
     }
@@ -152,7 +152,7 @@ public void Accepted_No_Handler_Enables_Default_Button_Accept ()
         var button = new Button
         {
             Id = "button",
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         superView.Add (tf, button);
diff --git a/Tests/UnitTestsParallelizable/Views/TextViewTests.cs b/Tests/UnitTestsParallelizable/Views/TextViewTests.cs
index ec7ba27f3c..ebca9fb765 100644
--- a/Tests/UnitTestsParallelizable/Views/TextViewTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/TextViewTests.cs
@@ -1856,7 +1856,7 @@ public void Accepted_Event_Handled_Prevents_Default_Button_Accept (bool multilin
 
         var button = new Button
         {
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         superView.Add (tv, button);
@@ -1904,7 +1904,7 @@ public void Accepted_No_Handler_Enables_Default_Button_Accept (bool multiline, i
 
         var button = new Button
         {
-            IsDefault = true
+            IsDefaultAcceptView = true
         };
 
         superView.Add (tv, button);
diff --git a/docfx/docs/View.md b/docfx/docs/View.md
index c22585d1eb..da6eb0c9ce 100644
--- a/docfx/docs/View.md
+++ b/docfx/docs/View.md
@@ -228,8 +228,8 @@ Events:
 - `HasFocusChanged` - After focus changes
 - `Accepting` - When Command.Accept is invoked (typically Enter key)
 - `Accepted` - After Command.Accept completes
-- `Selecting` - When Command.Select is invoked (typically Space or mouse click)
-- `Selected` - After Command.Select completes
+- `Selecting` - When Command.Activate is invoked (typically Space or mouse click)
+- `Selected` - After Command.Activate completes
 
 ### Scrolling
 
@@ -340,7 +340,7 @@ view.AddCommand (Command.Accept, () =>
 view.KeyBindings.Add (Key.Enter, Command.Accept);
 
 // Bind a mouse action to the command
-view.MouseBindings.Add (MouseFlags.Button1Clicked, Command.Select);
+view.MouseBindings.Add (MouseFlags.Button1Clicked, Command.Activate);
 ```
 
 ### Input
@@ -587,7 +587,7 @@ public class ColorPickerDialog : Runnable<Color?>
         
         _colorPicker = new ColorPicker16 { X = Pos.Center(), Y = 2 };
         
-        var okButton = new Button { Text = "OK", IsDefault = true };
+        var okButton = new Button { Text = "OK", IsDefaultAcceptView = true };
         okButton.Accepting += (s, e) => {
             Result = _colorPicker.SelectedColor;
             Application.RequestStop();
diff --git a/docfx/docs/application.md b/docfx/docs/application.md
index 86e08c185f..7fda827ec4 100644
--- a/docfx/docs/application.md
+++ b/docfx/docs/application.md
@@ -272,7 +272,7 @@ public class FileDialog : Runnable<string?>
         
         _pathField = new () { X = 1, Y = 1, Width = Dim.Fill (1) };
         
-        Button okButton = new () { Text = "OK", IsDefault = true };
+        Button okButton = new () { Text = "OK", IsDefaultAcceptView = true };
         okButton.Accepting += (s, e) =>
         {
             Result = _pathField.Text;
diff --git a/docfx/docs/command.md b/docfx/docs/command.md
index 41d6ca1cd5..9fd4f62606 100644
--- a/docfx/docs/command.md
+++ b/docfx/docs/command.md
@@ -10,11 +10,11 @@
 
 The `Command` system in Terminal.Gui provides a standardized framework for defining and executing actions that views can perform, such as selecting items, accepting input, or navigating content. Implemented primarily through the `View.Command` APIs, this system integrates tightly with input handling (e.g., keyboard and mouse events) and leverages the *Cancellable Work Pattern* to ensure extensibility, cancellation, and decoupling. Central to this system are the `Selecting` and `Accepting` events, which encapsulate common user interactions: `Selecting` for changing a view’s state or preparing it for interaction (e.g., toggling a checkbox, focusing a menu item), and `Accepting` for confirming an action or state (e.g., executing a menu command, submitting a dialog).
 
-This deep dive explores the `Command` and `View.Command` APIs, focusing on the `Selecting` and `Accepting` concepts, their implementation, and their propagation behavior. It critically evaluates the need for additional events (`Selected`/`Accepted`) and the propagation of `Selecting` events, drawing on insights from `Menu`, `MenuItemv2`, `MenuBar`, `CheckBox`, and `FlagSelector`. These implementations highlight the system’s application in hierarchical (menus) and stateful (checkboxes, flag selectors) contexts. The document reflects the current implementation, including the `Cancel` property in `CommandEventArgs` and local handling of `Command.Select`. An appendix briefly summarizes proposed changes from a filed issue to rename `Command.Select` to `Command.Activate`, replace `Cancel` with `Handled`, and introduce a propagation mechanism, addressing limitations in the current system.
+This deep dive explores the `Command` and `View.Command` APIs, focusing on the `Selecting` and `Accepting` concepts, their implementation, and their propagation behavior. It critically evaluates the need for additional events (`Selected`/`Accepted`) and the propagation of `Selecting` events, drawing on insights from `Menu`, `MenuItemv2`, `MenuBar`, `CheckBox`, and `FlagSelector`. These implementations highlight the system’s application in hierarchical (menus) and stateful (checkboxes, flag selectors) contexts. The document reflects the current implementation, including the `Cancel` property in `CommandEventArgs` and local handling of `Command.Activate`. An appendix briefly summarizes proposed changes from a filed issue to rename `Command.Activate` to `Command.Activate`, replace `Cancel` with `Handled`, and introduce a propagation mechanism, addressing limitations in the current system.
 
 ## Overview of the Command System
 
-The `Command` system in Terminal.Gui defines a set of standard actions via the `Command` enum (e.g., `Command.Select`, `Command.Accept`, `Command.HotKey`, `Command.StartOfPage`). These actions are triggered by user inputs (e.g., key presses, mouse clicks) or programmatically, enabling consistent view interactions.
+The `Command` system in Terminal.Gui defines a set of standard actions via the `Command` enum (e.g., `Command.Activate`, `Command.Accept`, `Command.HotKey`, `Command.StartOfPage`). These actions are triggered by user inputs (e.g., key presses, mouse clicks) or programmatically, enabling consistent view interactions.
 
 ### Key Components
 - **Command Enum**: Defines actions like `Select` (state change or interaction preparation), `Accept` (action confirmation), `HotKey` (hotkey activation), and others (e.g., `StartOfPage` for navigation).
@@ -43,9 +43,9 @@ Views register commands using `View.AddCommand`, associating a `Command` with a
 private void SetupCommands()
 {
     AddCommand(Command.Accept, RaiseAccepting);
-    AddCommand(Command.Select, ctx =>
+    AddCommand(Command.Activate, ctx =>
     {
-        if (RaiseSelecting(ctx) is true)
+        if (RaiseActivating(ctx) is true)
         {
             return true;
         }
@@ -88,9 +88,9 @@ public bool? InvokeCommand(Command command, ICommandContext? ctx)
 ```
 
 ### Command Routing
-Most commands route directly to the target view. `Command.Select` and `Command.Accept` have special routing:
-- `Command.Select`: Handled locally, with no propagation to superviews, relying on view-specific events (e.g., `SelectedMenuItemChanged` in `Menu`) for hierarchical coordination.
-- `Command.Accept`: Propagates to a default button (if `IsDefault = true`), superview, or `SuperMenuItem` (in menus).
+Most commands route directly to the target view. `Command.Activate` and `Command.Accept` have special routing:
+- `Command.Activate`: Handled locally, with no propagation to superviews, relying on view-specific events (e.g., `SelectedMenuItemChanged` in `Menu`) for hierarchical coordination.
+- `Command.Accept`: Propagates to a default button (if `IsDefaultAcceptView = true`), superview, or `SuperMenuItem` (in menus).
 
 **Example**: `Command.Accept` in `RaiseAccepting`:
 ```csharp
@@ -104,8 +104,8 @@ protected bool? RaiseAccepting(ICommandContext? ctx)
     }
     if (!args.Cancel)
     {
-        var isDefaultView = SuperView?.InternalSubViews.FirstOrDefault(v => v is Button { IsDefault: true });
-        if (isDefaultView != this && isDefaultView is Button { IsDefault: true } button)
+        var isDefaultView = SuperView?.InternalSubViews.FirstOrDefault(v => v is Button { IsDefaultAcceptView: true });
+        if (isDefaultView != this && isDefaultView is Button { IsDefaultAcceptView: true } button)
         {
             bool? handled = isDefaultView.InvokeCommand(Command.Accept, ctx);
             if (handled == true)
@@ -124,19 +124,19 @@ protected bool? RaiseAccepting(ICommandContext? ctx)
 
 ## The Selecting and Accepting Concepts
 
-The `Selecting` and `Accepting` events, along with their corresponding commands (`Command.Select`, `Command.Accept`), are designed to handle the most common user interactions with views:
+The `Selecting` and `Accepting` events, along with their corresponding commands (`Command.Activate`, `Command.Accept`), are designed to handle the most common user interactions with views:
 - **Selecting**: Changing a view’s state or preparing it for further interaction, such as highlighting an item in a list, toggling a checkbox, or focusing a menu item.
 - **Accepting**: Confirming an action or state, such as submitting a form, activating a button, or finalizing a selection.
 
 These concepts are opinionated, reflecting Terminal.Gui’s view that most UI interactions can be modeled as either state changes/preparation (selecting) or action confirmations (accepting). Below, we explore each concept, their implementation, use cases, and propagation behavior, using `Cancel` to reflect the current implementation.
 
 ### Selecting
-- **Definition**: `Selecting` represents a user action that changes a view’s state or prepares it for further interaction, such as selecting an item in a `ListView`, toggling a `CheckBox`, or focusing a `MenuItemv2`. It is associated with `Command.Select`, typically triggered by a spacebar press, single mouse click, navigation keys (e.g., arrow keys), or mouse enter (e.g., in menus).
-- **Event**: The `Selecting` event is raised by `RaiseSelecting`, allowing external code to modify or cancel the state change.
+- **Definition**: `Selecting` represents a user action that changes a view’s state or prepares it for further interaction, such as selecting an item in a `ListView`, toggling a `CheckBox`, or focusing a `MenuItemv2`. It is associated with `Command.Activate`, typically triggered by a spacebar press, single mouse click, navigation keys (e.g., arrow keys), or mouse enter (e.g., in menus).
+- **Event**: The `Selecting` event is raised by `RaiseActivating`, allowing external code to modify or cancel the state change.
 - **Virtual Method**: `OnSelecting` enables subclasses to preprocess or cancel the action.
 - **Implementation**:
   ```csharp
-  protected bool? RaiseSelecting(ICommandContext? ctx)
+  protected bool? RaiseActivating(ICommandContext? ctx)
   {
       CommandEventArgs args = new() { Context = ctx };
       if (OnSelecting(args) || args.Cancel)
@@ -162,7 +162,7 @@ These concepts are opinionated, reflecting Terminal.Gui’s view that most UI in
         {
             return true;
         }
-        if (RaiseSelecting(commandContext) is true)
+        if (RaiseActivating(commandContext) is true)
         {
             return true;
         }
@@ -183,7 +183,7 @@ These concepts are opinionated, reflecting Terminal.Gui’s view that most UI in
     ```csharp
     checkbox.Selecting += (sender, args) =>
     {
-        if (RaiseSelecting(args.Context) is true)
+        if (RaiseActivating(args.Context) is true)
         {
             args.Cancel = true;
             return;
@@ -196,14 +196,14 @@ These concepts are opinionated, reflecting Terminal.Gui’s view that most UI in
     ```
   - **Views without State**: For views like `Button`, `Selecting` typically sets focus but does not change state, making it less relevant.
 
-- **Propagation**: `Command.Select` is handled locally by the target view. If the command is unhandled (`null` or `false`), processing stops without propagating to the superview or other views. This is evident in `Menu`, where `SelectedMenuItemChanged` is used for hierarchical coordination, and in `CheckBox` and `FlagSelector`, where state changes are internal.
+- **Propagation**: `Command.Activate` is handled locally by the target view. If the command is unhandled (`null` or `false`), processing stops without propagating to the superview or other views. This is evident in `Menu`, where `SelectedMenuItemChanged` is used for hierarchical coordination, and in `CheckBox` and `FlagSelector`, where state changes are internal.
 
 ### Accepting
 - **Definition**: `Accepting` represents a user action that confirms or finalizes a view’s state or triggers an action, such as submitting a dialog, activating a button, or confirming a selection in a list. It is associated with `Command.Accept`, typically triggered by the Enter key or double-click.
 - **Event**: The `Accepting` event is raised by `RaiseAccepting`, allowing external code to modify or cancel the action.
 - **Virtual Method**: `OnAccepting` enables subclasses to preprocess or cancel the action.
 - **Implementation**: As shown above in `RaiseAccepting`.
-  - **Default Behavior**: Raises `Accepting` and propagates to a default button (if present in the superview with `IsDefault = true`) or the superview if not canceled.
+  - **Default Behavior**: Raises `Accepting` and propagates to a default button (if present in the superview with `IsDefaultAcceptView = true`) or the superview if not canceled.
   - **Cancellation**: `args.Cancel` or `OnAccepting` returning `true` halts the command.
   - **Context**: `ICommandContext` provides invocation details.
 
@@ -228,7 +228,7 @@ These concepts are opinionated, reflecting Terminal.Gui’s view that most UI in
   - **Dialog**: `Accepting` on a default button closes the dialog or triggers an action.
 
 - **Propagation**: `Command.Accept` propagates to:
-  - A default button (if present in the superview with `IsDefault = true`).
+  - A default button (if present in the superview with `IsDefaultAcceptView = true`).
   - The superview, enabling hierarchical handling (e.g., a dialog processes `Accept` if no button handles it).
   - In `Menu`, propagation extends to the `SuperMenuItem` for submenus in popovers, as seen in `OnAccepting`:
     ```csharp
@@ -289,12 +289,12 @@ The distinction between `Selecting` and `Accepting` is clear in theory:
 However, practical challenges arise:
 - **Overlapping Triggers**: In `ListView`, pressing Enter might both select an item (`Selecting`) and confirm it (`Accepting`), depending on the interaction model, potentially confusing developers. Similarly, in `Menu`, navigation (e.g., arrow keys) triggers `Selecting`, while Enter triggers `Accepting`, but the overlap in user intent can blur the lines.
 - **Stateless Views**: For views like `Button` or `MenuItemv2`, `Selecting` is limited to setting focus, which dilutes its purpose as a state-changing action and may confuse developers expecting a more substantial state change.
-- **Propagation Limitations**: The local handling of `Command.Select` restricts hierarchical coordination. For example, `MenuBar` relies on `SelectedMenuItemChanged` to manage `PopoverMenu` visibility, which is view-specific and not generalizable. This highlights a need for a propagation mechanism that maintains subview-superview decoupling.
+- **Propagation Limitations**: The local handling of `Command.Activate` restricts hierarchical coordination. For example, `MenuBar` relies on `SelectedMenuItemChanged` to manage `PopoverMenu` visibility, which is view-specific and not generalizable. This highlights a need for a propagation mechanism that maintains subview-superview decoupling.
 - **FlagSelector Design Flaw**: In `FlagSelector`, the `CheckBox.Selecting` handler incorrectly triggers both `Selecting` and `Accepting`, conflating state changes (toggling flags) with action confirmation (submitting the flag set). This violates the intended separation and requires a design fix to ensure `Selecting` is limited to subview state changes and `Accepting` is reserved for parent-level confirmation.
 
 **Recommendation**: Enhance documentation to clarify the `Selecting`/`Accepting` model:
 - Define `Selecting` as state changes or interaction preparation (e.g., item selection, toggling, focusing) and `Accepting` as action confirmations (e.g., submission, activation).
-- Explicitly note that `Command.Select` may set focus in stateless views (e.g., `Button`, `MenuItemv2`) but is primarily for state changes.
+- Explicitly note that `Command.Activate` may set focus in stateless views (e.g., `Button`, `MenuItemv2`) but is primarily for state changes.
 - Address `FlagSelector`’s conflation by refactoring its `Selecting` handler to separate state changes from confirmation.
 
 ## Evaluating Selected/Accepted Events
@@ -436,10 +436,10 @@ The need for `Selected` and `Accepted` events is under consideration, with `Acce
 
 ## Propagation of Selecting
 
-The current implementation of `Command.Select` is local, but `MenuBar` requires propagation to manage `PopoverMenu` visibility, highlighting a limitation in the system’s ability to support hierarchical coordination without view-specific mechanisms.
+The current implementation of `Command.Activate` is local, but `MenuBar` requires propagation to manage `PopoverMenu` visibility, highlighting a limitation in the system’s ability to support hierarchical coordination without view-specific mechanisms.
 
 ### Current Behavior
-- **Selecting**: `Command.Select` is handled locally by the target view, with no propagation to the superview or other views. If the command is unhandled (returns `null` or `false`), processing stops without further routing.
+- **Selecting**: `Command.Activate` is handled locally by the target view, with no propagation to the superview or other views. If the command is unhandled (returns `null` or `false`), processing stops without further routing.
   - **Rationale**: `Selecting` is typically view-specific, as state changes (e.g., highlighting a `ListView` item, toggling a `CheckBox`) or preparatory actions (e.g., focusing a `MenuItemv2`) are internal to the view. This is evident in `CheckBox`, where state toggling is self-contained:
     ```csharp
     private bool? AdvanceAndSelect(ICommandContext? commandContext)
@@ -449,7 +449,7 @@ The current implementation of `Command.Select` is local, but `MenuBar` requires
         {
             return true;
         }
-        if (RaiseSelecting(commandContext) is true)
+        if (RaiseActivating(commandContext) is true)
         {
             return true;
         }
@@ -498,11 +498,11 @@ The current implementation of `Command.Select` is local, but `MenuBar` requires
     ```
 
 ### Should Selecting Propagate?
-The local handling of `Command.Select` is sufficient for many views, but `MenuBar`’s need to manage `PopoverMenu` visibility highlights a gap in the current design, where hierarchical coordination relies on view-specific events like `SelectedMenuItemChanged`.
+The local handling of `Command.Activate` is sufficient for many views, but `MenuBar`’s need to manage `PopoverMenu` visibility highlights a gap in the current design, where hierarchical coordination relies on view-specific events like `SelectedMenuItemChanged`.
 
 - **Arguments For Propagation**:
   - **Hierarchical Coordination**: In `MenuBar`, propagation would allow the menu bar to react to `MenuItemv2` selections (e.g., focusing a menu item via arrow keys or mouse enter) to show or hide popovers, streamlining the interaction model. Without propagation, `MenuBar` depends on `SelectedMenuItemChanged`, which is specific to `Menu` and not reusable for other hierarchical components.
-  - **Consistency with Accepting**: `Command.Accept`’s propagation model supports hierarchical actions (e.g., dialog submission, menu command execution), suggesting that `Command.Select` could benefit from a similar approach to enable broader UI coordination, particularly in complex views like menus or dialogs.
+  - **Consistency with Accepting**: `Command.Accept`’s propagation model supports hierarchical actions (e.g., dialog submission, menu command execution), suggesting that `Command.Activate` could benefit from a similar approach to enable broader UI coordination, particularly in complex views like menus or dialogs.
   - **Future-Proofing**: Propagation could support other hierarchical components, such as `TabView` (coordinating tab selection) or nested dialogs (tracking subview state changes), enhancing the `Command` system’s flexibility for future use cases.
 
 - **Arguments Against Propagation**:
@@ -545,9 +545,9 @@ The local handling of `Command.Select` is sufficient for many views, but `MenuBa
 
 - **Context Insight**: The `MenuBar` implementation demonstrates a clear need for propagation to manage `PopoverMenu` visibility, as it must react to `MenuItemv2` selections (e.g., focus changes) across its submenu hierarchy. The reliance on `SelectedMenuItemChanged` works but is specific to `Menu`, limiting its applicability to other hierarchical components. In contrast, `CheckBox` and `FlagSelector` show that local handling is adequate for most stateful views, where state changes are self-contained or communicated via view-specific events. `ListView` similarly operates locally, with `SelectedItemChanged` or similar events handling external notifications. `Button`’s focus-based `Selecting` is inherently local, requiring no propagation. This dichotomy suggests that while propagation is critical for certain hierarchical scenarios (e.g., menus), it’s unnecessary for many views, and any propagation mechanism must avoid coupling subviews to superviews to maintain encapsulation.
 
-- **Verdict**: The local handling of `Command.Select` is sufficient for most views, including `CheckBox`, `FlagSelector`, `ListView`, and `Button`, where state changes or preparatory actions are internal or communicated via view-specific events. However, `MenuBar`’s requirement for hierarchical coordination to manage `PopoverMenu` visibility highlights a gap in the current design, where view-specific events like `SelectedMenuItemChanged` are used as a workaround. A generic propagation model would enhance flexibility for hierarchical components, but it must ensure that subviews (e.g., `MenuItemv2`) remain decoupled from superviews (e.g., `MenuBar`) to avoid implementation-specific dependencies. The current lack of propagation is a limitation, particularly for menus, but adding it requires careful design to avoid overcomplicating the API or impacting performance for views that don’t need it.
+- **Verdict**: The local handling of `Command.Activate` is sufficient for most views, including `CheckBox`, `FlagSelector`, `ListView`, and `Button`, where state changes or preparatory actions are internal or communicated via view-specific events. However, `MenuBar`’s requirement for hierarchical coordination to manage `PopoverMenu` visibility highlights a gap in the current design, where view-specific events like `SelectedMenuItemChanged` are used as a workaround. A generic propagation model would enhance flexibility for hierarchical components, but it must ensure that subviews (e.g., `MenuItemv2`) remain decoupled from superviews (e.g., `MenuBar`) to avoid implementation-specific dependencies. The current lack of propagation is a limitation, particularly for menus, but adding it requires careful design to avoid overcomplicating the API or impacting performance for views that don’t need it.
 
-**Recommendation**: Maintain the local handling of `Command.Select` for now, as it meets the needs of most views like `CheckBox`, `FlagSelector`, and `ListView`. For `MenuBar`, continue using `SelectedMenuItemChanged` as a temporary solution, but prioritize developing a generic propagation mechanism that supports hierarchical coordination without coupling subviews to superviews. This mechanism should allow superviews to opt-in to receiving `Selecting` events from subviews, ensuring encapsulation (see appendix for a proposed solution).
+**Recommendation**: Maintain the local handling of `Command.Activate` for now, as it meets the needs of most views like `CheckBox`, `FlagSelector`, and `ListView`. For `MenuBar`, continue using `SelectedMenuItemChanged` as a temporary solution, but prioritize developing a generic propagation mechanism that supports hierarchical coordination without coupling subviews to superviews. This mechanism should allow superviews to opt-in to receiving `Selecting` events from subviews, ensuring encapsulation (see appendix for a proposed solution).
 
 ## Recommendations for Refining the Design
 
@@ -555,7 +555,7 @@ Based on the analysis of the current `Command` and `View.Command` system, as imp
 
 1. **Clarify Selecting/Accepting in Documentation**:
    - Explicitly define `Selecting` as state changes or interaction preparation (e.g., toggling a `CheckBox`, focusing a `MenuItemv2`, selecting a `ListView` item) and `Accepting` as action confirmations (e.g., executing a menu command, submitting a dialog).
-   - Emphasize that `Command.Select` may set focus in stateless views (e.g., `Button`, `MenuItemv2`) but is primarily intended for state changes, to reduce confusion for developers.
+   - Emphasize that `Command.Activate` may set focus in stateless views (e.g., `Button`, `MenuItemv2`) but is primarily intended for state changes, to reduce confusion for developers.
    - Provide examples for each view type (e.g., `Menu`, `CheckBox`, `FlagSelector`, `ListView`, `Button`) to illustrate their distinct roles. For instance:
      - `Menu`: “`Selecting` focuses a `MenuItemv2` via arrow keys, while `Accepting` executes the selected command.”
      - `CheckBox`: “`Selecting` toggles the `CheckedState`, while `Accepting` confirms the current state.”
@@ -568,13 +568,13 @@ Based on the analysis of the current `Command` and `View.Command` system, as imp
      ```csharp
      checkbox.Selecting += (sender, args) =>
      {
-         if (RaiseSelecting(args.Context) is true)
+         if (RaiseActivating(args.Context) is true)
          {
              args.Cancel = true;
          }
      };
      ```
-   - This ensures `Selecting` only propagates state changes to the parent `FlagSelector` via `RaiseSelecting`, and `Accepting` is triggered separately (e.g., via Enter on the `FlagSelector` itself) to confirm the `Value`.
+   - This ensures `Selecting` only propagates state changes to the parent `FlagSelector` via `RaiseActivating`, and `Accepting` is triggered separately (e.g., via Enter on the `FlagSelector` itself) to confirm the `Value`.
 
 3. **Enhance ICommandContext with View-Specific State**:
    - Enrich `ICommandContext` with a `State` property to include view-specific data (e.g., the selected `MenuItemv2` in `Menu`, the new `CheckedState` in `CheckBox`, the updated `Value` in `FlagSelector`). This enables more informed event handlers without requiring view-specific subscriptions.
@@ -590,7 +590,7 @@ Based on the analysis of the current `Command` and `View.Command` system, as imp
      ```
    - Example: In `Menu`, include the `SelectedMenuItem` in `ICommandContext.State` for `Selecting` handlers:
      ```csharp
-     protected bool? RaiseSelecting(ICommandContext? ctx)
+     protected bool? RaiseActivating(ICommandContext? ctx)
      {
          ctx.State = SelectedMenuItem; // Provide selected MenuItemv2
          CommandEventArgs args = new() { Context = ctx };
@@ -613,7 +613,7 @@ Based on the analysis of the current `Command` and `View.Command` system, as imp
      - `TabView`: Consider potential needs for tab selection coordination if implemented in the future.
 
 5. **Improve Propagation for Hierarchical Views**:
-   - Recognize the limitation in `Command.Select`’s local handling for hierarchical components like `MenuBar`, where superviews need to react to subview selections (e.g., focusing a `MenuItemv2` to manage popovers). The current reliance on `SelectedMenuItemChanged` is effective but view-specific, limiting reusability.
+   - Recognize the limitation in `Command.Activate`’s local handling for hierarchical components like `MenuBar`, where superviews need to react to subview selections (e.g., focusing a `MenuItemv2` to manage popovers). The current reliance on `SelectedMenuItemChanged` is effective but view-specific, limiting reusability.
    - Develop a propagation mechanism that allows superviews to opt-in to receiving `Selecting` events from subviews without requiring subviews to know superview details, ensuring encapsulation. This could involve a new event or property in `View` to enable propagation while maintaining decoupling (see appendix for a proposed solution).
    - Example: For `MenuBar`, a propagation mechanism could allow it to handle `Selecting` events from `MenuItemv2` subviews to show or hide popovers, replacing the need for `SelectedMenuItemChanged`:
      ```csharp
@@ -661,8 +661,8 @@ By clarifying terminology, fixing implementation flaws (e.g., `FlagSelector`), e
 A filed issue proposes enhancements to the `Command` system to address limitations in terminology, cancellation semantics, and propagation, informed by `Menu`, `MenuBar`, `CheckBox`, and `FlagSelector`. These changes are not yet implemented but aim to improve clarity, consistency, and flexibility.
 
 ### Proposed Changes
-1. **Rename `Command.Select` to `Command.Activate`**:
-   - Replace `Command.Select`, `Selecting` event, `OnSelecting`, and `RaiseSelecting` with `Command.Activate`, `Activating`, `OnActivating`, and `RaiseActivating`.
+1. **Rename `Command.Activate` to `Command.Activate`**:
+   - Replace `Command.Activate`, `Selecting` event, `OnSelecting`, and `RaiseActivating` with `Command.Activate`, `Activating`, `OnActivating`, and `RaiseActivating`.
    - Rationale: “Select” is ambiguous for stateless views (e.g., `Button` focus) and imprecise for non-list state changes (e.g., `CheckBox` toggling). “Activate” better captures state changes and preparation.
    - Impact: Breaking change requiring codebase updates and migration guidance.
 
diff --git a/docfx/docs/events.md b/docfx/docs/events.md
index 88e7a457cb..c8bb543a90 100644
--- a/docfx/docs/events.md
+++ b/docfx/docs/events.md
@@ -213,14 +213,14 @@ public class Aligner : INotifyPropertyChanged
 
 ### 4. Event Propagation
 
-Events in Terminal.Gui often propagate through the view hierarchy. For example, in `Button`, the `Selecting` and `Accepting` events are raised as part of the command handling process:
+Events in Terminal.Gui often propagate through the view hierarchy. For example, in `Button`, the `Activating` and `Accepting` events are raised as part of the command handling process:
 
 ```csharp
 private bool? HandleHotKeyCommand (ICommandContext commandContext)
 {
-    bool cachedIsDefault = IsDefault; // Supports "Swap Default" in Buttons scenario where IsDefault changes
+    bool cachedIsDefault = IsDefaultAcceptView; // Supports "Swap Default" in Buttons scenario where IsDefaultAcceptView changes
 
-    if (RaiseSelecting (commandContext) is true)
+    if (RaiseActivating (commandContext) is true)
     {
         return true;
     }
@@ -244,7 +244,7 @@ private bool? HandleHotKeyCommand (ICommandContext commandContext)
 }
 ```
 
-This example shows how `Button` first raises the `Selecting` event, and if not canceled, proceeds to raise the `Accepting` event. If `Accepting` is not handled and the button is the default, it invokes the `Accept` command on the `SuperView`, demonstrating event propagation up the view hierarchy.
+This example shows how `Button` first raises the `Activating` event, and if not canceled, proceeds to raise the `Accepting` event. If `Accepting` is not handled and the button is the default, it invokes the `Accept` command on the `SuperView`, demonstrating event propagation up the view hierarchy.
 
 ## Event Context
 
diff --git a/docfx/docs/index.md b/docfx/docs/index.md
index 437d34ffcf..1f197e9baf 100644
--- a/docfx/docs/index.md
+++ b/docfx/docs/index.md
@@ -22,7 +22,7 @@ Welcome to the Terminal.Gui documentation! This comprehensive guide covers every
 - [Arrangement](~/docs/arrangement.md) - View arrangement and positioning strategies
 - [Cancellable Work Pattern](~/docs/cancellable-work-pattern.md) - Core design pattern for extensible workflows
 - [Character Map Scenario](~/docs/CharacterMap.md) - Complex drawing, scrolling, and Unicode rendering example
-- [Command System](~/docs/command.md) - Command execution, key bindings, and the Selecting/Accepting concepts
+- [Command System](~/docs/command.md) - Command execution, key bindings, and the Activating/Accepting concepts
 - [Configuration Management](~/docs/config.md) - Persistent settings, themes, and configuration scopes
 - [Cross-Platform Driver Model](~/docs/drivers.md) - Platform abstraction and console driver architecture
 - [Cursor System](~/docs/cursor.md) - Modern cursor management and positioning (proposed design)
diff --git a/docfx/docs/migratingfromv1.md b/docfx/docs/migratingfromv1.md
index 7e81994e60..39e43c36f1 100644
--- a/docfx/docs/migratingfromv1.md
+++ b/docfx/docs/migratingfromv1.md
@@ -93,7 +93,7 @@ public class FileDialog : Runnable<string?>
         _pathField = new TextField { Width = Dim.Fill() };
         Add(_pathField);
         
-        var okButton = new Button { Text = "OK", IsDefault = true };
+        var okButton = new Button { Text = "OK", IsDefaultAcceptView = true };
         okButton.Accepting += (s, e) => {
             Result = _pathField.Text;
             Application.RequestStop();
diff --git a/docfx/docs/mouse.md b/docfx/docs/mouse.md
index 56e8dff85d..45db5364eb 100644
--- a/docfx/docs/mouse.md
+++ b/docfx/docs/mouse.md
@@ -1,4 +1,4 @@
-# Mouse API
+# Mouse Deep Dive
 
 ## See Also
 
@@ -19,14 +19,12 @@ Tenets higher in the list have precedence over tenets lower in the list.
 
 *Terminal.Gui* provides the following APIs for handling mouse input:
 
-* **MouseEventArgs** - @Terminal.Gui.Input.MouseEventArgs provides a platform-independent abstraction for common mouse operations. It is used for processing mouse input and raising mouse events.
-
 * **Mouse Bindings** - Mouse Bindings provide a declarative method for handling mouse input in View implementations. The View calls @Terminal.Gui.ViewBase.View.AddCommand to declare it supports a particular command and then uses @Terminal.Gui.Input.MouseBindings to indicate which mouse events will invoke the command. 
 
-* **Mouse Events** - The Mouse Bindings API is rich enough to support the majority of use-cases. However, in some cases subscribing directly to mouse events is needed (e.g. drag & drop). Use @Terminal.Gui.ViewBase.View.MouseEvent and related events in these cases.
-
 * **Mouse State** - @Terminal.Gui.ViewBase.View.MouseState provides an abstraction for the current state of the mouse, enabling views to do interesting things like change their appearance based on the mouse state.
 
+* **Low-Level Mouse Events** - The **Mouse Bindings** and **Mouse State** APIs are rich enough to support the majority of use-cases. However, in some cases subscribing directly to mouse events is needed (e.g. drag & drop). Use @Terminal.Gui.ViewBase.View.MouseEvent and related events in these cases.
+
 Each of these APIs are described more fully below.
 
 ## Mouse Bindings
@@ -44,8 +42,8 @@ public class MyView : View
         AddCommand (Command.ScrollDown, () => ScrollVertical (1));
         MouseBindings.Add (MouseFlags.WheelDown, Command.ScrollDown);
         
-        AddCommand (Command.Select, () => SelectItem());
-        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Select);
+        AddCommand (Command.Activate, () => SelectItem());
+        MouseBindings.Add (MouseFlags.Button1Clicked, Command.Activate);
     }
 }
 ```
@@ -62,7 +60,38 @@ Here are some common mouse binding patterns used throughout Terminal.Gui:
 * **Scroll Events**: `MouseFlags.WheelUp` and `MouseFlags.WheelDown` for scrolling content
 * **Drag Events**: `MouseFlags.Button1Pressed` combined with mouse move tracking for drag operations
 
-## Mouse Events
+## Mouse State
+
+The @Terminal.Gui.ViewBase.View.MouseState property provides an abstraction for the current state of the mouse, enabling views to do interesting things like change their appearance based on the mouse state.
+
+Mouse states include:
+* **Normal** - Default state when mouse is not interacting with the view
+* **Over** - Mouse is positioned over the view
+* **Pressed** - Mouse button is pressed down while over the view
+* **Clicked** - Mouse was clicked on the view
+
+It works in conjunction with the @Terminal.Gui.ViewBase.View.HighlightStates which is a list of mouse states that will cause a view to become highlighted.
+
+Subscribe to the @Terminal.Gui.ViewBase.View.MouseStateChanged event to be notified when the mouse state changes:
+
+```cs
+view.MouseStateChanged += (sender, e) => 
+{
+    switch (e.NewState)
+    {
+        case MouseState.Over:
+            // Change appearance when mouse hovers
+            break;
+        case MouseState.Pressed:
+            // Change appearance when pressed
+            break;
+    }
+};
+```
+
+## Low-Level Mouse Events
+
+> ![NOTE] App developers should use @Terminal.Gui.Input.MouseBindings instead of these low-level APIs.
 
 At the core of *Terminal.Gui*'s mouse API is the @Terminal.Gui.Input.MouseEventArgs class. The @Terminal.Gui.Input.MouseEventArgs class provides a platform-independent abstraction for common mouse events. Every mouse event can be fully described in a @Terminal.Gui.Input.MouseEventArgs instance, and most of the mouse-related APIs are simply helper functions for decoding a @Terminal.Gui.Input.MouseEventArgs.
 
@@ -114,36 +143,7 @@ public class CustomView : View
 }
 ```
 
-## Mouse State
-
-The @Terminal.Gui.ViewBase.View.MouseState property provides an abstraction for the current state of the mouse, enabling views to do interesting things like change their appearance based on the mouse state.
-
-Mouse states include:
-* **Normal** - Default state when mouse is not interacting with the view
-* **Over** - Mouse is positioned over the view
-* **Pressed** - Mouse button is pressed down while over the view
-* **Clicked** - Mouse was clicked on the view
-
-It works in conjunction with the @Terminal.Gui.ViewBase.View.HighlightStates which is a list of mouse states that will cause a view to become highlighted.
-
-Subscribe to the @Terminal.Gui.ViewBase.View.MouseStateChanged event to be notified when the mouse state changes:
-
-```cs
-view.MouseStateChanged += (sender, e) => 
-{
-    switch (e.NewState)
-    {
-        case MouseState.Over:
-            // Change appearance when mouse hovers
-            break;
-        case MouseState.Pressed:
-            // Change appearance when pressed
-            break;
-    }
-};
-```
-
-## Mouse Button and Movement Concepts
+### Mouse Button and Movement Concepts
 
 * **Down** - Indicates the user pushed a mouse button down.
 * **Pressed** - Indicates the mouse button is down; for example if the mouse was pressed down and remains down for a period of time.
@@ -153,7 +153,7 @@ view.MouseStateChanged += (sender, e) =>
 * **Moved** - Indicates the mouse moved to a new location since the last mouse event.
 * **Wheel** - Indicates the mouse wheel was scrolled up or down.
 
-## Global Mouse Handling
+### Global Mouse Handling
 
 The @Terminal.Gui.App.Application.MouseEvent event can be used if an application wishes to receive all mouse events before they are processed by individual views:
 
@@ -169,25 +169,9 @@ App.Mouse.MouseEvent += (sender, e) =>
 };
 ```
 
-For view-specific mouse handling that needs access to application context, use `View.App`:
-
-```csharp
-public class MyView : View
-{
-    protected override bool OnMouseEvent(MouseEventArgs mouseEvent)
-    {
-        if (mouseEvent.Flags.HasFlag(MouseFlags.Button3Clicked))
-        {
-            // Access application mouse functionality through View.App
-            App?.MouseEvent?.Invoke(this, mouseEvent);
-            return true;
-        }
-        return base.OnMouseEvent(mouseEvent);
-    }
-}
-```
+### Mouse Enter/Leave Events
 
-## Mouse Enter/Leave Events
+> ![NOTE] App developers should use @Terminal.Gui.ViewBase.View.MouseState and @Terminal.Gui.ViewBase.View.HighlightStates to change the visual appearance of a View during mouse movement.
 
 The @Terminal.Gui.ViewBase.View.MouseEnter and @Terminal.Gui.ViewBase.View.MouseLeave events enable a View to take action when the mouse enters or exits the view boundary. Internally, this is used to enable @Terminal.Gui.ViewBase.View.Highlight functionality:
 
@@ -205,7 +189,7 @@ view.MouseLeave += (sender, e) =>
 };
 ```
 
-## Mouse Coordinate Systems
+### Mouse Coordinate Systems
 
 Mouse coordinates in Terminal.Gui are provided in multiple coordinate systems:
 
@@ -218,12 +202,12 @@ The `MouseEventArgs` provides both coordinate systems:
 
 ## Best Practices
 
-* **Use Mouse Bindings** when possible for simple mouse interactions - they integrate well with the Command system
+* **Use Mouse Bindings** when possible for mouse interactions - they integrate well with the Command system, are simple to implement, and drive user experience consistency.
+* **Use Mouse State** to provide visual feedback when users hover or interact with views.
 * **Handle Mouse Events directly** for complex interactions like drag-and-drop or custom gestures  
 * **Respect platform conventions** - use right-click for context menus, double-click for default actions
 * **Provide keyboard alternatives** - ensure all mouse functionality has keyboard equivalents
 * **Test with different terminals** - mouse support varies between terminal applications
-* **Use Mouse State** to provide visual feedback when users hover or interact with views
 
 ## Limitations and Considerations
 
diff --git a/docfx/docs/navigation.md b/docfx/docs/navigation.md
index 6ebb649115..4c33a14b22 100644
--- a/docfx/docs/navigation.md
+++ b/docfx/docs/navigation.md
@@ -450,7 +450,7 @@ The following table summarizes how built-in views respond to various input metho
 | **CheckBox** | 3 | No | No | 1 | OnSelect+Advance | OnAccept | OnAccept | Select | - | Select | No |
 | **OptionSelector** | >1 | No | No | 2+ | Advance | SetValue+OnAccept | Focus+SetValue | SetFocus+SetCursor | - | SetFocus+SetCursor | No |
 | **Slider** | >1 | No | No | 1 | SetFocusedOption | SetFocusedOption+OnAccept | Focus | SetFocus+SetOption | - | SetFocus+SetOption | Yes |
-| **ListView** | >1 | No | No | 1 | MarkUnMarkRow | OpenSelected+OnAccept | OnAccept | SetMark+OnSelectedChanged | OpenSelected+OnAccept | - | No |
+| **ListView** | >1 | No | No | 1 | MarkUnMarkRow | OpenSelected+OnAccept | OnAccept | SetMark+OnActivatedChanged | OpenSelected+OnAccept | - | No |
 | **TextField** | 1 | No | No | 1 | - | OnAccept | Focus | Focus | SelectAll | ContextMenu | No |
 | **TextView** | 1 | No | No | 1 | - | OnAccept | Focus | Focus | - | ContextMenu | Yes |
 
@@ -460,7 +460,7 @@ The following table summarizes how built-in views respond to various input metho
 - **Static**: Whether the view is primarily for display (non-interactive)
 - **Default**: Whether the view can be a default button (activated by Enter)
 - **HotKeys**: Number of hotkeys the view typically supports
-- **Select Cmd**: What happens when Command.Select is invoked
+- **Select Cmd**: What happens when Command.Activate is invoked
 - **Accept Cmd**: What happens when Command.Accept is invoked
 - **HotKey Cmd**: What happens when the view's hotkey is pressed
 - **Click Focus**: Behavior when clicked (if CanFocus=true)
@@ -480,7 +480,7 @@ var dialog = new Dialog()
     TabStop = TabBehavior.TabGroup
 };
 
-var okButton = new Button() { Text = "OK", IsDefault = true };
+var okButton = new Button() { Text = "OK", IsDefaultAcceptView = true };
 var cancelButton = new Button() { Text = "Cancel" };
 
 // Tab navigates between buttons, Enter activates default
@@ -560,7 +560,7 @@ foreach (var view in container.Subviews)
 
 // Provide keyboard alternatives to mouse actions
 view.KeyBindings.Add(Key.F10, Command.Context); // Right-click equivalent
-view.KeyBindings.Add(Key.Space, Command.Select); // Click equivalent
+view.KeyBindings.Add(Key.Space, Command.Activate); // Click equivalent
 ```
 
 For more information on accessibility standards, see:
diff --git a/docfx/docs/newinv2.md b/docfx/docs/newinv2.md
index f19dd6687c..8aa478ac4c 100644
--- a/docfx/docs/newinv2.md
+++ b/docfx/docs/newinv2.md
@@ -180,7 +180,7 @@ public class FileDialog : Runnable<string?>
         _pathField = new () { Width = Dim.Fill () };
         Add (_pathField);
         
-        Button okButton = new () { Text = "OK", IsDefault = true };
+        Button okButton = new () { Text = "OK", IsDefaultAcceptView = true };
         okButton.Accepting += (s, e) =>
         {
             Result = _pathField.Text;
diff --git a/local_packages/Terminal.Gui.2.0.0.nupkg b/local_packages/Terminal.Gui.2.0.0.nupkg
index f784c5fef6..eac65dfafc 100644
Binary files a/local_packages/Terminal.Gui.2.0.0.nupkg and b/local_packages/Terminal.Gui.2.0.0.nupkg differ
diff --git a/local_packages/Terminal.Gui.2.0.0.snupkg b/local_packages/Terminal.Gui.2.0.0.snupkg
index 5b2fcc1361..fe55b6b639 100644
Binary files a/local_packages/Terminal.Gui.2.0.0.snupkg and b/local_packages/Terminal.Gui.2.0.0.snupkg differ