diff --git a/Examples/CommunityToolkitExample/LoginView.cs b/Examples/CommunityToolkitExample/LoginView.cs
index a1ead6c33b..4e2d505fe5 100644
--- a/Examples/CommunityToolkitExample/LoginView.cs
+++ b/Examples/CommunityToolkitExample/LoginView.cs
@@ -47,7 +47,7 @@ public void Receive (Message<LoginActions> message)
                 {
                     loginProgressLabel.Text = ViewModel.LoginProgressMessage;
                     validationLabel.Text = ViewModel.ValidationMessage;
-                    validationLabel.ColorScheme = ViewModel.ValidationColorScheme;
+                    validationLabel.SetScheme (ViewModel.ValidationScheme);
                     break;
                 }
             case LoginActions.LoginProgress:
@@ -58,11 +58,11 @@ public void Receive (Message<LoginActions> message)
             case LoginActions.Validation:
                 {
                     validationLabel.Text = ViewModel.ValidationMessage;
-                    validationLabel.ColorScheme = ViewModel.ValidationColorScheme;
+                    validationLabel.SetScheme (ViewModel.ValidationScheme);
                     break;
                 }
         }
-        SetText();
+        SetText ();
         // BUGBUG: This should not be needed:
         Application.LayoutAndDraw ();
     }
diff --git a/Examples/CommunityToolkitExample/LoginViewModel.cs b/Examples/CommunityToolkitExample/LoginViewModel.cs
index 8d48546bbc..c2d6246409 100644
--- a/Examples/CommunityToolkitExample/LoginViewModel.cs
+++ b/Examples/CommunityToolkitExample/LoginViewModel.cs
@@ -29,7 +29,7 @@ internal partial class LoginViewModel : ObservableObject
     private string _usernameLengthMessage;
     
     [ObservableProperty]
-    private ColorScheme? _validationColorScheme;
+    private Scheme? _validationScheme;
 
     [ObservableProperty]
     private string _validationMessage;
@@ -107,14 +107,14 @@ private void SendMessage (LoginActions loginAction, string message = "")
              case LoginActions.Clear:
                 LoginProgressMessage = message;
                 ValidationMessage = INVALID_LOGIN_MESSAGE;
-                ValidationColorScheme = Colors.ColorSchemes ["Error"];
+                ValidationScheme = SchemeManager.GetScheme ("Error");
                 break;
             case LoginActions.LoginProgress:
                 LoginProgressMessage = message;
                 break;
             case LoginActions.Validation:
                 ValidationMessage = CanLogin ? VALID_LOGIN_MESSAGE : INVALID_LOGIN_MESSAGE;
-                ValidationColorScheme = CanLogin ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"];
+                ValidationScheme = CanLogin ? SchemeManager.GetScheme ("Base") : SchemeManager.GetScheme("Error");
                 break;
         }
         WeakReferenceMessenger.Default.Send (new Message<LoginActions> { Value = loginAction });
diff --git a/Examples/CommunityToolkitExample/Program.cs b/Examples/CommunityToolkitExample/Program.cs
index a9ababfec6..a89b3848fa 100644
--- a/Examples/CommunityToolkitExample/Program.cs
+++ b/Examples/CommunityToolkitExample/Program.cs
@@ -9,10 +9,11 @@ public static class Program
 
     private static void Main (string [] args)
     {
+        ConfigurationManager.Enable (ConfigLocations.All);
         Services = ConfigureServices ();
         Application.Init ();
         Application.Run (Services.GetRequiredService<LoginView> ());
-        Application.Top?.Dispose();
+        Application.Top?.Dispose ();
         Application.Shutdown ();
     }
 
diff --git a/Examples/CommunityToolkitExample/README.md b/Examples/CommunityToolkitExample/README.md
index c3a7128685..908ae592b8 100644
--- a/Examples/CommunityToolkitExample/README.md
+++ b/Examples/CommunityToolkitExample/README.md
@@ -115,7 +115,7 @@ private void SendMessage (LoginAction loginAction, string message = "")
             break;
         case LoginAction.Validation:
             ValidationMessage = CanLogin ? VALID_LOGIN_MESSAGE : INVALID_LOGIN_MESSAGE;
-            ValidationColorScheme = CanLogin ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"];
+            ValidationScheme = CanLogin ? Colors.Schemes ["Base"] : Colors.Schemes ["Error"];
             break;
     }
     WeakReferenceMessenger.Default.Send (new Message<LoginAction> { Value = loginAction });
@@ -144,7 +144,7 @@ public void Receive (Message<LoginAction> message)
         case LoginAction.Validation:
             {
                 validationLabel.Text = ViewModel.ValidationMessage;
-                validationLabel.ColorScheme = ViewModel.ValidationColorScheme;
+                validationLabel.Scheme = ViewModel.ValidationScheme;
                 break;
             }
     }
diff --git a/Examples/Example/Example.cs b/Examples/Example/Example.cs
index 80d3de35de..5492208482 100644
--- a/Examples/Example/Example.cs
+++ b/Examples/Example/Example.cs
@@ -3,11 +3,11 @@
 
 // A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
 
-using System;
 using Terminal.Gui;
 
 // Override the default configuration for the application to use the Light theme
 ConfigurationManager.RuntimeConfig = """{ "Theme": "Light" }""";
+ConfigurationManager.Enable(ConfigLocations.All);
 
 Application.Run<ExampleWindow> ().Dispose ();
 
@@ -21,7 +21,7 @@
 // Defines a top-level window with border and title
 public class ExampleWindow : Window
 {
-    public static string UserName;
+    public static string UserName { get; set; }
 
     public ExampleWindow ()
     {
diff --git a/Examples/NativeAot/Program.cs b/Examples/NativeAot/Program.cs
index 87bc2ae610..ff5636fdf6 100644
--- a/Examples/NativeAot/Program.cs
+++ b/Examples/NativeAot/Program.cs
@@ -13,6 +13,7 @@ public static class Program
     [RequiresDynamicCode ("Calls Terminal.Gui.Application.Init(IConsoleDriver, String)")]
     private static void Main (string [] args)
     {
+        ConfigurationManager.Enable(ConfigLocations.All);
         Application.Init ();
 
         #region The code in this region is not intended for use in a native Aot self-contained. It's just here to make sure there is no functionality break with localization in Terminal.Gui using self-contained
diff --git a/Examples/ReactiveExample/LoginView.cs b/Examples/ReactiveExample/LoginView.cs
index 130aebb43b..4cef902fdc 100644
--- a/Examples/ReactiveExample/LoginView.cs
+++ b/Examples/ReactiveExample/LoginView.cs
@@ -96,8 +96,8 @@ public LoginView (LoginViewModel viewModel)
 
                 ViewModel
                     .WhenAnyValue (x => x.IsValid)
-                    .Select (valid => valid ? Colors.ColorSchemes ["Base"] : Colors.ColorSchemes ["Error"])
-                    .BindTo (validation, x => x.ColorScheme)
+                    .Select (valid => valid ? SchemeManager.GetScheme ("Base") : SchemeManager.GetScheme ("Error"))
+                    .BindTo (validation, x => x.GetScheme ())
                     .DisposeWith (_disposable);
             })
             .AddControlAfter<Button> ((previous, login) =>
diff --git a/Examples/ReactiveExample/Program.cs b/Examples/ReactiveExample/Program.cs
index e47cc94289..10b5bd3dab 100644
--- a/Examples/ReactiveExample/Program.cs
+++ b/Examples/ReactiveExample/Program.cs
@@ -8,6 +8,7 @@ public static class Program
 {
     private static void Main (string [] args)
     {
+        ConfigurationManager.Enable (ConfigLocations.All);
         Application.Init ();
         RxApp.MainThreadScheduler = TerminalScheduler.Default;
         RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
diff --git a/Examples/SelfContained/Program.cs b/Examples/SelfContained/Program.cs
index 2e65c2e541..c9b71a64f3 100644
--- a/Examples/SelfContained/Program.cs
+++ b/Examples/SelfContained/Program.cs
@@ -12,6 +12,7 @@ public static class Program
     [RequiresUnreferencedCode ("Calls Terminal.Gui.Application.Run<T>(Func<Exception, Boolean>, IConsoleDriver)")]
     private static void Main (string [] args)
     {
+        ConfigurationManager.Enable (ConfigLocations.All);
         Application.Init ();
 
         #region The code in this region is not intended for use in a self-contained single-file. It's just here to make sure there is no functionality break with localization in Terminal.Gui using single-file
diff --git a/Examples/UICatalog/Properties/launchSettings.json b/Examples/UICatalog/Properties/launchSettings.json
index 609e7cedbb..0ef93b39c0 100644
--- a/Examples/UICatalog/Properties/launchSettings.json
+++ b/Examples/UICatalog/Properties/launchSettings.json
@@ -1,7 +1,8 @@
 {
   "profiles": {
     "UICatalog": {
-      "commandName": "Project"
+      "commandName": "Project",
+      "commandLineArgs": "--debug-log-level Debug"
     },
     "UICatalog --driver NetDriver": {
       "commandName": "Project",
@@ -60,9 +61,17 @@
       "commandName": "Project",
       "commandLineArgs": "\"All Views Tester\" -b -t 5000"
     },
-    "Charmap": {
+    "UICatalog --disable-cm": {
+      "commandName": "Project",
+      "commandLineArgs": "--disable-cm\r\n"
+    },
+    "UICatalog --disable-cm --driver v2win": {
+      "commandName": "Project",
+      "commandLineArgs": "--disable-cm --driver v2win"
+    },
+    "Themes": {
       "commandName": "Project",
-      "commandLineArgs": "Bars -b"
+      "commandLineArgs": "Themes"
     }
   }
 }
\ No newline at end of file
diff --git a/Examples/UICatalog/Resources/config.json b/Examples/UICatalog/Resources/config.json
index 5aa533b7f3..3d92db91fa 100644
--- a/Examples/UICatalog/Resources/config.json
+++ b/Examples/UICatalog/Resources/config.json
@@ -4,37 +4,12 @@
   "FileDialogStyle.DefaultUseColors": false,
   "FileDialogStyle.DefaultUseUnicodeCharacters": false,
   "AppSettings": {
-    "UICatalog.StatusBar": true,
-    "ConfigurationEditor.EditorColorScheme": {
-      "Normal": {
-        "Foreground": "Red",
-        "Background": "White"
-      },
-      "Focus": {
-        "Foreground": "Green",
-        "Background": "White"
-      },
-      "HotNormal": {
-        "Foreground": "Black",
-        "Background": "White"
-      },
-      "HotFocus": {
-        "Foreground": "White",
-        "Background": "BrightRed"
-      },
-      "Disabled": {
-        "Foreground": "DarkGray",
-        "Background": "White"
-      }
-    }
+    "UICatalog.StatusBar": true
   },
   "Themes": [
     {
       "Hot Dog Stand": {
-        "Button.DefaultShadow": "Opaque",
-        "Dialog.DefaultShadow": "Transparent",
-        "Dialog.DefaultButtonAlignment": "Center",
-        "ColorSchemes": [
+        "Schemes": [
           {
             "Toplevel": {
               "Normal": {
@@ -160,10 +135,24 @@
     },
     {
       "UI Catalog Theme": {
-        "Button.DefaultShadow": "Opaque",
-        "Dialog.DefaultShadow": "Transparent",
-        "Dialog.DefaultButtonAlignment": "Center",
-        "ColorSchemes": [
+        "Window.DefaultShadow": "Transparent",
+        "CheckBox.DefaultHighlightStyle": "Hover, Pressed, PressedOutside",
+        "MessageBox.DefaultButtonAlignment": "Start",
+        "StatusBar.DefaultSeparatorLineStyle": "Single",
+        "Dialog.DefaultMinimumWidth": 80,
+        "MessageBox.DefaultBorderStyle": "Dotted",
+        "NerdFonts.Enable": false,
+        "MessageBox.DefaultMinimumWidth": 0,
+        "Window.DefaultBorderStyle": "Double",
+        "Dialog.DefaultShadow": "Opaque",
+        "Dialog.DefaultButtonAlignment": "Start",
+        "Button.DefaultShadow": "Transparent",
+        "FrameView.DefaultBorderStyle": "Double",
+        "MessageBox.DefaultMinimumHeight": 0,
+        "Button.DefaultHighlightStyle": "Hover, Pressed",
+        "Menuv2.DefaultBorderStyle": "Heavy",
+        "MenuBarv2.DefaultBorderStyle": "Heavy",
+        "Schemes": [
           {
             "UI Catalog Scheme": {
               "Normal": {
diff --git a/Examples/UICatalog/Scenarios/Adornments.cs b/Examples/UICatalog/Scenarios/Adornments.cs
index 86dce6f4b2..3374d07866 100644
--- a/Examples/UICatalog/Scenarios/Adornments.cs
+++ b/Examples/UICatalog/Scenarios/Adornments.cs
@@ -36,7 +36,7 @@ public override void Main ()
             Title = "The _Window",
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Movable,
 
-            Width = Dim.Fill (Dim.Func (() => editor.Frame.Width )),
+            Width = Dim.Fill (Dim.Func (() => editor.Frame.Width)),
             Height = Dim.Fill ()
         };
         app.Add (window);
@@ -47,13 +47,15 @@ public override void Main ()
 
         color.ColorChanged += (s, e) =>
                               {
-                                  color.SuperView.ColorScheme = new (color.SuperView.ColorScheme)
-                                  {
-                                      Normal = new (
-                                                    color.SuperView.ColorScheme.Normal.Foreground,
-                                                    e.CurrentValue
-                                                   )
-                                  };
+                                  color.SuperView!.SetScheme (
+                                                             new (color.SuperView.GetScheme ())
+                                                             {
+                                                                 Normal = new (
+                                                                               color.SuperView.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                               e.CurrentValue,
+                                                                               color.SuperView.GetAttributeForRole (VisualRole.Normal).Style
+                                                                              )
+                                                             });
                               };
 
         var button = new Button { X = Pos.Center (), Y = Pos.Center (), Text = "Press me!" };
@@ -80,7 +82,7 @@ public override void Main ()
             Width = 40,
             Height = Dim.Percent (20),
             Text = "Label\nY=AnchorEnd(),Height=Dim.Percent(10)",
-            ColorScheme = Colors.ColorSchemes ["Dialog"]
+            SchemeName = "Dialog"
         };
 
         window.Margin.Data = "Margin";
@@ -94,7 +96,7 @@ public override void Main ()
         window.Padding.Data = "Padding";
         window.Padding.Text = "Padding Text line 1\nPadding Text line 3\nPadding Text line 3\nPadding Text line 4\nPadding Text line 5";
         window.Padding.Thickness = new (3);
-        window.Padding.ColorScheme = Colors.ColorSchemes ["Error"];
+        window.Padding.SchemeName = "Error";
         window.Padding.CanFocus = true;
 
         var longLabel = new Label
diff --git a/Examples/UICatalog/Scenarios/AllViewsTester.cs b/Examples/UICatalog/Scenarios/AllViewsTester.cs
index 67a049acd3..6c6b203ccd 100644
--- a/Examples/UICatalog/Scenarios/AllViewsTester.cs
+++ b/Examples/UICatalog/Scenarios/AllViewsTester.cs
@@ -21,10 +21,7 @@ public class AllViewsTester : Scenario
     private ArrangementEditor? _arrangementEditor;
     private LayoutEditor? _layoutEditor;
     private ViewportSettingsEditor? _viewportSettingsEditor;
-    private FrameView? _settingsPane;
-    private RadioGroup? _orientation;
-    private string _demoText = "This, that, and the other thing.";
-    private TextView? _demoTextView;
+    private ViewPropertiesEditor? _propertiesEditor;
 
     private FrameView? _hostPane;
     private View? _curView;
@@ -38,13 +35,13 @@ public override void Main ()
         var app = new Window
         {
             Title = GetQuitKeyAndName (),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
         };
 
         // Set the BorderStyle we use for all subviews, but disable the app border thickness
         app.Border!.LineStyle = LineStyle.Heavy;
         app.Border.Thickness = new (0);
 
+
         _viewClasses = GetAllViewClassesCollection ()
                        .OrderBy (t => t.Name)
                        .Select (t => new KeyValuePair<string, Type> (t.Name, t))
@@ -148,9 +145,9 @@ public override void Main ()
         };
         _viewportSettingsEditor.Border!.Thickness = new (1, 1, 1, 1);
 
-        _settingsPane = new ()
+        _propertiesEditor = new ()
         {
-            Title = "Misc Settings [_6]",
+            Title = "View Properties [_6]",
             X = Pos.Right (_adornmentsEditor) - 1,
             Y = Pos.Bottom (_viewportSettingsEditor) - Pos.Func (() => _viewportSettingsEditor.Frame.Height == 1 ? 0 : 1),
             Width = Dim.Width (_layoutEditor),
@@ -158,49 +155,7 @@ public override void Main ()
             CanFocus = true,
             SuperViewRendersLineCanvas = true
         };
-        _settingsPane.Border!.Thickness = new (1, 1, 1, 0);
-
-        Label label = new () { X = 0, Y = 0, Text = "_Orientation:" };
-
-        _orientation = new ()
-        {
-            X = Pos.Right (label) + 1,
-            Y = Pos.Top (label),
-            RadioLabels = new [] { "Horizontal", "Vertical" },
-            Orientation = Orientation.Horizontal
-        };
-
-        _orientation.SelectedItemChanged += (s, selected) =>
-                                            {
-                                                if (_curView is IOrientation orientatedView)
-                                                {
-                                                    orientatedView.Orientation = (Orientation)_orientation.SelectedItem;
-                                                }
-                                            };
-        _settingsPane.Add (label, _orientation);
-
-        label = new () { X = 0, Y = Pos.Bottom (_orientation), Text = "_Text:" };
-
-        _demoTextView = new ()
-        {
-            X = Pos.Right (label) + 1,
-            Y = Pos.Top (label),
-            Width = Dim.Fill (),
-            Height = Dim.Auto (minimumContentDim: 2),
-            Text = _demoText
-        };
-
-        _demoTextView.ContentsChanged += (s, e) =>
-                                         {
-                                             _demoText = _demoTextView.Text;
-
-                                             if (_curView is { })
-                                             {
-                                                 _curView.Text = _demoText;
-                                             }
-                                         };
-
-        _settingsPane.Add (label, _demoTextView);
+        _propertiesEditor.Border!.Thickness = new (1, 1, 1, 0);
 
         _eventLog = new ()
         {
@@ -235,22 +190,22 @@ public override void Main ()
         {
             Id = "_hostPane",
             X = Pos.Right (_adornmentsEditor),
-            Y = Pos.Bottom (_settingsPane),
+            Y = Pos.Bottom (_propertiesEditor),
             Width = Dim.Width (_layoutEditor) - 2,
             Height = Dim.Fill (),
             CanFocus = true,
             TabStop = TabBehavior.TabStop,
-            ColorScheme = Colors.ColorSchemes ["Base"],
+            //SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base),
             Arrangement = ViewArrangement.LeftResizable | ViewArrangement.BottomResizable | ViewArrangement.RightResizable,
             BorderStyle = LineStyle.Double,
             SuperViewRendersLineCanvas = true
         };
-        _hostPane.Border!.ColorScheme = app.ColorScheme;
+        _hostPane.Border!.SetScheme (app.GetScheme ());
         _hostPane.Padding!.Thickness = new (1);
         _hostPane.Padding.Diagnostics = ViewDiagnosticFlags.Ruler;
-        _hostPane.Padding.ColorScheme = app.ColorScheme;
+        _hostPane.Padding.SetScheme (app.GetScheme ());
 
-        app.Add (_classListView, _adornmentsEditor, _arrangementEditor, _layoutEditor, _viewportSettingsEditor, _settingsPane, _eventLog, _hostPane);
+        app.Add (_classListView, _adornmentsEditor, _arrangementEditor, _layoutEditor, _viewportSettingsEditor, _propertiesEditor, _eventLog, _hostPane);
 
         app.Initialized += App_Initialized;
 
@@ -296,7 +251,7 @@ private void CreateCurrentView (Type type)
         // Ensure the type does not contain any generic parameters
         if (type.ContainsGenericParameters)
         {
-            Logging.Warning($"Cannot create an instance of {type} because it contains generic parameters.");
+            Logging.Warning ($"Cannot create an instance of {type} because it contains generic parameters.");
             //throw new ArgumentException ($"Cannot create an instance of {type} because it contains generic parameters.");
             return;
         }
@@ -307,23 +262,15 @@ private void CreateCurrentView (Type type)
 
         if (view is IDesignable designable)
         {
-            designable.EnableForDesign (ref _demoText);
+            string settingsEditorDemoText = _propertiesEditor!.DemoText;
+            designable.EnableForDesign (ref settingsEditorDemoText);
         }
         else
         {
-            view.Text = _demoText;
+            view.Text = _propertiesEditor!.DemoText;
             view.Title = "_Test Title";
         }
 
-        if (view is IOrientation orientatedView)
-        {
-            _orientation!.SelectedItem = (int)orientatedView.Orientation;
-            _orientation.Enabled = true;
-        }
-        else
-        {
-            _orientation!.Enabled = false;
-        }
 
         view.Initialized += CurrentView_Initialized;
         view.SubViewsLaidOut += CurrentView_LayoutComplete;
@@ -335,6 +282,7 @@ private void CreateCurrentView (Type type)
         _layoutEditor!.ViewToEdit = _curView;
         _viewportSettingsEditor!.ViewToEdit = _curView;
         _arrangementEditor!.ViewToEdit = _curView;
+        _propertiesEditor!.ViewToEdit = _curView;
         _curView.SetNeedsLayout ();
     }
 
@@ -349,6 +297,7 @@ private void DisposeCurrentView ()
             _layoutEditor!.ViewToEdit = null;
             _viewportSettingsEditor!.ViewToEdit = null;
             _arrangementEditor!.ViewToEdit = null;
+            _propertiesEditor!.ViewToEdit = null;
 
             _curView.Dispose ();
             _curView = null;
@@ -379,7 +328,7 @@ private void CurrentView_Initialized (object? sender, EventArgs e)
             return;
         }
 
-        if (view.Width == Dim.Absolute(0) || view.Width is null)
+        if (view.Width == Dim.Absolute (0) || view.Width is null)
         {
             view.Width = Dim.Fill ();
         }
diff --git a/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs b/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
index 7c98282f6d..cc952913ea 100644
--- a/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
+++ b/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs
@@ -7,7 +7,7 @@
 namespace UICatalog.Scenarios;
 
 [ScenarioMetadata ("AnsiEscapeSequenceRequest", "Ansi Escape Sequence Request")]
-[ScenarioCategory ("Ansi Escape Sequence")]
+[ScenarioCategory ("Tests")]
 public sealed class AnsiEscapeSequenceRequests : Scenario
 {
     private GraphView _graphView;
@@ -169,8 +169,8 @@ private View BuildSingleTab ()
                                                                           {
                                                                               Request = ansiEscapeSequenceRequest.Request,
                                                                               Terminator = ansiEscapeSequenceRequest.Terminator,
-                                                                              ResponseReceived = (s)=>OnSuccess(s, tvResponse, tvError, tvValue, tvTerminator,lblSuccess),
-                                                                              Abandoned =()=> OnFail (tvResponse, tvError, tvValue, tvTerminator, lblSuccess)
+                                                                              ResponseReceived = (s) => OnSuccess (s, tvResponse, tvError, tvValue, tvTerminator, lblSuccess),
+                                                                              Abandoned = () => OnFail (tvResponse, tvError, tvValue, tvTerminator, lblSuccess)
                                                                           });
                                  };
 
@@ -181,15 +181,15 @@ private View BuildSingleTab ()
         return w;
     }
 
-    private void OnSuccess (string response, TextView tvResponse, TextView tvError, TextView tvValue, TextView tvTerminator,Label lblSuccess)
+    private void OnSuccess (string response, TextView tvResponse, TextView tvError, TextView tvValue, TextView tvTerminator, Label lblSuccess)
     {
         tvResponse.Text = response;
         tvError.Text = string.Empty;
         tvValue.Text = string.Empty;
         tvTerminator.Text = string.Empty;
 
-            lblSuccess.ColorScheme = Colors.ColorSchemes ["Base"];
-            lblSuccess.Text = "Successful";
+        lblSuccess.SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base);
+        lblSuccess.Text = "Successful";
     }
 
     private void OnFail (TextView tvResponse, TextView tvError, TextView tvValue, TextView tvTerminator, Label lblSuccess)
@@ -199,7 +199,7 @@ private void OnFail (TextView tvResponse, TextView tvError, TextView tvValue, Te
         tvValue.Text = string.Empty;
         tvTerminator.Text = string.Empty;
 
-        lblSuccess.ColorScheme = Colors.ColorSchemes ["Error"];
+        lblSuccess.SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Error);
         lblSuccess.Text = "Error";
     }
 
@@ -320,7 +320,7 @@ private View BuildBulkTab ()
     private void UpdateResponses ()
     {
         _lblSummary.Text = GetSummary ();
-        _lblSummary.SetNeedsDraw();
+        _lblSummary.SetNeedsDraw ();
     }
 
     private string GetSummary ()
@@ -369,7 +369,7 @@ private void UpdateGraph ()
                                         .Select (g => new PointF (g.Key, g.Count ()))
                                         .ToList ();
         //  _graphView.ScrollOffset  = new PointF(,0);
-        _graphView.SetNeedsDraw();
+        _graphView.SetNeedsDraw ();
 
     }
 
diff --git a/Examples/UICatalog/Scenarios/Arrangement.cs b/Examples/UICatalog/Scenarios/Arrangement.cs
index c7eea3e2b5..3d8d9d1a31 100644
--- a/Examples/UICatalog/Scenarios/Arrangement.cs
+++ b/Examples/UICatalog/Scenarios/Arrangement.cs
@@ -19,7 +19,8 @@ public override void Main ()
         Window app = new ()
         {
             Title = GetQuitKeyAndName (),
-            TabStop = TabBehavior.TabGroup
+            TabStop = TabBehavior.TabGroup,
+            ShadowStyle = ShadowStyle.None
         };
 
         var adornmentsEditor = new AdornmentsEditor
@@ -33,7 +34,7 @@ public override void Main ()
 
         app.Add (adornmentsEditor);
 
-        adornmentsEditor.ExpanderButton.Orientation = Orientation.Horizontal;
+        adornmentsEditor!.ExpanderButton!.Orientation = Orientation.Horizontal;
 
         //  adornmentsEditor.ExpanderButton!.Collapsed = true;
 
@@ -165,8 +166,8 @@ public override void Main ()
         };
         colorPicker.ApplyStyleChanges ();
 
-        colorPicker.SelectedColor = testFrame.ColorScheme!.Normal.Background;
-        colorPicker.ColorChanged += ColorPicker_ColorChanged;
+        colorPicker.SelectedColor = testFrame.GetAttributeForRole (VisualRole.Normal).Background;
+        colorPicker.ColorChanged += ColorPickerColorChanged;
         overlappedView2.Add (colorPicker);
         overlappedView2.Width = 50;
 
@@ -176,16 +177,22 @@ public override void Main ()
             Y = 17,
             Id = "datePicker",
             Title = "Not _Sizeable",
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
             ShadowStyle = ShadowStyle.Transparent,
             BorderStyle = LineStyle.Double,
             TabStop = TabBehavior.TabGroup,
             Arrangement = ViewArrangement.Movable | ViewArrangement.Overlapped
         };
 
+        datePicker.SetScheme (new Scheme (
+                                          new Attribute (
+                                                         SchemeManager.GetScheme (Schemes.Toplevel).Normal.Foreground.GetBrighterColor (),
+                                                         SchemeManager.GetScheme (Schemes.Toplevel).Normal.Background.GetBrighterColor (),
+                                                         SchemeManager.GetScheme (Schemes.Toplevel).Normal.Style)));
+
         TransparentView transparentView = new ()
         {
-            Id = "transparentView",
+            Title = "Transparent",
+            ViewportSettings = Terminal.Gui.ViewportSettings.Transparent,
             X = 30,
             Y = 5,
             Width = 35,
@@ -199,7 +206,11 @@ public override void Main ()
         testFrame.Add (transparentView);
 
 
-        testFrame.Add (new TransparentView ());
+        testFrame.Add (new TransparentView ()
+        {
+            Title = "Transparent|TransparentMouse",
+            ViewportSettings = Terminal.Gui.ViewportSettings.TransparentMouse | Terminal.Gui.ViewportSettings.Transparent
+        });
 
         adornmentsEditor.AutoSelectSuperView = testFrame;
         arrangementEditor.AutoSelectSuperView = testFrame;
@@ -213,9 +224,9 @@ public override void Main ()
 
         return;
 
-        void ColorPicker_ColorChanged (object sender, ColorEventArgs e)
+        void ColorPickerColorChanged (object sender, ColorEventArgs e)
         {
-            testFrame.ColorScheme = testFrame.ColorScheme! with { Normal = new (testFrame.ColorScheme.Normal.Foreground, e.CurrentValue) };
+            testFrame.SetScheme (testFrame.GetScheme () with { Normal = new (testFrame.GetAttributeForRole (VisualRole.Normal).Foreground, e.CurrentValue) });
         }
     }
 
@@ -228,7 +239,7 @@ private View CreateOverlappedView (int id, Pos x, Pos y)
             Width = Dim.Auto (minimumContentDim: 15),
             Height = Dim.Auto (minimumContentDim: 3),
             Title = $"Overlapped{id} _{GetNextHotKey ()}",
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Toplevel),
             Id = $"Overlapped{id}",
             ShadowStyle = ShadowStyle.Transparent,
             BorderStyle = LineStyle.Double,
@@ -254,8 +265,6 @@ private View CreateTiledView (int id, Pos x, Pos y)
             CanFocus = true,
             TabStop = TabBehavior.TabStop,
             Arrangement = ViewArrangement.Resizable
-
-            //            SuperViewRendersLineCanvas = true
         };
 
         return tiled;
@@ -318,16 +327,16 @@ public override List<Key> GetDemoKeyStrokes ()
 
     public class TransparentView : FrameView
     {
-        public TransparentView()
+        public TransparentView ()
         {
             Title = "Transparent";
-            Text = "Text";
+            Text = "TransparentView Text";
             X = 0;
             Y = 0;
             Width = 30;
             Height = 10;
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Resizable | ViewArrangement.Movable;
-            ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent;
+            ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent | Terminal.Gui.ViewportSettings.TransparentMouse;
 
             Padding!.Thickness = new Thickness (1);
 
@@ -342,56 +351,3 @@ public TransparentView()
     }
 }
 
-public class TransparentView : FrameView
-{
-    public TransparentView ()
-    {
-        Title = "Transparent View";
-        base.Text = "View.Text.\nThis should be opaque.\nNote how clipping works?";
-        TextFormatter.Alignment = Alignment.Center;
-        TextFormatter.VerticalAlignment = Alignment.Center;
-        Arrangement = ViewArrangement.Overlapped | ViewArrangement.Resizable | ViewArrangement.Movable;
-        ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent | Terminal.Gui.ViewportSettings.TransparentMouse;
-        BorderStyle = LineStyle.RoundedDotted;
-        base.ColorScheme = Colors.ColorSchemes ["Menu"];
-
-        var transparentSubView = new View ()
-        {
-            Text = "Sizable/Movable View with border. Should be opaque. The shadow should be semi-opaque.",
-            Id = "transparentSubView",
-            X = 4,
-            Y = 8,
-            Width = 20,
-            Height = 8,
-            BorderStyle = LineStyle.Dashed,
-            Arrangement = ViewArrangement.Movable | ViewArrangement.Resizable,
-            ShadowStyle = ShadowStyle.Transparent,
-            //ViewportSettings = Terminal.Gui.ViewportSettings.Transparent
-        };
-        transparentSubView.Border.Thickness = new (1, 1, 1, 1);
-        transparentSubView.ColorScheme = Colors.ColorSchemes ["Dialog"];
-
-        Button button = new Button ()
-        {
-            Title = "_Opaque Shadows No Worky",
-            X = Pos.Center (),
-            Y = 4,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
-        };
-
-        button.ClearingViewport += (sender, args) =>
-                                   {
-                                       args.Cancel = true;
-                                   };
-
-
-        base.Add (button);
-        base.Add (transparentSubView);
-    }
-
-    /// <inheritdoc />
-    protected override bool OnClearingViewport () { return false; }
-
-    /// <inheritdoc />
-    protected override bool OnMouseEvent (MouseEventArgs mouseEvent) { return false; }
-}
diff --git a/Examples/UICatalog/Scenarios/Bars.cs b/Examples/UICatalog/Scenarios/Bars.cs
index 952436a585..1bd5385ce2 100644
--- a/Examples/UICatalog/Scenarios/Bars.cs
+++ b/Examples/UICatalog/Scenarios/Bars.cs
@@ -38,7 +38,7 @@ private void App_Loaded (object sender, EventArgs e)
             X = Pos.AnchorEnd (),
             Width = Dim.Auto (),
             Height = Dim.Fill (), // Make room for some wide things
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "Toplevel",
             Source = new ListWrapper<string> (eventSource)
         };
         eventLog.Border.Thickness = new (0, 1, 0, 0);
diff --git a/Examples/UICatalog/Scenarios/Buttons.cs b/Examples/UICatalog/Scenarios/Buttons.cs
index 6b1051e22e..538a728d4e 100644
--- a/Examples/UICatalog/Scenarios/Buttons.cs
+++ b/Examples/UICatalog/Scenarios/Buttons.cs
@@ -44,7 +44,7 @@ public override void Main ()
             Width = 45,
             Height = 3,
             Text = "S_wap Default (Size = 45, 3)",
-            ColorScheme = Colors.ColorSchemes ["Error"]
+            SchemeName = "Error"
         };
 
         swapButton.Accepting += (s, e) =>
@@ -80,14 +80,14 @@ static void DoMessage (Button button, string txt)
 
         View prev = colorButtonsLabel;
 
-        foreach (KeyValuePair<string, ColorScheme> colorScheme in Colors.ColorSchemes)
+        foreach (KeyValuePair<string, Scheme> scheme in SchemeManager.GetSchemesForCurrentTheme ())
         {
             var colorButton = new Button
             {
                 X = Pos.Right (prev),
                 Y = Pos.Y (colorButtonsLabel),
-                Text = $"_{colorScheme.Key}",
-                ColorScheme = colorScheme.Value,
+                Text = $"_{scheme.Key}",
+                SchemeName = scheme.Key,
             };
             DoMessage (colorButton, colorButton.Text);
             main.Add (colorButton);
@@ -138,7 +138,8 @@ static void DoMessage (Button button, string txt)
         var removeButton = new Button
         {
             X = 2, Y = Pos.Bottom (button) + 1,
-            ColorScheme = Colors.ColorSchemes ["Error"], Text = "Remove this button"
+            SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Error),
+            Text = "Remove this button"
         };
         main.Add (removeButton);
 
@@ -165,7 +166,7 @@ static void DoMessage (Button button, string txt)
             X = 0,
             Y = Pos.Center () - 1,
             Width = 30,
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Text = "Move This \u263b Button v_ia Pos"
         };
 
@@ -183,7 +184,7 @@ static void DoMessage (Button button, string txt)
             X = 0,
             Width = 30,
             Text = "Grow This \u263a Button _via Pos",
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
         };
 
         sizeBtn.Accepting += (s, e) =>
@@ -204,7 +205,7 @@ static void DoMessage (Button button, string txt)
         main.Add (absoluteFrame);
 
         // Demonstrates how changing the View.Frame property can move Views
-        var moveBtnA = new Button { ColorScheme = Colors.ColorSchemes ["Error"], Text = "Move This Button via Frame" };
+        var moveBtnA = new Button { SchemeName = "Error", Text = "Move This Button via Frame" };
 
         moveBtnA.Accepting += (s, e) =>
                            {
@@ -221,7 +222,7 @@ static void DoMessage (Button button, string txt)
         // Demonstrates how changing the View.Frame property can SIZE Views (#583)
         var sizeBtnA = new Button
         {
-            Y = 2, ColorScheme = Colors.ColorSchemes ["Error"], Text = " ~  s  gui.cs   master ↑_10 = Сохранить"
+            Y = 2, SchemeName = "Error", Text = " ~  s  gui.cs   master ↑_10 = Сохранить"
         };
 
         sizeBtnA.Accepting += (s, e) =>
@@ -294,7 +295,7 @@ string MoveHotkey (string txt)
             X = 2,
             Y = Pos.Bottom (radioGroup) + 1,
             Width = Dim.Width (computedFrame) - 2,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Text = mhkb
         };
         moveHotKeyBtn.Accepting += (s, e) =>
@@ -311,7 +312,7 @@ string MoveHotkey (string txt)
             X = Pos.Left (absoluteFrame) + 1,
             Y = Pos.Bottom (radioGroup) + 1,
             Width = Dim.Width (absoluteFrame) - 2,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Text = muhkb
         };
         moveUnicodeHotKeyBtn.Accepting += (s, e) =>
diff --git a/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs b/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
index 38bf735bdc..2512e8de69 100644
--- a/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
+++ b/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs
@@ -41,7 +41,9 @@ public override void Main ()
             X = 0,
             Y = 1,
             Width = Dim.Fill (Dim.Func (() => _categoryList!.Frame.Width)),
-            Height = Dim.Fill ()
+            Height = Dim.Fill (),
+           // SchemeName = "Base"
+
         };
         top.Add (_charMap);
 
@@ -50,7 +52,8 @@ public override void Main ()
             X = Pos.Right (_charMap) + 1,
             Y = Pos.Y (_charMap),
             HotKeySpecifier = (Rune)'_',
-            Text = "_Jump To:"
+            Text = "_Jump To:",
+            //SchemeName = "Dialog"
         };
         top.Add (jumpLabel);
 
@@ -60,6 +63,7 @@ public override void Main ()
             Y = Pos.Y (_charMap),
             Width = 17,
             Caption = "e.g. 01BE3 or ✈",
+            //SchemeName = "Dialog"
         };
         top.Add (jumpEdit);
 
@@ -79,10 +83,9 @@ public override void Main ()
         {
             X = Pos.Right (jumpEdit) + 1,
             Y = Pos.Y (_charMap),
-            ColorScheme = Colors.ColorSchemes ["error"],
+            SchemeName = "error",
             Text = "err",
             Visible = false
-
         };
         top.Add (_errorLabel);
 
@@ -92,6 +95,7 @@ public override void Main ()
             X = Pos.Right (_charMap), 
             Y = Pos.Bottom (jumpLabel), 
             Height = Dim.Fill (),
+            //SchemeName = "Dialog"
         };
         _categoryList.FullRowSelect = true;
         _categoryList.MultiSelect = false;
diff --git a/Examples/UICatalog/Scenarios/Clipping.cs b/Examples/UICatalog/Scenarios/Clipping.cs
index fddcb8ddba..c7fd834937 100644
--- a/Examples/UICatalog/Scenarios/Clipping.cs
+++ b/Examples/UICatalog/Scenarios/Clipping.cs
@@ -120,7 +120,7 @@ private View CreateOverlappedView (int id, Pos x, Pos y)
             Height = Dim.Auto (minimumContentDim: 4),
             Width = Dim.Auto (minimumContentDim: 14),
             Title = $"Overlapped{id} _{GetNextHotKey ()}",
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = SchemeManager.SchemesToSchemeName(Schemes.Toplevel),
             Id = $"Overlapped{id}",
             ShadowStyle = ShadowStyle.Transparent,
             BorderStyle = LineStyle.Double,
diff --git a/Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs b/Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs
index 5698cd310a..592164d312 100644
--- a/Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs
+++ b/Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs
@@ -82,7 +82,7 @@ public class CollectionNavigatorTester : Scenario
     public override void Main ()
     {
         Application.Init ();
-        top = new Toplevel { ColorScheme = Colors.ColorSchemes ["Base"] };
+        top = new Toplevel { SchemeName = "Base" };
 
         var allowMarking = new MenuItem ("Allow _Marking", "", null)
         {
diff --git a/Examples/UICatalog/Scenarios/ColorPicker.cs b/Examples/UICatalog/Scenarios/ColorPicker.cs
index 83e5f7536f..491b2543d5 100644
--- a/Examples/UICatalog/Scenarios/ColorPicker.cs
+++ b/Examples/UICatalog/Scenarios/ColorPicker.cs
@@ -45,7 +45,8 @@ public override void Main ()
         ///////////////////////////////////////
 
         // Foreground ColorPicker.
-        foregroundColorPicker = new ColorPicker {
+        foregroundColorPicker = new ColorPicker
+        {
             Title = "_Foreground Color",
             BorderStyle = LineStyle.Single,
             Width = Dim.Percent (50)
@@ -154,7 +155,7 @@ public override void Main ()
                                                     backgroundColorPicker.Visible = false;
 
                                                     // Switching to 16 colors
-                                                    ForegroundColor_ColorChanged (null,null);
+                                                    ForegroundColor_ColorChanged (null, null);
                                                     BackgroundColor_ColorChanged (null, null);
                                                 }
                                                 else
@@ -182,10 +183,10 @@ public override void Main ()
         var cbShowTextFields = new CheckBox ()
         {
             Text = "Show _Text Fields",
-            Y = Pos.Bottom (rgColorModel)+1,
+            Y = Pos.Bottom (rgColorModel) + 1,
             Width = Dim.Auto (),
             Height = Dim.Auto (),
-            CheckedState = foregroundColorPicker.Style.ShowTextFields ? CheckState.Checked: CheckState.UnChecked,
+            CheckedState = foregroundColorPicker.Style.ShowTextFields ? CheckState.Checked : CheckState.UnChecked,
         };
 
         cbShowTextFields.CheckedStateChanging += (_, e) =>
@@ -217,8 +218,8 @@ public override void Main ()
         app.Add (cbShowName);
 
         // Set default colors.
-        foregroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Foreground.GetClosestNamedColor16 ();
-        backgroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Background.GetClosestNamedColor16 ();
+        foregroundColorPicker.SelectedColor = _demoView.SuperView!.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ();
+        backgroundColorPicker.SelectedColor = _demoView.SuperView.GetAttributeForRole (VisualRole.Normal).Background.GetClosestNamedColor16 ();
 
         Application.Run (app);
         app.Dispose ();
@@ -259,7 +260,7 @@ private void UpdateColorLabel (Label label, Color color)
     /// <summary>Update Demo Label.</summary>
     private void UpdateDemoLabel ()
     {
-        _demoView.ColorScheme = new ColorScheme
+        _demoView.SetScheme (new Scheme
         {
             Normal = new Attribute (
                                     foregroundColorPicker.Visible ?
@@ -269,14 +270,15 @@ private void UpdateDemoLabel ()
                                         backgroundColorPicker.SelectedColor :
                                         backgroundColorPicker16.SelectedColor
                                    )
-        };
+        });
     }
 
     public override List<Key> GetDemoKeyStrokes ()
     {
-        var keys = new List<Key> ();
-
-        keys.Add (Key.B.WithAlt);
+        List<Key> keys =
+        [
+            Key.B.WithAlt
+        ];
 
         for (int i = 0; i < 200; i++)
         {
diff --git a/Examples/UICatalog/Scenarios/ComboBoxIteration.cs b/Examples/UICatalog/Scenarios/ComboBoxIteration.cs
index a0201daf61..1fd8ce69e5 100644
--- a/Examples/UICatalog/Scenarios/ComboBoxIteration.cs
+++ b/Examples/UICatalog/Scenarios/ComboBoxIteration.cs
@@ -26,7 +26,7 @@ public override void Main ()
 
         var lbComboBox = new Label
         {
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             X = Pos.Right (lbListView) + 1,
             Width = Dim.Percent (40)
         };
diff --git a/Examples/UICatalog/Scenarios/ComputedLayout.cs b/Examples/UICatalog/Scenarios/ComputedLayout.cs
index e1dde7956f..316cb4d15e 100644
--- a/Examples/UICatalog/Scenarios/ComputedLayout.cs
+++ b/Examples/UICatalog/Scenarios/ComputedLayout.cs
@@ -30,7 +30,7 @@ public override void Main ()
             Y = 0,
             Width = Dim.Fill (),
             Height = 1,
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Text = rule
         };
 
@@ -45,7 +45,7 @@ public override void Main ()
             Y = 0,
             Width = 1,
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Text = vrule
         };
 
@@ -103,7 +103,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -115,7 +115,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -127,7 +127,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -139,7 +139,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -165,7 +165,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -177,7 +177,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -189,7 +189,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -201,7 +201,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -231,7 +231,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -243,7 +243,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -255,7 +255,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -267,7 +267,7 @@ public override void Main ()
                            Width = Dim.Fill (),
                            X = 0,
                            Y = Pos.Bottom (labelList.LastOrDefault ()),
-                           ColorScheme = Colors.ColorSchemes ["Dialog"],
+                           SchemeName = "Dialog",
                            Text = $"{i++}-{txt}"
                        }
                       );
@@ -281,7 +281,7 @@ public override void Main ()
             Y = Pos.Percent (50),
             Width = Dim.Percent (80),
             Height = Dim.Percent (10),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"]
+            SchemeName = "TopLevel"
         };
 
         textView.Text =
@@ -384,7 +384,7 @@ public override void Main ()
         {
             Text = "This Label should be the 3rd to last line (AnchorEnd (3)).",
             TextAlignment = Alignment.Center,
-            ColorScheme = Colors.ColorSchemes ["Menu"],
+            SchemeName = "Menu",
             Width = Dim.Fill (5),
             X = 5,
             Y = Pos.AnchorEnd (3)
@@ -398,7 +398,7 @@ public override void Main ()
             Text =
                 "This TextField should be the 4th to last line (AnchorEnd (3) - 1).",
             TextAlignment = Alignment.Start,
-            ColorScheme = Colors.ColorSchemes ["Menu"],
+            SchemeName = "Menu",
             Width = Dim.Fill (5),
             X = 5,
             Y = Pos.AnchorEnd (3) - 1 // Pos.Combine
diff --git a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
index ba65f45171..70351f915f 100644
--- a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
+++ b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs
@@ -7,41 +7,36 @@
 
 namespace UICatalog.Scenarios;
 
-[ScenarioMetadata ("Configuration Editor", "Edits Terminal.Gui Config Files.")]
+[ScenarioMetadata ("Configuration Editor", "Editor of Terminal.Gui Config Files")]
 [ScenarioCategory ("TabView")]
 [ScenarioCategory ("Colors")]
 [ScenarioCategory ("Files and IO")]
 [ScenarioCategory ("TextView")]
+[ScenarioCategory ("Configuration")]
 public class ConfigurationEditor : Scenario
 {
-    private static ColorScheme _editorColorScheme = new ()
-    {
-        Normal = new Attribute (Color.Red, Color.White),
-        Focus = new Attribute (Color.Red, Color.Black),
-        HotFocus = new Attribute (Color.BrightRed, Color.Black),
-        HotNormal = new Attribute (Color.Magenta, Color.White)
-    };
+    //private static Scheme _editorScheme = SchemeManager.GetScheme (Schemes.Base);
 
-    private static Action? _editorColorSchemeChanged;
+    //private static Action? _editorSchemeChanged;
     private TabView? _tabView;
     private Shortcut? _lenShortcut;
 
-    [SerializableConfigurationProperty (Scope = typeof (AppScope))]
-    public static ColorScheme EditorColorScheme
-    {
-        get => _editorColorScheme;
-        set
-        {
-            _editorColorScheme = value;
-            _editorColorSchemeChanged?.Invoke ();
-        }
-    }
+    //[ConfigurationProperty (Scope = typeof (AppSettingsScope))]
+    //public static Scheme EditorScheme
+    //{
+    //    get => _editorScheme;
+    //    set
+    //    {
+    //        _editorScheme = value;
+    //        _editorSchemeChanged?.Invoke ();
+    //    }
+    //}
 
     public override void Main ()
     {
         Application.Init ();
 
-        Toplevel top = new ();
+        Window? win = new ();
 
         _lenShortcut = new Shortcut ()
         {
@@ -77,34 +72,49 @@ public override void Main ()
             Height = Dim.Fill (Dim.Func (() => statusBar.Frame.Height))
         };
 
-        top.Add (_tabView, statusBar);
+        win.Add (_tabView, statusBar);
 
-        top.Loaded += (s, a) =>
+        win.Loaded += (s, a) =>
                       {
                           Open ();
-                          _editorColorSchemeChanged?.Invoke ();
+                          //_editorSchemeChanged?.Invoke ();
                       };
 
-        void OnEditorColorSchemeChanged ()
-        {
-            if (Application.Top is { })
-            {
-                return;
-            }
 
-            foreach (ConfigTextView t in _tabView.SubViews.OfType<ConfigTextView> ())
-            {
-                t.ColorScheme = EditorColorScheme;
-            }
-        }
 
-        _editorColorSchemeChanged += OnEditorColorSchemeChanged;
+        //_editorSchemeChanged += OnEditorSchemeChanged;
 
-        Application.Run (top);
-        _editorColorSchemeChanged -= OnEditorColorSchemeChanged;
-        top.Dispose ();
+        ConfigurationManager.Applied += ConfigurationManagerOnApplied;
+
+        Application.Run (win);
+        //_editorSchemeChanged -= OnEditorSchemeChanged;
+        win.Dispose ();
+        win = null;
 
         Application.Shutdown ();
+
+        return;
+
+        //void OnEditorSchemeChanged ()
+        //{
+        //    if (Application.Top is { })
+        //    {
+        //        return;
+        //    }
+
+        //    foreach (ConfigTextView t in _tabView.SubViews.OfType<ConfigTextView> ())
+        //    {
+        //        t.SetScheme (EditorScheme);
+        //    }
+        //}
+
+        void ConfigurationManagerOnApplied (object? sender, ConfigurationManagerEventArgs e)
+        {
+            if (win is { })
+            {
+                win.SetNeedsDraw ();
+            }
+        }
     }
     public void Save ()
     {
@@ -116,7 +126,7 @@ public void Save ()
 
     private void Open ()
     {
-        foreach (var config in ConfigurationManager.Settings!.Sources)
+        foreach (var config in ConfigurationManager.SourcesManager!.Sources)
         {
             var homeDir = $"{Environment.GetFolderPath (Environment.SpecialFolder.UserProfile)}";
             var fileInfo = new FileInfo (config.Value.Replace ("~", homeDir));
@@ -129,6 +139,12 @@ private void Open ()
                 FileInfo = fileInfo,
             };
 
+            if (config.Value == "HardCoded")
+            {
+                editor.Title = "HardCoded";
+
+            }
+
             Tab tab = new Tab ()
             {
                 View = editor,
@@ -244,15 +260,20 @@ internal void Read ()
                 return;
             }
 
-            if (FileInfo!.FullName.Contains ("RuntimeConfig"))
+            if (FileInfo!.FullName.Contains ("HardCoded"))
+            {
+                Text = ConfigurationManager.GetHardCodedConfig ()!;
+                ReadOnly = true;
+                Enabled = true;
+            }
+            else if (FileInfo!.FullName.Contains ("RuntimeConfig"))
             {
                 Text = ConfigurationManager.RuntimeConfig!;
-
             }
             else if (!FileInfo.Exists)
             {
                 // Create empty config file
-                Text = ConfigurationManager.GetEmptyJson ();
+                Text = ConfigurationManager.GetEmptyConfig ();
             }
             else
             {
diff --git a/Examples/UICatalog/Scenarios/ContextMenus.cs b/Examples/UICatalog/Scenarios/ContextMenus.cs
index e60e69d44b..4cc7343ab4 100644
--- a/Examples/UICatalog/Scenarios/ContextMenus.cs
+++ b/Examples/UICatalog/Scenarios/ContextMenus.cs
@@ -24,7 +24,7 @@ public override void Main ()
         {
             Title = GetQuitKeyAndName (),
             Arrangement = ViewArrangement.Fixed,
-            ColorScheme = Colors.ColorSchemes ["Toplevel"]
+            SchemeName = "Toplevel"
         };
 
         var text = "Context Menu";
diff --git a/Examples/UICatalog/Scenarios/Dialogs.cs b/Examples/UICatalog/Scenarios/Dialogs.cs
index 62203962b4..915a9db6bd 100644
--- a/Examples/UICatalog/Scenarios/Dialogs.cs
+++ b/Examples/UICatalog/Scenarios/Dialogs.cs
@@ -177,7 +177,7 @@ public override void Main ()
 
         var buttonPressedLabel = new Label
         {
-            X = Pos.Center (), Y = Pos.Bottom (frame) + 5, ColorScheme = Colors.ColorSchemes ["Error"], Text = " "
+            X = Pos.Center (), Y = Pos.Bottom (frame) + 5, SchemeName = "Error", Text = " "
         };
 
         var showDialogButton = new Button
diff --git a/Examples/UICatalog/Scenarios/DimAutoDemo.cs b/Examples/UICatalog/Scenarios/DimAutoDemo.cs
index 9f5cf3fa95..15bf1a74dd 100644
--- a/Examples/UICatalog/Scenarios/DimAutoDemo.cs
+++ b/Examples/UICatalog/Scenarios/DimAutoDemo.cs
@@ -74,7 +74,7 @@ private static FrameView CreateDimAutoContentFrameView ()
             Y = Pos.Bottom (textEdit) + 1,
             Width = Dim.Auto (DimAutoStyle.Text, 1),
             Height = Dim.Auto (DimAutoStyle.Text, 8),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             TextDirection = TextDirection.TopBottom_LeftRight
         };
         vlabel.Id = "vlabel";
@@ -87,7 +87,7 @@ private static FrameView CreateDimAutoContentFrameView ()
             Y = Pos.Bottom (textEdit),
             Width = Dim.Auto (DimAutoStyle.Text, 20),
             Height = Dim.Auto (DimAutoStyle.Text, 1),
-            ColorScheme = Colors.ColorSchemes ["Error"]
+            SchemeName = "Error"
         };
         hlabel.Id = "hlabel";
         dimAutoFrameView.Add (hlabel);
@@ -98,7 +98,7 @@ private static FrameView CreateDimAutoContentFrameView ()
             Y = Pos.Bottom (hlabel) + 1,
             Width = 20,
             Height = Dim.Auto (),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Title = "W: 20, H: Auto",
             BorderStyle = LineStyle.Rounded
         };
@@ -111,7 +111,7 @@ private static FrameView CreateDimAutoContentFrameView ()
             Y = Pos.Bottom (hlabel) + 1,
             Width = Dim.Auto (),
             Height = 5,
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Title = "W: Auto, H: 5",
             BorderStyle = LineStyle.Rounded
         };
@@ -124,7 +124,7 @@ private static FrameView CreateDimAutoContentFrameView ()
             Y = Pos.Bottom (hlabel) + 1,
             Width = Dim.Auto (),
             Height = Dim.Auto (),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Title = "W: Auto, H: Auto",
             BorderStyle = LineStyle.Rounded
         };
diff --git a/Examples/UICatalog/Scenarios/DynamicMenuBar.cs b/Examples/UICatalog/Scenarios/DynamicMenuBar.cs
index 7ad5508fe6..4bb4309465 100644
--- a/Examples/UICatalog/Scenarios/DynamicMenuBar.cs
+++ b/Examples/UICatalog/Scenarios/DynamicMenuBar.cs
@@ -594,7 +594,7 @@ public DynamicMenuBarSample ()
 
             var lblMenuBar = new Label
             {
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
                 TextAlignment = Alignment.Center,
                 X = Pos.Right (btnPrevious) + 1,
                 Y = Pos.Top (btnPrevious),
@@ -632,7 +632,7 @@ public DynamicMenuBarSample ()
 
             _lstMenus = new ()
             {
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
                 X = Pos.Right (btnPrevious) + 1,
                 Y = Pos.Top (btnPrevious) + 2,
                 Width = lblMenuBar.Width,
diff --git a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
index 748c7d3e9f..6be42ab8fe 100644
--- a/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
+++ b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs
@@ -282,7 +282,7 @@ public DynamicStatusBarSample ()
 
             _lstItems = new ListView
             {
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
                 Y = Pos.Top (btnAddStatusBar) + 2,
                 Width = Dim.Fill () - Dim.Width (btnAdd) - 1,
                 Height = Dim.Fill (),
diff --git a/Examples/UICatalog/Scenarios/Editors/MarginEditor.cs b/Examples/UICatalog/Scenarios/Editors/MarginEditor.cs
deleted file mode 100644
index 54f02eb0a4..0000000000
--- a/Examples/UICatalog/Scenarios/Editors/MarginEditor.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-#nullable enable
-using System;
-using Terminal.Gui;
-
-namespace UICatalog.Scenarios;
-
-public class MarginEditor : AdornmentEditor
-{
-    public MarginEditor ()
-    {
-        Title = "_Margin";
-        Initialized += MarginEditor_Initialized;
-        AdornmentChanged += MarginEditor_AdornmentChanged;
-    }
-
-    private RadioGroup? _rgShadow;
-
-    private void MarginEditor_AdornmentChanged (object? sender, EventArgs e)
-    {
-        if (AdornmentToEdit is { })
-        {
-            _rgShadow!.SelectedItem = (int)((Margin)AdornmentToEdit).ShadowStyle;
-        }
-    }
-
-    private void MarginEditor_Initialized (object? sender, EventArgs e)
-    {
-        _rgShadow = new RadioGroup
-        {
-            X = 0,
-            Y = Pos.AnchorEnd (),
-
-            SuperViewRendersLineCanvas = true,
-            Title = "_Shadow",
-            BorderStyle = LineStyle.Single,
-            RadioLabels = Enum.GetNames (typeof (ShadowStyle)),
-        };
-
-        if (AdornmentToEdit is { })
-        {
-            _rgShadow.SelectedItem = (int)((Margin)AdornmentToEdit).ShadowStyle;
-        }
-
-        _rgShadow.SelectedItemChanged += (_, args) =>
-                                        {
-                                            ((Margin)AdornmentToEdit!).ShadowStyle = (ShadowStyle)args.SelectedItem!;
-                                        };
-
-        Add (_rgShadow);
-    }
-}
\ No newline at end of file
diff --git a/Examples/UICatalog/Scenarios/Editors/AdornmentEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentEditor.cs
similarity index 95%
rename from Examples/UICatalog/Scenarios/Editors/AdornmentEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentEditor.cs
index fd8b355398..303b4c2165 100644
--- a/Examples/UICatalog/Scenarios/Editors/AdornmentEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentEditor.cs
@@ -60,9 +60,9 @@ public Adornment? AdornmentToEdit
 
                 _adornment.Initialized += (sender, args) =>
                                           {
-                                              ColorScheme? cs = _adornment.ColorScheme;
-                                              _foregroundColorPicker.SelectedColor = _adornment.GetNormalColor ().Foreground.GetClosestNamedColor16 ();
-                                              _backgroundColorPicker.SelectedColor = _adornment.GetNormalColor ().Background.GetClosestNamedColor16 ();
+                                              Scheme? cs = _adornment.GetScheme ();
+                                              _foregroundColorPicker.SelectedColor = _adornment.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ();
+                                              _backgroundColorPicker.SelectedColor = _adornment.GetAttributeForRole (VisualRole.Normal).Background.GetClosestNamedColor16 ();
                                           };
             }
 
@@ -220,10 +220,11 @@ private EventHandler<ColorEventArgs> ColorPickerColorChanged ()
                        return;
                    }
 
-                   AdornmentToEdit.ColorScheme = new (AdornmentToEdit.ColorScheme ?? AdornmentToEdit.Parent?.ColorScheme)
+                   AdornmentToEdit.SetScheme (new (AdornmentToEdit.GetScheme ())
                    {
                        Normal = new (_foregroundColorPicker.SelectedColor, _backgroundColorPicker.SelectedColor)
-                   };
+                   })
+                   ;
                };
     }
 
diff --git a/Examples/UICatalog/Scenarios/Editors/AdornmentsEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentsEditor.cs
similarity index 99%
rename from Examples/UICatalog/Scenarios/Editors/AdornmentsEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentsEditor.cs
index e282ff3f04..d336e7334a 100644
--- a/Examples/UICatalog/Scenarios/Editors/AdornmentsEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AdornmentsEditor.cs
@@ -18,6 +18,8 @@ public AdornmentsEditor ()
         ExpanderButton!.Orientation = Orientation.Horizontal;
 
         Initialized += AdornmentsEditor_Initialized;
+
+        SchemeName = "Dialog";
     }
 
     public MarginEditor? MarginEditor { get; set; }
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
new file mode 100644
index 0000000000..707fc9e2fc
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/AllViewsView.cs
@@ -0,0 +1,195 @@
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class AllViewsView : View
+{
+    private const int MAX_VIEW_FRAME_HEIGHT = 25;
+    public AllViewsView ()
+    {
+        CanFocus = true;
+        BorderStyle = LineStyle.Heavy;
+        Arrangement = ViewArrangement.Resizable;
+        HorizontalScrollBar.AutoShow = false;
+        VerticalScrollBar.AutoShow = true;
+
+        SubViewsLaidOut += (sender, _) =>
+                           {
+                               if (sender is View sendingView)
+                               {
+                                   sendingView.SetContentSize (new Size (sendingView.Viewport.Width, sendingView.GetHeightRequiredForSubViews ()));
+                               }
+                           };
+
+        AddCommand (Command.Up, () => ScrollVertical (-1));
+        AddCommand (Command.Down, () => ScrollVertical (1));
+        AddCommand (Command.PageUp, () => ScrollVertical (-SubViews.OfType<FrameView> ().First ().Frame.Height));
+        AddCommand (Command.PageDown, () => ScrollVertical (SubViews.OfType<FrameView> ().First ().Frame.Height));
+        AddCommand (
+                    Command.Start,
+                    () =>
+                    {
+                        Viewport = Viewport with { Y = 0 };
+
+                        return true;
+                    });
+        AddCommand (
+                    Command.End,
+                    () =>
+                    {
+                        Viewport = Viewport with { Y = GetContentSize ().Height };
+
+                        return true;
+                    });
+
+        AddCommand (Command.ScrollDown, () => ScrollVertical (1));
+        AddCommand (Command.ScrollUp, () => ScrollVertical (-1));
+        AddCommand (Command.ScrollRight, () => ScrollHorizontal (1));
+        AddCommand (Command.ScrollLeft, () => ScrollHorizontal (-1));
+
+        KeyBindings.Add (Key.CursorUp, Command.Up);
+        KeyBindings.Add (Key.CursorDown, Command.Down);
+        KeyBindings.Add (Key.CursorLeft, Command.Left);
+        KeyBindings.Add (Key.CursorRight, Command.Right);
+        KeyBindings.Add (Key.PageUp, Command.PageUp);
+        KeyBindings.Add (Key.PageDown, Command.PageDown);
+        KeyBindings.Add (Key.Home, Command.Start);
+        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);
+        MouseBindings.Add (MouseFlags.WheeledUp, Command.ScrollUp);
+        MouseBindings.Add (MouseFlags.WheeledLeft, Command.ScrollLeft);
+        MouseBindings.Add (MouseFlags.WheeledRight, Command.ScrollRight);
+    }
+
+    /// <inheritdoc />
+    public override void EndInit ()
+    {
+        base.EndInit ();
+
+        var allClasses = GetAllViewClassesCollection ();
+
+        View? previousView = null;
+
+        foreach (Type? type in allClasses)
+        {
+            View? view = CreateView (type);
+
+            if (view is { })
+            {
+                FrameView? frame = new ()
+                {
+                    CanFocus = true,
+                    Title = type.Name,
+                    Y = previousView is { } ? Pos.Bottom (previousView) : 0,
+                    Width = Dim.Fill (),
+                    Height = Dim.Auto (DimAutoStyle.Content, maximumContentDim: MAX_VIEW_FRAME_HEIGHT)
+                };
+                frame.Add (view);
+                Add (frame);
+                previousView = frame;
+            }
+        }
+    }
+
+    private static List<Type> GetAllViewClassesCollection ()
+    {
+        List<Type> types = typeof (View).Assembly.GetTypes ()
+                                        .Where (
+                                                myType => myType is { IsClass: true, IsAbstract: false, IsPublic: true }
+                                                          && myType.IsSubclassOf (typeof (View)))
+                                        .ToList ();
+
+        types.Add (typeof (View));
+
+        return types;
+    }
+
+    private View? CreateView (Type type)
+    {
+        // If we are to create a generic Type
+        if (type.IsGenericType)
+        {
+            // For each of the <T> arguments
+            List<Type> typeArguments = new ();
+
+            // use <object> or the original type if applicable
+            foreach (Type arg in type.GetGenericArguments ())
+            {
+                if (arg.IsValueType && Nullable.GetUnderlyingType (arg) == null)
+                {
+                    typeArguments.Add (arg);
+                }
+                else
+                {
+                    typeArguments.Add (typeof (object));
+                }
+            }
+
+            // And change what type we are instantiating from MyClass<T> to MyClass<object> or MyClass<T>
+            type = type.MakeGenericType (typeArguments.ToArray ());
+        }
+
+        // Ensure the type does not contain any generic parameters
+        if (type.ContainsGenericParameters)
+        {
+            Logging.Warning ($"Cannot create an instance of {type} because it contains generic parameters.");
+
+            //throw new ArgumentException ($"Cannot create an instance of {type} because it contains generic parameters.");
+            return null;
+        }
+
+        // Instantiate view
+        var view = (View)Activator.CreateInstance (type)!;
+        var demoText = "This, that, and the other thing.";
+
+        if (view is IDesignable designable)
+        {
+            designable.EnableForDesign (ref demoText);
+        }
+        else
+        {
+            view.Text = demoText;
+            view.Title = "_Test Title";
+        }
+
+        view.X = 0;
+        view.Y = 0;
+
+        view.Initialized += OnViewInitialized;
+
+        return view;
+    }
+
+    private void OnViewInitialized (object? sender, EventArgs e)
+    {
+        if (sender is not View view)
+        {
+            return;
+        }
+
+        if (view.Width == Dim.Absolute (0) || view.Width is null)
+        {
+            view.Width = Dim.Fill ();
+        }
+
+        if (view.Height == Dim.Absolute (0) || view.Height is null)
+        {
+            view.Height = MAX_VIEW_FRAME_HEIGHT - 2;
+        }
+
+        if (!view.Width.Has<DimAuto> (out _))
+        {
+            view.Width = Dim.Fill ();
+        }
+
+        if (!view.Height.Has<DimAuto> (out _))
+        {
+            view.Height = Dim.Auto (minimumContentDim: MAX_VIEW_FRAME_HEIGHT - 2, maximumContentDim: MAX_VIEW_FRAME_HEIGHT - 2);
+        }
+    }
+}
diff --git a/Examples/UICatalog/Scenarios/Editors/ArrangementEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ArrangementEditor.cs
similarity index 96%
rename from Examples/UICatalog/Scenarios/Editors/ArrangementEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/ArrangementEditor.cs
index 947c7b4d8d..7dab692d6a 100644
--- a/Examples/UICatalog/Scenarios/Editors/ArrangementEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ArrangementEditor.cs
@@ -107,12 +107,12 @@ private void ArrangementSliderOnOptionsChanged (object? sender, SliderEventArgs<
             if (ViewToEdit.Arrangement.HasFlag (ViewArrangement.Overlapped))
             {
                 ViewToEdit.ShadowStyle = ShadowStyle.Transparent;
-                ViewToEdit.ColorScheme = Colors.ColorSchemes ["Toplevel"];
+                ViewToEdit.SchemeName = "Toplevel";
             }
             else
             {
                 ViewToEdit.ShadowStyle = ShadowStyle.None;
-                ViewToEdit.ColorScheme = ViewToEdit!.SuperView!.ColorScheme;
+                ViewToEdit.SchemeName = ViewToEdit!.SuperView!.SchemeName;
             }
 
             if (ViewToEdit.Arrangement.HasFlag (ViewArrangement.Movable))
diff --git a/Examples/UICatalog/Scenarios/Editors/BorderEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/BorderEditor.cs
similarity index 100%
rename from Examples/UICatalog/Scenarios/Editors/BorderEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/BorderEditor.cs
diff --git a/Examples/UICatalog/Scenarios/Editors/DimEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
similarity index 95%
rename from Examples/UICatalog/Scenarios/Editors/DimEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
index cbb0390f49..7d7b0cbaa1 100644
--- a/Examples/UICatalog/Scenarios/Editors/DimEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs
@@ -27,11 +27,11 @@ protected override void OnViewToEditChanged ()
     {
         if (ViewToEdit is { })
         {
-            ViewToEdit.SubViewsLaidOut += (_, _) => { OnUpdateSettings (); };
+            ViewToEdit.SubViewsLaidOut += (_, _) => { OnUpdateLayoutSettings (); };
         }
     }
 
-    protected override void OnUpdateSettings ()
+    protected override void OnUpdateLayoutSettings ()
     {
         Enabled = ViewToEdit is not Adornment;
 
@@ -130,7 +130,7 @@ private void DimEditor_Initialized (object? sender, EventArgs e)
 
     private void DimChanged ()
     {
-        if (ViewToEdit == null || UpdatingSettings)
+        if (ViewToEdit == null || UpdatingLayoutSettings)
         {
             return;
         }
diff --git a/Examples/UICatalog/Scenarios/Editors/EditorBase.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/EditorBase.cs
similarity index 93%
rename from Examples/UICatalog/Scenarios/Editors/EditorBase.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/EditorBase.cs
index ee8ed9706a..c40307ceae 100644
--- a/Examples/UICatalog/Scenarios/Editors/EditorBase.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/EditorBase.cs
@@ -48,6 +48,8 @@ void OnInitialized (object? sender, EventArgs e)
 
         AddCommand (Command.Accept, () => true);
 
+        SchemeName = "Dialog";
+
     }
 
     private readonly ExpanderButton? _expanderButton;
@@ -65,15 +67,15 @@ public ExpanderButton? ExpanderButton
         }
     }
 
-    public bool UpdatingSettings { get; private set; } = false;
+    public bool UpdatingLayoutSettings { get; private set; } = false;
 
     private void View_LayoutComplete (object? sender, LayoutEventArgs e)
     {
-        UpdatingSettings = true;
+        UpdatingLayoutSettings = true;
 
-        OnUpdateSettings ();
+        OnUpdateLayoutSettings ();
 
-        UpdatingSettings = false;
+        UpdatingLayoutSettings = false;
     }
 
 
@@ -108,7 +110,7 @@ public View? ViewToEdit
 
     protected virtual void OnViewToEditChanged () { }
 
-    protected virtual void OnUpdateSettings () { }
+    protected virtual void OnUpdateLayoutSettings () { }
 
     /// <summary>
     ///     Gets or sets whether the DimEditor should automatically select the View to edit
diff --git a/Examples/UICatalog/Scenarios/Editors/EventLog.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs
similarity index 100%
rename from Examples/UICatalog/Scenarios/Editors/EventLog.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/EventLog.cs
diff --git a/Examples/UICatalog/Scenarios/Editors/ExpanderButton.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ExpanderButton.cs
similarity index 100%
rename from Examples/UICatalog/Scenarios/Editors/ExpanderButton.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/ExpanderButton.cs
diff --git a/Examples/UICatalog/Scenarios/Editors/LayoutEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/LayoutEditor.cs
similarity index 100%
rename from Examples/UICatalog/Scenarios/Editors/LayoutEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/LayoutEditor.cs
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/MarginEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/MarginEditor.cs
new file mode 100644
index 0000000000..626733f3b3
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/MarginEditor.cs
@@ -0,0 +1,90 @@
+#nullable enable
+using System;
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class MarginEditor : AdornmentEditor
+{
+    public MarginEditor ()
+    {
+        Title = "_Margin";
+        Initialized += MarginEditor_Initialized;
+        AdornmentChanged += MarginEditor_AdornmentChanged;
+    }
+
+    private RadioGroup? _rgShadow;
+
+    private FlagSelector? _flagSelectorTransparent;
+
+    private void MarginEditor_AdornmentChanged (object? sender, EventArgs e)
+    {
+        if (AdornmentToEdit is { })
+        {
+            _rgShadow!.SelectedItem = (int)((Margin)AdornmentToEdit).ShadowStyle;
+        }
+
+        if (AdornmentToEdit is { })
+        {
+            _flagSelectorTransparent!.Value = (uint)((Margin)AdornmentToEdit).ViewportSettings;
+        }
+    }
+
+    private void MarginEditor_Initialized (object? sender, EventArgs e)
+    {
+        _rgShadow = new RadioGroup
+        {
+            X = 0,
+            Y = Pos.Bottom (SubViews.ElementAt(SubViews.Count-1)),
+
+            SuperViewRendersLineCanvas = true,
+            Title = "_Shadow",
+            BorderStyle = LineStyle.Single,
+            RadioLabels = Enum.GetNames (typeof (ShadowStyle)),
+        };
+
+        if (AdornmentToEdit is { })
+        {
+            _rgShadow.SelectedItem = (int)((Margin)AdornmentToEdit).ShadowStyle;
+        }
+
+        _rgShadow.SelectedItemChanged += (_, args) =>
+                                        {
+                                            ((Margin)AdornmentToEdit!).ShadowStyle = (ShadowStyle)args.SelectedItem!;
+                                        };
+
+        Add (_rgShadow);
+
+        var flags = new Dictionary<uint, string> ()
+        {
+            { (uint)Terminal.Gui.ViewportSettings.Transparent, "Transparent" },
+            { (uint)Terminal.Gui.ViewportSettings.TransparentMouse, "TransparentMouse" }
+        };
+
+        _flagSelectorTransparent = new FlagSelector ()
+        {
+            X = 0,
+            Y = Pos.Bottom (_rgShadow),
+
+            SuperViewRendersLineCanvas = true,
+            Title = "_ViewportSettings",
+            BorderStyle = LineStyle.Single,
+        };
+        _flagSelectorTransparent.SetFlags(flags.AsReadOnly ());
+
+
+        Add (_flagSelectorTransparent);
+
+        if (AdornmentToEdit is { })
+        {
+            _flagSelectorTransparent.Value = (uint)((Margin)AdornmentToEdit).ViewportSettings;
+        }
+
+        _flagSelectorTransparent.ValueChanged += (_, args) =>
+                                                 {
+                                                     ((Margin)AdornmentToEdit!).ViewportSettings = (Terminal.Gui.ViewportSettings)args.CurrentValue!;
+                                                 };
+
+
+    }
+}
\ No newline at end of file
diff --git a/Examples/UICatalog/Scenarios/Editors/PaddingEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PaddingEditor.cs
similarity index 100%
rename from Examples/UICatalog/Scenarios/Editors/PaddingEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/PaddingEditor.cs
diff --git a/Examples/UICatalog/Scenarios/Editors/PosEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
similarity index 97%
rename from Examples/UICatalog/Scenarios/Editors/PosEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
index f6a05f7112..20b92adf98 100644
--- a/Examples/UICatalog/Scenarios/Editors/PosEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs
@@ -23,7 +23,7 @@ public PosEditor ()
     private RadioGroup? _posRadioGroup;
     private TextField? _valueEdit;
 
-    protected override void OnUpdateSettings ()
+    protected override void OnUpdateLayoutSettings ()
     {
         Enabled = ViewToEdit is not Adornment;
 
@@ -130,7 +130,7 @@ private void PosEditor_Initialized (object? sender, EventArgs e)
 
     private void PosChanged ()
     {
-        if (ViewToEdit == null || UpdatingSettings)
+        if (ViewToEdit == null || UpdatingLayoutSettings)
         {
             return;
         }
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/SchemeViewer.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/SchemeViewer.cs
new file mode 100644
index 0000000000..00ba23185c
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/SchemeViewer.cs
@@ -0,0 +1,47 @@
+#nullable enable
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class SchemeViewer : FrameView
+{
+    public SchemeViewer ()
+    {
+        TabStop = TabBehavior.TabStop;
+        CanFocus = true;
+        Height = Dim.Auto ();
+        Width = Dim.Auto ();
+
+        VisualRoleViewer? prevRoleViewer = null;
+
+        foreach (VisualRole role in Enum.GetValues<VisualRole> ())
+        {
+            var roleViewer = new VisualRoleViewer
+            {
+                Role = role
+            };
+
+            if (prevRoleViewer is { })
+            {
+                roleViewer.Y = Pos.Bottom (prevRoleViewer);
+            }
+
+            base.Add (roleViewer);
+
+            prevRoleViewer = roleViewer;
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override bool OnSettingSchemeName (in string? currentName, ref string? newName)
+    {
+        Title = newName ?? "null";
+
+        foreach (VisualRoleViewer v in SubViews.OfType<VisualRoleViewer> ())
+        {
+            v.SchemeName = newName;
+        }
+
+        return base.OnSettingSchemeName (in currentName, ref newName);
+    }
+}
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs
new file mode 100644
index 0000000000..387e6fef32
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ThemeViewer.cs
@@ -0,0 +1,121 @@
+#nullable enable
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class ThemeViewer : FrameView
+{
+    public ThemeViewer ()
+    {
+        BorderStyle = LineStyle.Rounded;
+        Border!.Thickness = new (0, 1, 0, 0);
+        Margin!.Thickness = new (0, 0, 1, 0);
+        TabStop = TabBehavior.TabStop;
+        CanFocus = true;
+        Height = Dim.Fill ();
+        Width = Dim.Auto ();
+        Title = $"{ThemeManager.Theme}";
+
+        VerticalScrollBar.AutoShow = true;
+        HorizontalScrollBar.AutoShow = true;
+
+        SubViewsLaidOut += (sender, _) =>
+                           {
+                               if (sender is View sendingView)
+                               {
+                                   sendingView.SetContentSize (new Size (sendingView.GetContentSize ().Width, sendingView.GetHeightRequiredForSubViews ()));
+                               }
+                           };
+
+        AddCommand (Command.Up, () => ScrollVertical (-1));
+        AddCommand (Command.Down, () => ScrollVertical (1));
+
+        AddCommand (Command.PageUp, () => ScrollVertical (-SubViews.OfType<SchemeViewer> ().First ().Frame.Height));
+        AddCommand (Command.PageDown, () => ScrollVertical (SubViews.OfType<SchemeViewer> ().First ().Frame.Height));
+
+        AddCommand (
+                    Command.Start,
+                    () =>
+                    {
+                        Viewport = Viewport with { Y = 0 };
+
+                        return true;
+                    });
+
+        AddCommand (
+                    Command.End,
+                    () =>
+                    {
+                        Viewport = Viewport with { Y = GetContentSize ().Height };
+
+                        return true;
+                    });
+
+        AddCommand (Command.ScrollDown, () => ScrollVertical (1));
+        AddCommand (Command.ScrollUp, () => ScrollVertical (-1));
+        AddCommand (Command.ScrollRight, () => ScrollHorizontal (1));
+        AddCommand (Command.ScrollLeft, () => ScrollHorizontal (-1));
+
+        KeyBindings.Add (Key.CursorUp, Command.Up);
+        KeyBindings.Add (Key.CursorDown, Command.Down);
+        KeyBindings.Add (Key.CursorLeft, Command.Left);
+        KeyBindings.Add (Key.CursorRight, Command.Right);
+        KeyBindings.Add (Key.PageUp, Command.PageUp);
+        KeyBindings.Add (Key.PageDown, Command.PageDown);
+        KeyBindings.Add (Key.Home, Command.Start);
+        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);
+        MouseBindings.Add (MouseFlags.WheeledUp, Command.ScrollUp);
+        MouseBindings.Add (MouseFlags.WheeledLeft, Command.ScrollLeft);
+        MouseBindings.Add (MouseFlags.WheeledRight, Command.ScrollRight);
+
+        SchemeViewer? prevSchemeViewer = null;
+
+        foreach (KeyValuePair<string, Scheme?> kvp in SchemeManager.GetSchemesForCurrentTheme ())
+        {
+            var schemeViewer = new SchemeViewer
+            {
+                Id = $"schemeViewer for {kvp.Key}",
+                SchemeName = kvp.Key
+            };
+
+            if (prevSchemeViewer is { })
+            {
+                schemeViewer.Y = Pos.Bottom (prevSchemeViewer);
+            }
+
+            prevSchemeViewer = schemeViewer;
+            base.Add (schemeViewer);
+        }
+
+        ThemeManager.ThemeChanged += OnThemeManagerOnThemeChanged;
+    }
+
+    /// <inheritdoc/>
+    protected override void OnFocusedChanged (View? previousFocused, View? focused)
+    {
+        base.OnFocusedChanged (previousFocused, focused);
+
+        if (focused is { })
+        {
+            SchemeName = focused.Title;
+        }
+    }
+
+    private void OnThemeManagerOnThemeChanged (object? _, StringPropertyEventArgs args) { Title = args.NewString!; }
+
+    protected override void Dispose (bool disposing)
+    {
+        if (disposing)
+        {
+            ThemeManager.ThemeChanged -= OnThemeManagerOnThemeChanged;
+        }
+
+        base.Dispose (disposing);
+    }
+}
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewPropertiesEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewPropertiesEditor.cs
new file mode 100644
index 0000000000..3acf31f7c9
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewPropertiesEditor.cs
@@ -0,0 +1,127 @@
+#nullable enable
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class ViewPropertiesEditor : EditorBase
+{
+    private CheckBox? _canFocusCheckBox;
+    private CheckBox? _enabledCheckBox;
+    private RadioGroup? _orientation;
+    private TextView? _text;
+
+    /// <inheritdoc/>
+    public override void EndInit ()
+    {
+        _canFocusCheckBox = new ()
+        {
+            Title = "CanFocus",
+            X = 0,
+            Y = 0,
+            CheckedState = ViewToEdit is { } ? ViewToEdit.CanFocus ? CheckState.Checked : CheckState.UnChecked : CheckState.UnChecked
+        };
+
+        _canFocusCheckBox.CheckedStateChanged += (s, args) =>
+                                                 {
+                                                     if (ViewToEdit is { })
+                                                     {
+                                                         ViewToEdit.CanFocus = _canFocusCheckBox.CheckedState == CheckState.Checked;
+                                                     }
+                                                 };
+        base.Add (_canFocusCheckBox);
+
+        _enabledCheckBox = new ()
+        {
+            Title = "Enabled",
+            X = Pos.Right (_canFocusCheckBox) + 1,
+            Y = Pos.Top (_canFocusCheckBox),
+            CheckedState = ViewToEdit is { } ? ViewToEdit.Enabled ? CheckState.Checked : CheckState.UnChecked : CheckState.UnChecked
+        };
+
+        _enabledCheckBox.CheckedStateChanged += (s, args) =>
+                                                {
+                                                    if (ViewToEdit is { })
+                                                    {
+                                                        ViewToEdit.Enabled = _enabledCheckBox.CheckedState == CheckState.Checked;
+                                                    }
+                                                };
+        base.Add (_enabledCheckBox);
+
+        Label label = new () { X = Pos.Right (_enabledCheckBox) + 1, Y = Pos.Top (_enabledCheckBox), Text = "Orientation:" };
+
+        _orientation = new ()
+        {
+            X = Pos.Right (label) + 1,
+            Y = Pos.Top (label),
+            RadioLabels = new [] { "Horizontal", "Vertical" },
+            Orientation = Orientation.Horizontal
+        };
+
+        _orientation.SelectedItemChanged += (s, selected) =>
+                                            {
+                                                if (ViewToEdit is IOrientation orientatedView)
+                                                {
+                                                    orientatedView.Orientation = (Orientation)_orientation.SelectedItem!;
+                                                }
+                                            };
+        Add (label, _orientation);
+
+        label = new () { X = 0, Y = Pos.Bottom (_orientation), Text = "Text:" };
+
+        _text = new ()
+        {
+            X = Pos.Right (label) + 1,
+            Y = Pos.Top (label),
+            Width = Dim.Fill (),
+            Height = Dim.Auto (minimumContentDim: 2),
+            Text = "This is demo text"
+        };
+
+        _text.ContentsChanged += (s, e) =>
+                                 {
+                                     if (ViewToEdit is { })
+                                     {
+                                         ViewToEdit.Text = _text.Text;
+                                     }
+                                 };
+
+        Add (label, _text);
+
+        base.EndInit ();
+    }
+
+    public string DemoText
+    {
+        get
+        {
+            if (_text is null)
+            {
+                return string.Empty;
+            }
+
+            return _text!.Text;
+        }
+        set => _text!.Text = value;
+    }
+
+    protected override void OnViewToEditChanged ()
+    {
+        Enabled = ViewToEdit is not Adornment;
+
+        if (ViewToEdit is { } and not Adornment)
+        {
+            _canFocusCheckBox!.CheckedState = ViewToEdit.CanFocus ? CheckState.Checked : CheckState.UnChecked;
+            _enabledCheckBox!.CheckedState = ViewToEdit.Enabled ? CheckState.Checked : CheckState.UnChecked;
+
+            if (ViewToEdit is IOrientation orientatedView)
+            {
+                _orientation!.SelectedItem = (int)orientatedView.Orientation;
+                _orientation.Enabled = true;
+            }
+            else
+            {
+                _orientation!.Enabled = false;
+            }
+        }
+    }
+}
diff --git a/Examples/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewportSettingsEditor.cs
similarity index 88%
rename from Examples/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs
rename to Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewportSettingsEditor.cs
index ee41ec7469..f989caaf7f 100644
--- a/Examples/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/ViewportSettingsEditor.cs
@@ -17,19 +17,13 @@ public ViewportSettingsEditor ()
         Initialized += ViewportSettingsEditor_Initialized;
     }
 
-    protected override void OnUpdateSettings ()
+    protected override void OnViewToEditChanged ()
     {
         foreach (View subview in SubViews)
         {
             subview.Enabled = ViewToEdit is not Adornment;
         }
 
-        if (ViewToEdit is null)
-        { }
-    }
-
-    protected override void OnViewToEditChanged ()
-    {
         if (ViewToEdit is { } and not Adornment)
         {
             //ViewToEdit.VerticalScrollBar.AutoShow = true;
@@ -62,7 +56,11 @@ protected override void OnViewToEditChanged ()
                                                    ? CheckState.Checked
                                                    : CheckState.UnChecked;
 
-            _cbTransparent!.CheckedState = ViewToEdit.ViewportSettings.HasFlag(Terminal.Gui.ViewportSettings.Transparent)
+            _cbTransparent!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.Transparent)
+                                               ? CheckState.Checked
+                                               : CheckState.UnChecked;
+
+            _cbTransparentMouse!.CheckedState = ViewToEdit.ViewportSettings.HasFlag (Terminal.Gui.ViewportSettings.TransparentMouse)
                                                ? CheckState.Checked
                                                : CheckState.UnChecked;
 
@@ -82,6 +80,7 @@ protected override void OnViewToEditChanged ()
     private CheckBox? _cbClearContentOnly;
     private CheckBox? _cbClipContentOnly;
     private CheckBox? _cbTransparent;
+    private CheckBox? _cbTransparentMouse;
     private CheckBox? _cbVerticalScrollBar;
     private CheckBox? _cbAutoShowVerticalScrollBar;
     private CheckBox? _cbHorizontalScrollBar;
@@ -89,7 +88,7 @@ protected override void OnViewToEditChanged ()
 
     private void ViewportSettingsEditor_Initialized (object? s, EventArgs e)
     {
-        _cbAllowNegativeX = new()
+        _cbAllowNegativeX = new ()
         {
             Title = "Allow X < 0",
             CanFocus = true
@@ -97,7 +96,7 @@ private void ViewportSettingsEditor_Initialized (object? s, EventArgs e)
 
         Add (_cbAllowNegativeX);
 
-        _cbAllowNegativeY = new()
+        _cbAllowNegativeY = new ()
         {
             Title = "Allow Y < 0",
             CanFocus = true
@@ -105,7 +104,7 @@ private void ViewportSettingsEditor_Initialized (object? s, EventArgs e)
 
         Add (_cbAllowNegativeY);
 
-        _cbAllowXGreaterThanContentWidth = new()
+        _cbAllowXGreaterThanContentWidth = new ()
         {
             Title = "Allow X > Content Width",
             Y = Pos.Bottom (_cbAllowNegativeX),
@@ -141,7 +140,7 @@ void AllowXGreaterThanContentWidthToggle (object? sender, CancelEventArgs<CheckS
             }
         }
 
-        _cbAllowYGreaterThanContentHeight = new()
+        _cbAllowYGreaterThanContentHeight = new ()
         {
             Title = "Allow Y > Content Height",
             X = Pos.Right (_cbAllowXGreaterThanContentWidth) + 1,
@@ -187,7 +186,7 @@ void AllowYGreaterThanContentHeightToggle (object? sender, CancelEventArgs<Check
             Y = Pos.Bottom (_cbAllowYGreaterThanContentHeight)
         };
 
-        _contentSizeWidth = new()
+        _contentSizeWidth = new ()
         {
             X = Pos.Right (labelContentSize) + 1,
             Y = Pos.Top (labelContentSize),
@@ -215,7 +214,7 @@ void ContentSizeWidthValueChanged (object? sender, CancelEventArgs<int> e)
             Y = Pos.Top (labelContentSize)
         };
 
-        _contentSizeHeight = new()
+        _contentSizeHeight = new ()
         {
             X = Pos.Right (labelComma) + 1,
             Y = Pos.Top (labelContentSize),
@@ -236,7 +235,7 @@ void ContentSizeHeightValueChanged (object? sender, CancelEventArgs<int> e)
             ViewToEdit?.SetContentSize (ViewToEdit.GetContentSize () with { Height = e.NewValue });
         }
 
-        _cbClearContentOnly = new()
+        _cbClearContentOnly = new ()
         {
             Title = "ClearContentOnly",
             X = 0,
@@ -257,7 +256,7 @@ void ClearContentOnlyToggle (object? sender, CancelEventArgs<CheckState> e)
             }
         }
 
-        _cbClipContentOnly = new()
+        _cbClipContentOnly = new ()
         {
             Title = "ClipContentOnly",
             X = Pos.Right (_cbClearContentOnly) + 1,
@@ -299,7 +298,28 @@ void TransparentToggle (object? sender, CancelEventArgs<CheckState> e)
             }
         }
 
-        _cbVerticalScrollBar = new()
+        _cbTransparentMouse = new ()
+        {
+            Title = "TransparentMouse",
+            X = Pos.Right (_cbTransparent) + 1,
+            Y = Pos.Bottom (labelContentSize),
+            CanFocus = true
+        };
+        _cbTransparentMouse.CheckedStateChanging += TransparentMouseToggle;
+
+        void TransparentMouseToggle (object? sender, CancelEventArgs<CheckState> e)
+        {
+            if (e.NewValue == CheckState.Checked)
+            {
+                ViewToEdit!.ViewportSettings |= Terminal.Gui.ViewportSettings.TransparentMouse;
+            }
+            else
+            {
+                ViewToEdit!.ViewportSettings &= ~Terminal.Gui.ViewportSettings.TransparentMouse;
+            }
+        }
+
+        _cbVerticalScrollBar = new ()
         {
             Title = "VerticalScrollBar",
             X = 0,
@@ -313,7 +333,7 @@ void VerticalScrollBarToggle (object? sender, CancelEventArgs<CheckState> e)
             ViewToEdit!.VerticalScrollBar.Visible = e.NewValue == CheckState.Checked;
         }
 
-        _cbAutoShowVerticalScrollBar = new()
+        _cbAutoShowVerticalScrollBar = new ()
         {
             Title = "AutoShow",
             X = Pos.Right (_cbVerticalScrollBar) + 1,
@@ -327,7 +347,7 @@ void AutoShowVerticalScrollBarToggle (object? sender, CancelEventArgs<CheckState
             ViewToEdit!.VerticalScrollBar.AutoShow = e.NewValue == CheckState.Checked;
         }
 
-        _cbHorizontalScrollBar = new()
+        _cbHorizontalScrollBar = new ()
         {
             Title = "HorizontalScrollBar",
             X = 0,
@@ -341,7 +361,7 @@ void HorizontalScrollBarToggle (object? sender, CancelEventArgs<CheckState> e)
             ViewToEdit!.HorizontalScrollBar.Visible = e.NewValue == CheckState.Checked;
         }
 
-        _cbAutoShowHorizontalScrollBar = new()
+        _cbAutoShowHorizontalScrollBar = new ()
         {
             Title = "AutoShow ",
             X = Pos.Right (_cbHorizontalScrollBar) + 1,
@@ -363,6 +383,7 @@ void AutoShowHorizontalScrollBarToggle (object? sender, CancelEventArgs<CheckSta
              _cbClearContentOnly,
              _cbClipContentOnly,
              _cbTransparent,
+             _cbTransparentMouse,
              _cbVerticalScrollBar,
              _cbHorizontalScrollBar,
              _cbAutoShowVerticalScrollBar,
diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/VisualRoleViewer.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/VisualRoleViewer.cs
new file mode 100644
index 0000000000..f410a854c7
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/VisualRoleViewer.cs
@@ -0,0 +1,39 @@
+#nullable enable
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+public class VisualRoleViewer : View
+{
+    public VisualRoleViewer ()
+    {
+        CanFocus = false;
+        Height = Dim.Auto (DimAutoStyle.Text);
+        Width = Dim.Auto (DimAutoStyle.Text);
+    }
+
+    private VisualRole? _role;
+
+    public VisualRole? Role
+    {
+        get => _role;
+        set
+        {
+            _role = value;
+            Text = $"{Role?.ToString ()?.PadRight (10)} {SchemeName}";
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
+    {
+        if (role != Role)
+        {
+            currentAttribute = GetAttributeForRole (Role!.Value);
+
+            return true;
+        }
+
+        return base.OnGettingAttributeForRole (in role, ref currentAttribute);
+    }
+}
diff --git a/Examples/UICatalog/Scenarios/GraphViewExample.cs b/Examples/UICatalog/Scenarios/GraphViewExample.cs
index bb62e1cf04..b6f6ea8b96 100644
--- a/Examples/UICatalog/Scenarios/GraphViewExample.cs
+++ b/Examples/UICatalog/Scenarios/GraphViewExample.cs
@@ -137,7 +137,7 @@ public override void Main ()
         };
         app.Add (menu);
 
-        _graphView = new()
+        _graphView = new ()
         {
             X = 0,
             Y = 1,
@@ -161,7 +161,7 @@ public override void Main ()
         };
 
         frameRight.Add (
-                        _about = new() { Width = Dim.Fill (), Height = Dim.Fill (), ReadOnly = true }
+                        _about = new () { Width = Dim.Fill (), Height = Dim.Fill (), ReadOnly = true }
                        );
 
         app.Add (frameRight);
@@ -239,9 +239,9 @@ private void MultiBarGraph ()
 
         _about.Text = "Housing Expenditures by income thirds 1996-2003";
 
-        Color fore = _graphView.ColorScheme.Normal.Foreground == Color.Black
+        Color fore = _graphView.GetAttributeForRole (VisualRole.Normal).Foreground == Color.Black
                          ? Color.White
-                         : _graphView.ColorScheme.Normal.Foreground;
+                         : _graphView.GetAttributeForRole (VisualRole.Normal).Foreground;
         var black = new Attribute (fore, Color.Black);
         var cyan = new Attribute (Color.BrightCyan, Color.Black);
         var magenta = new Attribute (Color.BrightMagenta, Color.Black);
@@ -398,7 +398,7 @@ private void SetupLifeExpectancyBarGraph (bool verticalBars)
 
         var barSeries = new BarSeries
         {
-            Bars = new()
+            Bars = new ()
             {
                 new ("Switzerland", softStiple, 83.4f),
                 new (
@@ -533,7 +533,7 @@ private void SetupLineGraph ()
 
         _about.Text = "This graph shows random points";
 
-        var black = new Attribute (_graphView.ColorScheme.Normal.Foreground, Color.Black);
+        var black = new Attribute (_graphView.GetAttributeForRole (VisualRole.Normal).Foreground, Color.Black, _graphView.GetAttributeForRole (VisualRole.Normal).Style);
         var cyan = new Attribute (Color.BrightCyan, Color.Black);
         var magenta = new Attribute (Color.BrightMagenta, Color.Black);
         var red = new Attribute (Color.BrightRed, Color.Black);
@@ -621,7 +621,7 @@ private void SetupPeriodicTableScatterPlot ()
         _graphView.Series.Add (
                                new ScatterSeries
                                {
-                                   Points = new()
+                                   Points = new ()
                                    {
                                        new (1, 1.007f),
                                        new (2, 4.002f),
@@ -825,7 +825,7 @@ private void SetupPopulationPyramid ()
         var malesSeries = new BarSeries
         {
             Orientation = Orientation.Horizontal,
-            Bars = new()
+            Bars = new ()
             {
                 new ("0-4", stiple, -2009363),
                 new ("5-9", stiple, -2108550),
@@ -856,7 +856,7 @@ private void SetupPopulationPyramid ()
         var femalesSeries = new BarSeries
         {
             Orientation = Orientation.Horizontal,
-            Bars = new()
+            Bars = new ()
             {
                 new ("0-4", stiple, 1915127),
                 new ("5-9", stiple, 2011016),
diff --git a/Examples/UICatalog/Scenarios/HexEditor.cs b/Examples/UICatalog/Scenarios/HexEditor.cs
index 32aaf41a3f..596d81913d 100644
--- a/Examples/UICatalog/Scenarios/HexEditor.cs
+++ b/Examples/UICatalog/Scenarios/HexEditor.cs
@@ -15,7 +15,7 @@ public class HexEditor : Scenario
 {
     private string? _fileName;
     private HexView? _hexView;
-    private MenuItemv2? _miAllowEdits;
+    private MenuItemv2? _miReadOnly;
     private bool _saved = true;
     private Shortcut? _scAddress;
     private Shortcut? _scInfo;
@@ -26,9 +26,9 @@ public override void Main ()
     {
         Application.Init ();
 
-        var app = new Toplevel
+        var app = new Window ()
         {
-            ColorScheme = Colors.ColorSchemes ["Base"]
+            BorderStyle = LineStyle.None
         };
 
         _fileName = "demo.bin";
@@ -78,10 +78,10 @@ public override void Main ()
                      "_Options",
                      new MenuItemv2 []
                      {
-                         _miAllowEdits = new (
-                                              "_AllowEdits",
+                         _miReadOnly = new (
+                                              "_Read Only",
                                               "",
-                                              ToggleAllowEdits
+                                              ToggleReadOnly
                                              )
                          {
 
@@ -93,10 +93,10 @@ public override void Main ()
 
         CheckBox cb = new CheckBox ()
         {
-            Title = _miAllowEdits.Title,
-            CheckedState = _hexView.AllowEdits ? CheckState.Checked : CheckState.None,
+            Title = _miReadOnly.Title,
+            CheckedState = _hexView.ReadOnly ? CheckState.Checked : CheckState.None,
         };
-        _miAllowEdits.CommandView = cb;
+        _miReadOnly.CommandView = cb;
         app.Add (menu);
 
         var addressWidthUpDown = new NumericUpDown
@@ -292,13 +292,13 @@ private void Save ()
         }
     }
 
-    private void ToggleAllowEdits ()
+    private void ToggleReadOnly ()
     {
-        if (_miAllowEdits?.CommandView is not CheckBox cb)
+        if (_miReadOnly?.CommandView is not CheckBox cb)
         {
             return;
         }
 
-        _hexView!.AllowEdits = cb.CheckedState == CheckState.Checked;
+        _hexView!.ReadOnly = cb.CheckedState == CheckState.Checked;
     }
 }
diff --git a/Examples/UICatalog/Scenarios/InvertColors.cs b/Examples/UICatalog/Scenarios/InvertColors.cs
deleted file mode 100644
index 2663cc7a32..0000000000
--- a/Examples/UICatalog/Scenarios/InvertColors.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Terminal.Gui;
-
-namespace UICatalog.Scenarios;
-
-[ScenarioMetadata ("Invert Colors", "Invert the foreground and the background colors.")]
-[ScenarioCategory ("Colors")]
-[ScenarioCategory ("Text and Formatting")]
-public class InvertColors : Scenario
-{
-    public override void Main ()
-    {
-        Application.Init ();
-        var win = new Window
-        {
-            Title = GetQuitKeyAndName (),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"]
-        };
-
-        List<Label> labels = new ();
-        ColorName16 [] foreColors = Enum.GetValues (typeof (ColorName16)).Cast<ColorName16> ().ToArray ();
-
-        for (var y = 0; y < foreColors.Length; y++)
-        {
-            ColorName16 fore = foreColors [y];
-            ColorName16 back = foreColors [(y + 1) % foreColors.Length];
-            var color = new Attribute (fore, back);
-
-            var label = new Label { ColorScheme = new ColorScheme (), Y = y, Text = $"{fore} on {back}" };
-            label.ColorScheme = new ColorScheme (label.ColorScheme) { Normal = color };
-            win.Add (label);
-            labels.Add (label);
-        }
-
-        var button = new Button { X = Pos.Center (), Y = foreColors.Length + 1, Text = "Invert color!" };
-
-        button.Accepting += (s, e) =>
-                          {
-                              foreach (Label label in labels)
-                              {
-                                  Attribute color = label.ColorScheme.Normal;
-                                  color = new Attribute (color.Background, color.Foreground);
-
-                                  label.ColorScheme = new ColorScheme (label.ColorScheme) { Normal = color };
-                                  label.Text = $"{color.Foreground} on {color.Background}";
-                                  label.SetNeedsDraw ();
-                              }
-                          };
-        win.Add (button);
-
-        Application.Run (win);
-        win.Dispose ();
-        Application.Shutdown ();
-    }
-}
diff --git a/Examples/UICatalog/Scenarios/Keys.cs b/Examples/UICatalog/Scenarios/Keys.cs
index b4988a3c93..5f450bc930 100644
--- a/Examples/UICatalog/Scenarios/Keys.cs
+++ b/Examples/UICatalog/Scenarios/Keys.cs
@@ -87,7 +87,7 @@ public override void Main ()
             Height = Dim.Fill (),
             Source = new ListWrapper<string> (keyList)
         };
-        appKeyListView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        appKeyListView.SchemeName = "TopLevel";
         win.Add (appKeyListView);
 
         // View key events...
@@ -115,7 +115,7 @@ public override void Main ()
             Height = Dim.Fill (),
             Source = new ListWrapper<string> (keyDownList)
         };
-        onKeyDownListView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        appKeyListView.SchemeName = "TopLevel";
         win.Add (onKeyDownListView);
 
         // KeyDownNotHandled
@@ -135,7 +135,7 @@ public override void Main ()
             Height = Dim.Fill (),
             Source = new ListWrapper<string> (keyDownNotHandledList)
         };
-        onKeyDownNotHandledListView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        appKeyListView.SchemeName = "TopLevel";
         win.Add (onKeyDownNotHandledListView);
 
 
@@ -156,7 +156,7 @@ public override void Main ()
             Height = Dim.Fill (),
             Source = new ListWrapper<string> (swallowedList)
         };
-        onSwallowedListView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        appKeyListView.SchemeName = "TopLevel";
         win.Add (onSwallowedListView);
 
         if (Application.Driver is IConsoleDriverFacade fac)
diff --git a/Examples/UICatalog/Scenarios/LineCanvasExperiment.cs b/Examples/UICatalog/Scenarios/LineCanvasExperiment.cs
index a3b14b65ae..be83770676 100644
--- a/Examples/UICatalog/Scenarios/LineCanvasExperiment.cs
+++ b/Examples/UICatalog/Scenarios/LineCanvasExperiment.cs
@@ -25,7 +25,7 @@ public override void Main ()
             Y = 0,
             Width = Dim.Fill (),
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Base"]
+            SchemeName = "Base"
            ,
             SuperViewRendersLineCanvas = true
         };
@@ -58,7 +58,7 @@ public override void Main ()
             Width = Dim.Percent (30),
             Height = Dim.Percent (70),
 
-            //ColorScheme = Colors.ColorSchemes ["Error"],
+            //Scheme = Colors.Schemes ["Error"],
             SuperViewRendersLineCanvas = true
         };
 
@@ -72,7 +72,7 @@ public override void Main ()
             Height = Dim.Fill (),
             SuperViewRendersLineCanvas = true
 
-            //ColorScheme = Colors.ColorSchemes ["Menu"],
+            //Scheme = Colors.Schemes ["Menu"],
         };
 
         win2.Add (subViewOfWin2);
@@ -102,7 +102,7 @@ public override void Main ()
         //    Width = view4.Width,
         //    Height = 5,
 
-        //    //ColorScheme = Colors.ColorSchemes ["TopLevel"],
+        //    //Scheme = Colors.Schemes ["TopLevel"],
         //    SuperViewRendersLineCanvas = true,
         //    BorderStyle = LineStyle.Double
         //};
@@ -128,10 +128,10 @@ public override void Main ()
         //    Width = 25,
         //    Height = 10,
 
-        //    //ColorScheme = Colors.ColorSchemes ["Error"],
+        //    //Scheme = Colors.Schemes ["Error"],
         //    SuperViewRendersLineCanvas = true
         //};
-        //marginWindow.Margin.ColorScheme = Colors.ColorSchemes ["Error"];
+        //marginWindow.Margin.Scheme = Colors.Schemes ["Error"];
         //marginWindow.Margin.Thickness = new (1);
         //marginWindow.Border.Thickness = new (1, 2, 1, 1);
 
diff --git a/Examples/UICatalog/Scenarios/LineDrawing.cs b/Examples/UICatalog/Scenarios/LineDrawing.cs
index 52da1a684c..79a35bf2f9 100644
--- a/Examples/UICatalog/Scenarios/LineDrawing.cs
+++ b/Examples/UICatalog/Scenarios/LineDrawing.cs
@@ -120,7 +120,7 @@ public override void Main ()
 
         win.Add (canvas);
         win.Add (tools);
-        tools.CurrentColor = canvas.GetNormalColor ();
+        tools.CurrentColor = canvas.GetAttributeForRole (VisualRole.Normal);
         canvas.CurrentAttribute = tools.CurrentColor;
 
         win.KeyDown += (s, e) => { e.Handled = canvas.NewKeyDownEvent (e); };
@@ -235,14 +235,14 @@ public override void BeginInit ()
 
         _colors.ValueChanged += (s, e) => ColorChanged?.Invoke (this, e);
 
-        _stylePicker = new()
+        _stylePicker = new ()
         {
             X = 0, Y = Pos.Bottom (_colors), RadioLabels = Enum.GetNames (typeof (LineStyle)).ToArray ()
         };
         _stylePicker.SelectedItemChanged += (s, a) => { SetStyle?.Invoke ((LineStyle)a.SelectedItem); };
         _stylePicker.SelectedItem = 1;
 
-        _addLayerBtn = new() { Text = "New Layer", X = Pos.Center (), Y = Pos.Bottom (_stylePicker) };
+        _addLayerBtn = new () { Text = "New Layer", X = Pos.Center (), Y = Pos.Bottom (_stylePicker) };
 
         _addLayerBtn.Accepting += (s, a) => AddLayer?.Invoke ();
         Add (_colors, _stylePicker, _addLayerBtn);
@@ -276,7 +276,7 @@ protected override bool OnDrawingContent ()
             {
                 if (c.Value is { })
                 {
-                    SetCurrentAttribute (c.Value.Value.Attribute ?? ColorScheme.Normal);
+                    SetCurrentAttribute (c.Value.Value.Attribute ?? GetAttributeForRole (VisualRole.Normal));
 
                     // TODO: #2616 - Support combining sequences that don't normalize
                     AddRune (c.Key.X, c.Key.Y, c.Value.Value.Rune);
@@ -286,7 +286,7 @@ protected override bool OnDrawingContent ()
 
         // TODO: This is a hack to work around overlapped views not drawing correctly.
         // without this the toolbox disappears
-        SuperView?.SetNeedsLayout();
+        SuperView?.SetNeedsLayout ();
 
         return true;
     }
@@ -356,13 +356,13 @@ public Attribute Value
         }
     }
 
-    private static readonly HashSet<(int, int)> ForegroundPoints = new()
+    private static readonly HashSet<(int, int)> ForegroundPoints = new ()
     {
         (0, 0), (1, 0), (2, 0),
         (0, 1), (1, 1), (2, 1)
     };
 
-    private static readonly HashSet<(int, int)> BackgroundPoints = new()
+    private static readonly HashSet<(int, int)> BackgroundPoints = new ()
     {
         (3, 1),
         (1, 2), (2, 2), (3, 2)
@@ -380,8 +380,8 @@ protected override bool OnDrawingContent ()
         Color fg = Value.Foreground;
         Color bg = Value.Background;
 
-        bool isTransparentFg = fg == GetNormalColor ().Background;
-        bool isTransparentBg = bg == GetNormalColor ().Background;
+        bool isTransparentFg = fg == GetAttributeForRole (VisualRole.Normal).Background;
+        bool isTransparentBg = bg == GetAttributeForRole (VisualRole.Normal).Background;
 
         SetAttribute (new (fg, isTransparentFg ? Color.Gray : fg));
 
@@ -457,7 +457,7 @@ private void ClickedInBackground ()
     {
         if (LineDrawing.PromptForColor ("Background", Value.Background, out Color newColor))
         {
-            Value = new (Value.Foreground, newColor);
+            Value = new (Value.Foreground, newColor, Value.Style);
             SetNeedsDraw ();
         }
     }
diff --git a/Examples/UICatalog/Scenarios/ListColumns.cs b/Examples/UICatalog/Scenarios/ListColumns.cs
index 1c6f4c9968..4ba6911d4f 100644
--- a/Examples/UICatalog/Scenarios/ListColumns.cs
+++ b/Examples/UICatalog/Scenarios/ListColumns.cs
@@ -14,7 +14,7 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Scrolling")]
 public class ListColumns : Scenario
 {
-    private ColorScheme _alternatingColorScheme;
+    private Scheme _alternatingScheme;
     private DataTable _currentTable;
     private TableView _listColView;
     private MenuItem _miAlternatingColors;
@@ -238,11 +238,11 @@ public override void Main ()
 
         //SetupScrollBar ();
 
-        _alternatingColorScheme = new ()
+        _alternatingScheme = new ()
         {
-            Disabled = appWindow.ColorScheme.Disabled,
-            HotFocus = appWindow.ColorScheme.HotFocus,
-            Focus = appWindow.ColorScheme.Focus,
+            Disabled = appWindow.GetAttributeForRole(VisualRole.Disabled),
+            HotFocus = appWindow.GetAttributeForRole (VisualRole.HotFocus),
+            Focus = appWindow.GetAttributeForRole(VisualRole.Focus),
             Normal = new (Color.White, Color.BrightBlue)
         };
 
@@ -382,7 +382,7 @@ private void ToggleAlternatingColors ()
 
         if (_miAlternatingColors.Checked == true)
         {
-            _listColView.Style.RowColorGetter = a => { return a.RowIndex % 2 == 0 ? _alternatingColorScheme : null; };
+            _listColView.Style.RowColorGetter = a => { return a.RowIndex % 2 == 0 ? _alternatingScheme : null; };
         }
         else
         {
diff --git a/Examples/UICatalog/Scenarios/ListViewWithSelection.cs b/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
index 4013c0babf..7571720d84 100644
--- a/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
+++ b/Examples/UICatalog/Scenarios/ListViewWithSelection.cs
@@ -99,7 +99,7 @@ public override void Main ()
             Height = Dim.Fill (),
             Source = new ListWrapper<string> (_eventList)
         };
-        _eventListView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        _eventListView.SchemeName = "TopLevel";
         _appWindow.Add (_eventListView);
 
         _listView.SelectedItemChanged += (s, a) => LogEvent (s as View, a, "SelectedItemChanged");
diff --git a/Examples/UICatalog/Scenarios/ListsAndCombos.cs b/Examples/UICatalog/Scenarios/ListsAndCombos.cs
index 548c76e660..273c5dfbe3 100644
--- a/Examples/UICatalog/Scenarios/ListsAndCombos.cs
+++ b/Examples/UICatalog/Scenarios/ListsAndCombos.cs
@@ -36,7 +36,7 @@ public override void Main ()
         // ListView
         var lbListView = new Label
         {
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             X = 0,
 
             Width = Dim.Percent (40),
@@ -46,7 +46,7 @@ public override void Main ()
         var listview = new ListView
         {
             X = 0,
-            Y = Pos.Bottom (lbListView) + 1,
+            Y = Pos.Bottom (lbListView) + 2,
             Height = Dim.Fill (2),
             Width = Dim.Percent (40),
             Source = new ListWrapper<string> (items)
@@ -92,7 +92,7 @@ public override void Main ()
         // ComboBox
         var lbComboBox = new Label
         {
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             X = Pos.Right (lbListView) + 1,
 
             Width = Dim.Percent (40),
diff --git a/Examples/UICatalog/Scenarios/Mazing.cs b/Examples/UICatalog/Scenarios/Mazing.cs
index 87606cecc9..897fb04121 100644
--- a/Examples/UICatalog/Scenarios/Mazing.cs
+++ b/Examples/UICatalog/Scenarios/Mazing.cs
@@ -67,14 +67,14 @@ public override void Main ()
                                    top.AddStr ("e");
 
                                    top.Move (_m.Player.X, _m.Player.Y);
-                                   top.SetAttribute (new (Color.Cyan, top.GetNormalColor ().Background));
+                                   top.SetAttribute (new (Color.Cyan, top.GetAttributeForRole (VisualRole.Normal).Background));
                                    top.AddStr (_dead ? "x" : "@");
 
                                    // Draw goblins
                                    foreach (Point goblin in _goblins!)
                                    {
                                        top.Move (goblin.X, goblin.Y);
-                                       top.SetAttribute (new (Color.Red, top.GetNormalColor ().Background));
+                                       top.SetAttribute (new (Color.Red, top.GetAttributeForRole (VisualRole.Normal).Background));
                                        top.AddStr ("G");
                                    }
 
@@ -82,12 +82,12 @@ public override void Main ()
                                    foreach (Point potion in _potions!)
                                    {
                                        top.Move (potion.X, potion.Y);
-                                       top.SetAttribute (new (Color.Yellow, top.GetNormalColor ().Background));
+                                       top.SetAttribute (new (Color.Yellow, top.GetAttributeForRole (VisualRole.Normal).Background));
                                        top.AddStr ("p");
                                    }
 
                                    // Draw UI
-                                   top.SetAttribute (top.GetNormalColor ());
+                                   top.SetAttribute (top.GetAttributeForRole (VisualRole.Normal));
 
                                    var g = new Gradient ([new (Color.Red), new (Color.BrightGreen)], [10]);
                                    top.Move (_m.MazeWidth + 1, 0);
@@ -102,7 +102,7 @@ public override void Main ()
                                        top.AddRune ('█');
                                    }
 
-                                   top.SetAttribute (top.GetNormalColor ());
+                                   top.SetAttribute (top.GetAttributeForRole (VisualRole.Normal));
 
                                    if (!string.IsNullOrWhiteSpace (_message))
                                    {
diff --git a/Examples/UICatalog/Scenarios/Menus.cs b/Examples/UICatalog/Scenarios/Menus.cs
index f8d3b2fdc6..92d6309a08 100644
--- a/Examples/UICatalog/Scenarios/Menus.cs
+++ b/Examples/UICatalog/Scenarios/Menus.cs
@@ -33,7 +33,7 @@ public override void Main ()
             X = Pos.AnchorEnd (),
             Width = Dim.Auto (),
             Height = Dim.Fill (), // Make room for some wide things
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (eventSource)
         };
         eventLog.Border!.Thickness = new (0, 1, 0, 0);
diff --git a/Examples/UICatalog/Scenarios/MessageBoxes.cs b/Examples/UICatalog/Scenarios/MessageBoxes.cs
index fedb818d7b..cb110da1e4 100644
--- a/Examples/UICatalog/Scenarios/MessageBoxes.cs
+++ b/Examples/UICatalog/Scenarios/MessageBoxes.cs
@@ -221,7 +221,7 @@ public override void Main ()
         {
             X = Pos.Center (),
             Y = Pos.Bottom (label) + 1,
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             TextAlignment = Alignment.Center,
             Text = " "
         };
diff --git a/Examples/UICatalog/Scenarios/Mouse.cs b/Examples/UICatalog/Scenarios/Mouse.cs
index eab3ceda94..be0fc76453 100644
--- a/Examples/UICatalog/Scenarios/Mouse.cs
+++ b/Examples/UICatalog/Scenarios/Mouse.cs
@@ -205,7 +205,7 @@ void DemoPaddingOnInitialized (object o, EventArgs eventArgs)
             Y = Pos.Bottom (label),
             Width = 50,
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (appLogList)
         };
         win.Add (label, appLog);
@@ -236,7 +236,7 @@ void DemoPaddingOnInitialized (object o, EventArgs eventArgs)
             Y = Pos.Bottom (label),
             Width = Dim.Percent (50),
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (winLogList)
         };
         win.Add (label, winLog);
@@ -278,7 +278,7 @@ public MouseEventDemoView ()
             CanFocus = true;
             Id = "mouseEventDemoView";
 
-            Padding.Thickness = new Thickness (1, 1, 1, 1);
+            Padding!.Thickness = new Thickness (1, 1, 1, 1);
 
             Initialized += OnInitialized;
 
@@ -287,22 +287,22 @@ void OnInitialized (object sender, EventArgs e)
                 TextAlignment = Alignment.Center;
                 VerticalTextAlignment = Alignment.Center;
 
-                Padding.ColorScheme = new ColorScheme (new Attribute (Color.Black));
+                Padding!.SetScheme (new Scheme (new Attribute (Color.Black)));
 
                 Padding.MouseEnter += PaddingOnMouseEnter;
                 Padding.MouseLeave += PaddingOnMouseLeave;
 
                 void PaddingOnMouseEnter (object o, CancelEventArgs e)
                 {
-                    Padding.ColorScheme = Colors.ColorSchemes ["Error"];
+                    Padding.SchemeName = "Error";
                 }
 
                 void PaddingOnMouseLeave (object o, EventArgs e)
                 {
-                    Padding.ColorScheme = Colors.ColorSchemes ["Dialog"];
+                    Padding.SchemeName = "Dialog";
                 }
 
-                Border.Thickness = new Thickness (1);
+                Border!.Thickness = new Thickness (1);
                 Border.LineStyle = LineStyle.Rounded;
             }
 
diff --git a/Examples/UICatalog/Scenarios/MultiColouredTable.cs b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
index f84b4a65f1..43d5eb1f26 100644
--- a/Examples/UICatalog/Scenarios/MultiColouredTable.cs
+++ b/Examples/UICatalog/Scenarios/MultiColouredTable.cs
@@ -55,13 +55,13 @@ public override void Main ()
         dt.Rows.Add (DBNull.Value, DBNull.Value);
         dt.Rows.Add (DBNull.Value, DBNull.Value);
 
-        _tableView.ColorScheme = new ()
+        _tableView.SetScheme (new ()
         {
-            Disabled = appWindow.ColorScheme.Disabled,
-            HotFocus = appWindow.ColorScheme.HotFocus,
-            Focus = appWindow.ColorScheme.Focus,
+            Disabled = appWindow.GetAttributeForRole (VisualRole.Disabled),
+            HotFocus = appWindow.GetAttributeForRole (VisualRole.HotFocus),
+            Focus = appWindow.GetAttributeForRole (VisualRole.Focus),
             Normal = new (Color.DarkGray, Color.Black)
-        };
+        });
 
         _tableView.Table = new DataTableSource (_table = dt);
 
diff --git a/Examples/UICatalog/Scenarios/Navigation.cs b/Examples/UICatalog/Scenarios/Navigation.cs
index 7027e13794..4d99d00301 100644
--- a/Examples/UICatalog/Scenarios/Navigation.cs
+++ b/Examples/UICatalog/Scenarios/Navigation.cs
@@ -32,7 +32,7 @@ public override void Main ()
         };
         app.Add (adornmentsEditor);
 
-        var arrangementEditor = new ArrangementEditor()
+        var arrangementEditor = new ArrangementEditor ()
         {
             X = Pos.Right (adornmentsEditor),
             Y = 0,
@@ -179,7 +179,7 @@ public override void Main ()
         };
         colorPicker.ApplyStyleChanges ();
 
-        colorPicker.SelectedColor = testFrame.ColorScheme.Normal.Background;
+        colorPicker.SelectedColor = testFrame.GetAttributeForRole (VisualRole.Normal).Background;
         colorPicker.ColorChanged += ColorPicker_ColorChanged;
         overlappedView2.Add (colorPicker);
         overlappedView2.Width = 50;
@@ -192,7 +192,7 @@ public override void Main ()
             X = 1,
             Y = 7,
             Id = "datePicker",
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "TopLevel",
             ShadowStyle = ShadowStyle.Transparent,
             BorderStyle = LineStyle.Double,
             CanFocus = true, // Can't drag without this? BUGBUG
@@ -215,7 +215,7 @@ public override void Main ()
 
         testFrame.SetFocus ();
         Application.Run (app);
-       // timer.Close ();
+        // timer.Close ();
         app.Dispose ();
         Application.Shutdown ();
 
@@ -223,7 +223,7 @@ public override void Main ()
 
         void ColorPicker_ColorChanged (object sender, ColorEventArgs e)
         {
-            testFrame.ColorScheme = testFrame.ColorScheme with { Normal = new (testFrame.ColorScheme.Normal.Foreground, e.CurrentValue) };
+            testFrame.SetScheme (testFrame.GetScheme () with { Normal = new (testFrame.GetAttributeForRole (VisualRole.Normal).Foreground, e.CurrentValue) });
         }
     }
 
@@ -236,7 +236,7 @@ private View CreateOverlappedView (int id, Pos x, Pos y)
             Height = Dim.Auto (),
             Width = Dim.Auto (),
             Title = $"Overlapped{id} _{GetNextHotKey ()}",
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "TopLevel",
             Id = $"Overlapped{id}",
             ShadowStyle = ShadowStyle.Transparent,
             BorderStyle = LineStyle.Double,
diff --git a/Examples/UICatalog/Scenarios/NumericUpDownDemo.cs b/Examples/UICatalog/Scenarios/NumericUpDownDemo.cs
index dda4105e95..e959ec9b9e 100644
--- a/Examples/UICatalog/Scenarios/NumericUpDownDemo.cs
+++ b/Examples/UICatalog/Scenarios/NumericUpDownDemo.cs
@@ -128,16 +128,16 @@ void ValuedOnAccept (object? sender, EventArgs e)
                         _numericUpDown.Value = (T)Convert.ChangeType (_value.Text, typeof (T));
                     }
 
-                    _value.ColorScheme = SuperView!.ColorScheme;
+                    _value.SetScheme (SuperView!.GetScheme ());
 
                 }
                 catch (System.FormatException)
                 {
-                    _value.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _value.SchemeName = "Error";
                 }
                 catch (InvalidCastException)
                 {
-                    _value.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _value.SchemeName = "Error";
                 }
                 finally
                 {
@@ -176,16 +176,16 @@ void FormatOnAccept (object? o, EventArgs eventArgs)
                     _ = string.Format (_format.Text, _value);
                     _numericUpDown.Format = _format.Text;
 
-                    _format.ColorScheme = SuperView!.ColorScheme;
+                    _format.SetScheme (SuperView!.GetScheme ());
 
                 }
                 catch (System.FormatException)
                 {
-                    _format.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _format.SchemeName = "Error";
                 }
                 catch (InvalidCastException)
                 {
-                    _format.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _format.SchemeName = "Error";
                 }
                 finally
                 {
@@ -231,16 +231,16 @@ void IncrementOnAccept (object? o, EventArgs eventArgs)
                         _numericUpDown.Increment = (T)Convert.ChangeType (_increment.Text, typeof (T));
                     }
 
-                    _increment.ColorScheme = SuperView!.ColorScheme;
+                    _increment.SetScheme (SuperView!.GetScheme ());
 
                 }
                 catch (System.FormatException)
                 {
-                    _increment.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _increment.SchemeName = "Error";
                 }
                 catch (InvalidCastException)
                 {
-                    _increment.ColorScheme = Colors.ColorSchemes ["Error"];
+                    _increment.SchemeName = "Error";
                 }
                 finally
                 {
diff --git a/Examples/UICatalog/Scenarios/PosAlignDemo.cs b/Examples/UICatalog/Scenarios/PosAlignDemo.cs
index 59eedc6d2e..49ea4c082c 100644
--- a/Examples/UICatalog/Scenarios/PosAlignDemo.cs
+++ b/Examples/UICatalog/Scenarios/PosAlignDemo.cs
@@ -25,9 +25,9 @@ public override void Main ()
             Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()} - {GetDescription ()}"
         };
 
-        SetupControls (appWindow, Dimension.Width, Colors.ColorSchemes ["TopLevel"]);
+        SetupControls (appWindow, Dimension.Width, Schemes.Toplevel);
 
-        SetupControls (appWindow, Dimension.Height, Colors.ColorSchemes ["Error"]);
+        SetupControls (appWindow, Dimension.Height, Schemes.Error);
 
         Setup3By3Grid (appWindow);
 
@@ -39,12 +39,12 @@ public override void Main ()
         Application.Shutdown ();
     }
 
-    private void SetupControls (Window appWindow, Dimension dimension, ColorScheme colorScheme)
+    private void SetupControls (Window appWindow, Dimension dimension, Schemes scheme)
     {
         RadioGroup alignRadioGroup = new ()
         {
             RadioLabels = Enum.GetNames<Alignment> (),
-            ColorScheme = colorScheme
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
         };
 
         if (dimension == Dimension.Width)
@@ -81,7 +81,7 @@ private void SetupControls (Window appWindow, Dimension dimension, ColorScheme c
 
         CheckBox endToStartCheckBox = new ()
         {
-            ColorScheme = colorScheme,
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
             Text = "EndToStart"
         };
 
@@ -119,7 +119,7 @@ private void SetupControls (Window appWindow, Dimension dimension, ColorScheme c
 
         CheckBox ignoreFirstOrLast = new ()
         {
-            ColorScheme = colorScheme,
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
             Text = "IgnoreFirstOrLast"
         };
 
@@ -157,7 +157,7 @@ private void SetupControls (Window appWindow, Dimension dimension, ColorScheme c
 
         CheckBox addSpacesBetweenItems = new ()
         {
-            ColorScheme = colorScheme,
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
             Text = "AddSpaceBetweenItems"
         };
 
@@ -196,7 +196,7 @@ private void SetupControls (Window appWindow, Dimension dimension, ColorScheme c
 
         CheckBox margin = new ()
         {
-            ColorScheme = colorScheme,
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
             Text = "Margin"
         };
 
@@ -240,7 +240,7 @@ private void SetupControls (Window appWindow, Dimension dimension, ColorScheme c
         {
             Width = 9,
             Title = "Added",
-            ColorScheme = colorScheme,
+            SchemeName = SchemeManager.SchemesToSchemeName (scheme),
             BorderStyle = LineStyle.None,
             Value = addedViews.Count
         };
@@ -353,7 +353,7 @@ private void Setup3By3Grid (View appWindow)
             Height = Dim.Percent (40)
         };
         container.Padding.Thickness = new (8, 1, 0, 0);
-        container.Padding.ColorScheme = Colors.ColorSchemes ["error"];
+        container.Padding.SchemeName = "Error";
 
         Aligner widthAligner = new () { AlignmentModes = AlignmentModes.StartToEnd };
 
diff --git a/Examples/UICatalog/Scenarios/Progress.cs b/Examples/UICatalog/Scenarios/Progress.cs
index ebb643ac3d..ff72c92cd2 100644
--- a/Examples/UICatalog/Scenarios/Progress.cs
+++ b/Examples/UICatalog/Scenarios/Progress.cs
@@ -175,7 +175,7 @@ private class ProgressDemo : FrameView
 
         internal ProgressDemo ()
         {
-            ColorScheme = Colors.ColorSchemes ["Dialog"];
+            SchemeName = "Dialog";
 
             LeftFrame = new FrameView
             {
@@ -214,7 +214,7 @@ internal ProgressDemo ()
                 Width = Dim.Fill () - 1,
                 Height = 1,
                 Fraction = 0.25F,
-                ColorScheme = Colors.ColorSchemes ["Error"]
+                SchemeName = "Error"
             };
             Add (ActivityProgressBar);
 
@@ -233,7 +233,7 @@ internal ProgressDemo ()
                 Y = Pos.Bottom (ActivityProgressBar) + 1,
                 Width = Dim.Fill () - Spinner.Width,
                 Height = 1,
-                ColorScheme = Colors.ColorSchemes ["Error"]
+                SchemeName = "Error"
             };
             Add (PulseProgressBar);
 
diff --git a/Examples/UICatalog/Scenarios/ProgressBarStyles.cs b/Examples/UICatalog/Scenarios/ProgressBarStyles.cs
index f5e002669a..0b020661a3 100644
--- a/Examples/UICatalog/Scenarios/ProgressBarStyles.cs
+++ b/Examples/UICatalog/Scenarios/ProgressBarStyles.cs
@@ -78,22 +78,23 @@ public override void Main ()
                                     {
                                         if (!LineDrawing.PromptForColor (
                                                                          fgColorPickerBtn.Text,
-                                                                         editor.ViewToEdit.ColorScheme.HotNormal.Foreground,
+                                                                         editor.ViewToEdit!.GetAttributeForRole (VisualRole.Normal).Foreground,
                                                                          out var newColor
                                                                         ))
                                         {
                                             return;
                                         }
 
-                                        var cs = new ColorScheme (editor.ViewToEdit.ColorScheme)
+                                        var cs = new Scheme (editor.ViewToEdit.GetScheme ())
                                         {
-                                            HotNormal = new Attribute (
+                                            Active = new Attribute (
                                                                        newColor,
-                                                                       editor.ViewToEdit.ColorScheme.HotNormal
-                                                                             .Background
+                                                                       editor.ViewToEdit.GetAttributeForRole (VisualRole.Active)
+                                                                             .Background,
+                                                                          editor.ViewToEdit.GetAttributeForRole (VisualRole.Active).Style
                                                                       )
                                         };
-                                        editor.ViewToEdit.ColorScheme = cs;
+                                        editor.ViewToEdit.SetScheme (cs);
                                     };
 
         var bgColorPickerBtn = new Button
@@ -108,22 +109,23 @@ out var newColor
                                     {
                                         if (!LineDrawing.PromptForColor (
                                                                          fgColorPickerBtn.Text,
-                                                                         editor.ViewToEdit.ColorScheme.HotNormal.Background
+                                                                         editor.ViewToEdit!.GetAttributeForRole (VisualRole.Active)
+                                                                               .Background
                                                                         , out var newColor))
 
                                         {
                                             return;
                                         }
 
-                                        var cs = new ColorScheme (editor.ViewToEdit.ColorScheme)
+                                        var cs = new Scheme (editor.ViewToEdit.GetScheme ())
                                         {
-                                            HotNormal = new Attribute (
-                                                                       editor.ViewToEdit.ColorScheme.HotNormal
-                                                                             .Foreground,
-                                                                       newColor
-                                                                      )
+                                            Active = new Attribute (
+                                                                    editor.ViewToEdit!.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                    newColor,
+                                                                    editor.ViewToEdit!.GetAttributeForRole (VisualRole.Normal).Style
+                                                                   )
                                         };
-                                        editor.ViewToEdit.ColorScheme = cs;
+                                        editor.ViewToEdit.SetScheme (cs);
                                     };
 
         #endregion
@@ -210,7 +212,7 @@ out var newColor
         {
             X = Pos.Center (),
             Y = Pos.Bottom (continuousPB),
-            Text = "BidirectionalMarquee", 
+            Text = "BidirectionalMarquee",
             CheckedState = CheckState.Checked
         };
         container.Add (ckbBidirectional);
diff --git a/Examples/UICatalog/Scenarios/RegionScenario.cs b/Examples/UICatalog/Scenarios/RegionScenario.cs
index 2eb64d945d..16d4878465 100644
--- a/Examples/UICatalog/Scenarios/RegionScenario.cs
+++ b/Examples/UICatalog/Scenarios/RegionScenario.cs
@@ -37,7 +37,7 @@ public override void Main ()
 
         var tools = new ToolsView { Title = "Tools", X = Pos.AnchorEnd (), Y = 2 };
 
-        tools.CurrentAttribute = app.ColorScheme!.HotNormal;
+        tools.CurrentAttribute = app.GetAttributeForRole (VisualRole.HotNormal);
 
         tools.SetStyle += b =>
                           {
@@ -123,7 +123,7 @@ public override void Main ()
                                                                     app.LineCanvas,
                                                                     LineStyle.Dashed,
                                                                     new (
-                                                                         tools.CurrentAttribute!.Value.Foreground.GetHighlightColor (),
+                                                                         tools.CurrentAttribute!.Value.Foreground.GetBrighterColor (),
                                                                          tools.CurrentAttribute!.Value.Background));
                                   }
                               };
@@ -204,7 +204,7 @@ public override void BeginInit ()
         _stylePicker.Border!.Thickness = new (0, 1, 0, 0);
         _stylePicker.Title = "Draw Style";
 
-        _stylePicker.SelectedItemChanged += (s, a) => { SetStyle?.Invoke ((LineStyle)a.SelectedItem); };
+        _stylePicker.SelectedItemChanged += (s, a) => { SetStyle?.Invoke ((LineStyle)a.SelectedItem!); };
         _stylePicker.SelectedItem = (int)RegionDrawStyles.FillOnly;
 
         _regionOpSelector = new ()
@@ -245,7 +245,7 @@ public RegionOpSelector ()
             Y = 0,
             RadioLabels = Enum.GetNames<RegionOp> ().Select (n => n = "_" + n).ToArray ()
         };
-        _radioGroup.SelectedItemChanged += (s, a) => { SelectedItemChanged?.Invoke (this, (RegionOp)a.SelectedItem); };
+        _radioGroup.SelectedItemChanged += (s, a) => { SelectedItemChanged?.Invoke (this, (RegionOp)a.SelectedItem!); };
         Add (_radioGroup);
     }
 
@@ -301,8 +301,8 @@ protected override bool OnDrawingContent ()
         Color fg = Value?.Foreground ?? Color.Black;
         Color bg = Value?.Background ?? Color.Black;
 
-        bool isTransparentFg = fg == GetNormalColor ().Background;
-        bool isTransparentBg = bg == GetNormalColor ().Background;
+        bool isTransparentFg = fg == GetAttributeForRole (VisualRole.Normal).Background;
+        bool isTransparentBg = bg == GetAttributeForRole (VisualRole.Normal).Background;
 
         SetAttribute (new (fg, isTransparentFg ? Color.Gray : fg));
 
diff --git a/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs b/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
index 8450d1c66a..9df913bf97 100644
--- a/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
+++ b/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs
@@ -75,7 +75,7 @@ public override void Main ()
 
         _label = new Label
         {
-            X = Pos.Center (), Y = 1, ColorScheme = new ColorScheme { Normal = Colors.ColorSchemes ["Base"].Focus }
+            X = Pos.Center (), Y = 1,
         };
         _text = new TextField { X = Pos.Center (), Y = 3, Width = 20 };
         _button = new Button { X = Pos.Center (), Y = 5 };
diff --git a/Examples/UICatalog/Scenarios/ScrollBarDemo.cs b/Examples/UICatalog/Scenarios/ScrollBarDemo.cs
index 8db773e185..ee7ee50d3b 100644
--- a/Examples/UICatalog/Scenarios/ScrollBarDemo.cs
+++ b/Examples/UICatalog/Scenarios/ScrollBarDemo.cs
@@ -25,7 +25,7 @@ public override void Main ()
             X = 0,
             Width = 75,
             Height = 25 + 4,
-            ColorScheme = Colors.ColorSchemes ["Base"],
+            SchemeName = "Base",
             Arrangement = ViewArrangement.Resizable
         };
         demoFrame!.Padding!.Thickness = new (1);
@@ -46,7 +46,7 @@ public override void Main ()
             X = Pos.AnchorEnd (),
             Width = 5,
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
         };
 
         demoFrame.Add (controlledList);
diff --git a/Examples/UICatalog/Scenarios/Scrolling.cs b/Examples/UICatalog/Scenarios/Scrolling.cs
index 1ff83a96b5..40ad831113 100644
--- a/Examples/UICatalog/Scenarios/Scrolling.cs
+++ b/Examples/UICatalog/Scenarios/Scrolling.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Terminal.Gui;
 
 namespace UICatalog.Scenarios;
@@ -21,13 +22,13 @@ public override void Main ()
         var label = new Label { X = 0, Y = 0 };
         app.Add (label);
 
-        var demoView = new DemoView
+        var demoView = new AllViewsView
         {
             Id = "demoView",
             X = 2,
             Y = Pos.Bottom (label) + 1,
-            Width = 60,
-            Height = 20
+            Width = Dim.Fill (4),
+            Height = Dim.Fill (4)
         };
 
         label.Text =
@@ -91,35 +92,17 @@ public override void Main ()
                                                             hCheckBox.CheckedState = args.NewValue ? CheckState.Checked : CheckState.UnChecked;
                                                         };
 
-        var count = 0;
-
-        var mousePos = new Label
+        // Add a progress bar to cause constant redraws
+        var progress = new ProgressBar
         {
-            X = Pos.Right (demoView) + 1,
-            Y = Pos.AnchorEnd (1),
-
-            Width = 50,
-            Text = "Mouse: "
+            X = Pos.Center (), Y = Pos.AnchorEnd (), Width = Dim.Fill ()
         };
-        app.Add (mousePos);
-        Application.MouseEvent += (sender, a) => { mousePos.Text = $"Mouse: ({a.Position}) - {a.Flags} {count++}"; };
-
-        // Add a progress bar to cause constant redraws
-        var progress = new ProgressBar { X = Pos.Right (demoView) + 1, Y = Pos.AnchorEnd (2), Width = 50 };
 
         app.Add (progress);
 
         var pulsing = true;
 
-        bool TimerFn ()
-        {
-            progress.Pulse ();
-
-            return pulsing;
-        }
-
-        Application.AddTimeout (TimeSpan.FromMilliseconds (300), TimerFn);
-
+        app.Initialized += AppOnInitialized;
         app.Unloaded += AppUnloaded;
 
         Application.Run (app);
@@ -129,144 +112,17 @@ bool TimerFn ()
 
         return;
 
-        void AppUnloaded (object sender, EventArgs args) { pulsing = false; }
-    }
-}
-
-public class DemoView : View
-{
-    public DemoView ()
-    {
-        base.ColorScheme = Colors.ColorSchemes ["TopLevel"];
-        CanFocus = true;
-        BorderStyle = LineStyle.Heavy;
-        Arrangement = ViewArrangement.Resizable;
-        Initialized += OnInitialized;
-        HorizontalScrollBar.AutoShow = true;
-        VerticalScrollBar.AutoShow = true;
-    }
-
-    private void OnInitialized (object sender, EventArgs e)
-    {
-        SetContentSize (new (80, 25));
-
-        var rulerView = new View
+        void AppOnInitialized (object sender, EventArgs e)
         {
-            Height = Dim.Fill (),
-            Width = Dim.Fill ()
-        };
-        rulerView.Border!.Thickness = new (1);
-        rulerView.Border.LineStyle = LineStyle.None;
-        rulerView.Border.Diagnostics = ViewDiagnosticFlags.Ruler;
-        rulerView.Border.ColorScheme = Colors.ColorSchemes ["Error"];
+            bool TimerFn ()
+            {
+                progress.Pulse ();
 
-        Add (rulerView);
-
-        var centeredLabel = new Label ()
-        {
-            X = Pos.Center (),
-            Y = Pos.Center (),
-            TextAlignment = Alignment.Center,
-            VerticalTextAlignment = Alignment.Center,
-            Text = $"This label is centred.\nContentSize is {GetContentSize ()}"
-        };
-        Add (centeredLabel);
-
-        var pressMeButton = new Button
-        {
-            X = 1,
-            Y = 1,
-            Text = "Press me!"
-        };
-        pressMeButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
-        Add (pressMeButton);
+                return pulsing;
+            }
 
-        var aLongButton = new Button
-        {
-            X = Pos.Right (pressMeButton),
-            Y = Pos.Bottom (pressMeButton),
-
-            Text = "A very long button. Should be wide enough to demo clipping!"
-        };
-        aLongButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
-        Add (aLongButton);
-
-        Add (
-             new TextField
-             {
-                 X = Pos.Left (pressMeButton),
-                 Y = Pos.Bottom (aLongButton) + 1,
-                 Width = 50,
-                 ColorScheme = Colors.ColorSchemes ["Dialog"],
-                 Text = "This is a test of..."
-             }
-            );
-
-        Add (
-             new TextField
-             {
-                 X = Pos.Left (pressMeButton),
-                 Y = Pos.Bottom (aLongButton) + 3,
-                 Width = 50,
-                 ColorScheme = Colors.ColorSchemes ["Dialog"],
-                 Text = "... the emergency broadcast system."
-             }
-            );
-
-        Add (
-             new TextField
-             {
-                 X = Pos.Left (pressMeButton),
-                 Y = 40,
-                 Width = 50,
-                 ColorScheme = Colors.ColorSchemes ["Error"],
-                 Text = "Last line - Beyond content area @ Y = 40"
-             }
-            );
-
-        // Demonstrate AnchorEnd - Button is anchored to bottom/right
-        var anchorButton = new Button
-        {
-            X = Pos.AnchorEnd (),
-            Y = Pos.AnchorEnd (),
-            Text = "Bottom Right"
-        };
-
-        anchorButton.Accepting += (s, e) =>
-                                  {
-                                      // This demonstrates how to have a dynamically sized button
-                                      // Each time the button is clicked the button's text gets longer
-                                      anchorButton.Text += "!";
-                                  };
-        Add (anchorButton);
-    }
-
-    protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
-    {
-        if (mouseEvent.Flags == MouseFlags.WheeledDown)
-        {
-            ScrollVertical (1);
-            return mouseEvent.Handled = true;
-        }
-
-        if (mouseEvent.Flags == MouseFlags.WheeledUp)
-        {
-            ScrollVertical (-1);
-            return mouseEvent.Handled = true;
-        }
-
-        if (mouseEvent.Flags == MouseFlags.WheeledRight)
-        {
-            ScrollHorizontal (1);
-            return mouseEvent.Handled = true;
-        }
-
-        if (mouseEvent.Flags == MouseFlags.WheeledLeft)
-        {
-            ScrollHorizontal (-1);
-            return mouseEvent.Handled = true;
+            Application.AddTimeout (TimeSpan.FromMilliseconds (200), TimerFn);
         }
-
-        return false;
+        void AppUnloaded (object sender, EventArgs args) { pulsing = false; }
     }
-}
+}
\ No newline at end of file
diff --git a/Examples/UICatalog/Scenarios/ShadowStyles.cs b/Examples/UICatalog/Scenarios/ShadowStyles.cs
index 7552c9937a..930d894d2c 100644
--- a/Examples/UICatalog/Scenarios/ShadowStyles.cs
+++ b/Examples/UICatalog/Scenarios/ShadowStyles.cs
@@ -18,12 +18,14 @@ public override void Main ()
 
         Window app = new ()
         {
+            Id = "app",
             Title = GetQuitKeyAndName ()
         };
 
 
         var editor = new AdornmentsEditor ()
         {
+            Id = "editor",
             AutoSelectViewToEdit = true,
             ShowViewIdentifier = true,
         };
@@ -31,8 +33,10 @@ public override void Main ()
 
         app.Add (editor);
 
-        Window win = new ()
+        Window shadowWindow = new ()
         {
+
+            Id = "shadowWindow",
             X = Pos.Right (editor),
             Y = 0,
             Width = Dim.Percent (30),
@@ -51,20 +55,37 @@ public override void Main ()
 
         var buttonInWin = new Button
         {
+            Id = "buttonInWin",
             X = Pos.Center (),
             Y = Pos.Center (), Text = "Button in Window",
             ShadowStyle = ShadowStyle.Opaque
         };
-        win.Add (buttonInWin);
-        app.Add (win);
+        shadowWindow.Add (buttonInWin);
+        app.Add (shadowWindow);
 
         var button = new Button
         {
+            Id = "button",
             X = Pos.Right (editor) + 10,
             Y = Pos.Center (), Text = "Button",
             ShadowStyle = ShadowStyle.Opaque
         };
-        app.Add (button);
+
+        ColorPicker colorPicker = new ()
+        {
+            Title = "ColorPicker to illustrate highlight (currently broken)",
+            BorderStyle = LineStyle.Dotted,
+            Id = "colorPicker16",
+            X = Pos.Center (),
+            Y = Pos.AnchorEnd (),
+            Width = Dim.Percent(80),
+        };
+        colorPicker.ColorChanged += (sender, args) =>
+                                    {
+                                        var normal = app.GetScheme ().Normal;
+                                        app.SetScheme (app.GetScheme() with {Normal = new Attribute(normal.Foreground, args.CurrentValue)});
+                                    };
+        app.Add (button, colorPicker);
 
         editor.AutoSelectViewToEdit = true;
         editor.AutoSelectSuperView = app;
diff --git a/Examples/UICatalog/Scenarios/Shortcuts.cs b/Examples/UICatalog/Scenarios/Shortcuts.cs
index 06bde96ac7..5ba8340d2b 100644
--- a/Examples/UICatalog/Scenarios/Shortcuts.cs
+++ b/Examples/UICatalog/Scenarios/Shortcuts.cs
@@ -1,10 +1,6 @@
 #nullable enable
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Timers;
 using Terminal.Gui;
 using Timer = System.Timers.Timer;
 
@@ -41,13 +37,21 @@ private void App_Loaded (object? sender, EventArgs e)
             X = Pos.AnchorEnd (),
             Y = 0,
             Height = Dim.Fill (4),
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (eventSource),
             BorderStyle = LineStyle.Double,
             Title = "E_vents"
         };
-        eventLog.Width = Dim.Func (() => Math.Min (Application.Top.Viewport.Width / 2, eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
-        eventLog.Width = Dim.Func (() => Math.Min (eventLog.SuperView!.Viewport.Width / 2, eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
+
+        eventLog.Width = Dim.Func (
+                                   () => Math.Min (
+                                                   Application.Top.Viewport.Width / 2,
+                                                   eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
+
+        eventLog.Width = Dim.Func (
+                                   () => Math.Min (
+                                                   eventLog.SuperView!.Viewport.Width / 2,
+                                                   eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
         Application.Top.Add (eventLog);
 
         var alignKeysShortcut = new Shortcut
@@ -61,40 +65,47 @@ private void App_Loaded (object? sender, EventArgs e)
             {
                 Text = "_Align Keys",
                 CanFocus = false,
-                HighlightStyle = HighlightStyle.None,
+                HighlightStyle = HighlightStyle.None
             },
-            Key = Key.F5.WithCtrl.WithAlt.WithShift,
+            Key = Key.F5.WithCtrl.WithAlt.WithShift
         };
 
         // ((CheckBox)vShortcut3.CommandView).CheckedStateChanging += (_, args) =>
         ((CheckBox)alignKeysShortcut.CommandView).CheckedStateChanging += (s, e) =>
-        {
-            if (alignKeysShortcut.CommandView is CheckBox cb)
-            {
-                eventSource.Add ($"{alignKeysShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
-                eventLog.MoveDown ();
-
-                var max = 0;
-                IEnumerable<View> toAlign = Application.Top.SubViews.Where (v => v is Shortcut { Width: not DimAbsolute });
-                IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
-
-                if (e.NewValue == CheckState.Checked)
-                {
-                    max = (from Shortcut? peer in enumerable select peer.Key.ToString ().GetColumns ()).Prepend (max).Max ();
-                    foreach (var view in enumerable)
-                    {
-                        var peer = (Shortcut)view;
-                        max = Math.Max (max, peer.KeyView.Text.GetColumns ());
-                    }
-                }
-
-                foreach (View view in enumerable)
-                {
-                    var peer = (Shortcut)view;
-                    peer.MinimumKeyTextSize = max;
-                }
-            }
-        };
+                                                                          {
+                                                                              if (alignKeysShortcut.CommandView is CheckBox cb)
+                                                                              {
+                                                                                  eventSource.Add (
+                                                                                                   $"{alignKeysShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
+                                                                                  eventLog.MoveDown ();
+
+                                                                                  var max = 0;
+
+                                                                                  IEnumerable<View> toAlign =
+                                                                                      Application.Top.SubViews.Where (
+                                                                                       v => v is Shortcut { Width: not DimAbsolute });
+                                                                                  IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
+
+                                                                                  if (e.NewValue == CheckState.Checked)
+                                                                                  {
+                                                                                      max = (from Shortcut? peer in enumerable
+                                                                                             select peer.Key.ToString ().GetColumns ()).Prepend (max)
+                                                                                          .Max ();
+
+                                                                                      foreach (View view in enumerable)
+                                                                                      {
+                                                                                          var peer = (Shortcut)view;
+                                                                                          max = Math.Max (max, peer.KeyView.Text.GetColumns ());
+                                                                                      }
+                                                                                  }
+
+                                                                                  foreach (View view in enumerable)
+                                                                                  {
+                                                                                      var peer = (Shortcut)view;
+                                                                                      peer.MinimumKeyTextSize = max;
+                                                                                  }
+                                                                              }
+                                                                          };
         Application.Top.Add (alignKeysShortcut);
 
         var commandFirstShortcut = new Shortcut
@@ -108,37 +119,42 @@ private void App_Loaded (object? sender, EventArgs e)
             {
                 Text = "Command _First",
                 CanFocus = false,
-                HighlightStyle = HighlightStyle.None,
+                HighlightStyle = HighlightStyle.None
             },
-            Key = Key.F.WithCtrl,
+            Key = Key.F.WithCtrl
         };
+
         ((CheckBox)commandFirstShortcut.CommandView).CheckedState =
             commandFirstShortcut.AlignmentModes.HasFlag (AlignmentModes.EndToStart) ? CheckState.UnChecked : CheckState.Checked;
 
         ((CheckBox)commandFirstShortcut.CommandView).CheckedStateChanging += (s, e) =>
-                                                                         {
-                                                                             if (commandFirstShortcut.CommandView is CheckBox cb)
                                                                              {
-                                                                                 eventSource.Add ($"{commandFirstShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
-                                                                                 eventLog.MoveDown ();
+                                                                                 if (commandFirstShortcut.CommandView is CheckBox cb)
+                                                                                 {
+                                                                                     eventSource.Add (
+                                                                                                      $"{commandFirstShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
+                                                                                     eventLog.MoveDown ();
 
-                                                                                 IEnumerable<View> toAlign = Application.Top.SubViews.Where (v => v is Shortcut { Width: not DimAbsolute });
-                                                                                 IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
+                                                                                     IEnumerable<View> toAlign =
+                                                                                         Application.Top.SubViews.Where (
+                                                                                          v => v is Shortcut { Width: not DimAbsolute });
+                                                                                     IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
 
-                                                                                 foreach (var view in enumerable)
-                                                                                 {
-                                                                                     var peer = (Shortcut)view;
-                                                                                     if (e.NewValue == CheckState.Checked)
-                                                                                     {
-                                                                                         peer.AlignmentModes &= ~AlignmentModes.EndToStart;
-                                                                                     }
-                                                                                     else
+                                                                                     foreach (View view in enumerable)
                                                                                      {
-                                                                                         peer.AlignmentModes |= AlignmentModes.EndToStart;
+                                                                                         var peer = (Shortcut)view;
+
+                                                                                         if (e.NewValue == CheckState.Checked)
+                                                                                         {
+                                                                                             peer.AlignmentModes &= ~AlignmentModes.EndToStart;
+                                                                                         }
+                                                                                         else
+                                                                                         {
+                                                                                             peer.AlignmentModes |= AlignmentModes.EndToStart;
+                                                                                         }
                                                                                      }
                                                                                  }
-                                                                             }
-                                                                         };
+                                                                             };
 
         Application.Top.Add (commandFirstShortcut);
 
@@ -150,26 +166,27 @@ private void App_Loaded (object? sender, EventArgs e)
             Width = Dim.Fill ()! - Dim.Width (eventLog),
             Key = Key.F4,
             HelpText = "Changes all Command.CanFocus",
-            CommandView = new CheckBox { Text = "_CanFocus" },
+            CommandView = new CheckBox { Text = "_CanFocus" }
         };
 
         ((CheckBox)canFocusShortcut.CommandView).CheckedStateChanging += (s, e) =>
-        {
-            if (canFocusShortcut.CommandView is CheckBox cb)
-            {
-                eventSource.Add ($"Toggle: {cb.Text}");
-                eventLog.MoveDown ();
-                //cb.CanFocus = e.NewValue == CheckState.Checked;
-
-                foreach (Shortcut peer in Application.Top.SubViews.Where (v => v is Shortcut)!)
-                {
-                    if (peer.CanFocus)
-                    {
-                        peer.CommandView.CanFocus = e.NewValue == CheckState.Checked;
-                    }
-                }
-            }
-        };
+                                                                         {
+                                                                             if (canFocusShortcut.CommandView is CheckBox cb)
+                                                                             {
+                                                                                 eventSource.Add ($"Toggle: {cb.Text}");
+                                                                                 eventLog.MoveDown ();
+
+                                                                                 //cb.CanFocus = e.NewValue == CheckState.Checked;
+
+                                                                                 foreach (Shortcut peer in Application.Top.SubViews.Where (v => v is Shortcut)!)
+                                                                                 {
+                                                                                     if (peer.CanFocus)
+                                                                                     {
+                                                                                         peer.CommandView.CanFocus = e.NewValue == CheckState.Checked;
+                                                                                     }
+                                                                                 }
+                                                                             }
+                                                                         };
         Application.Top.Add (canFocusShortcut);
 
         var appShortcut = new Shortcut
@@ -181,12 +198,11 @@ private void App_Loaded (object? sender, EventArgs e)
             Title = "A_pp Shortcut",
             Key = Key.F1,
             Text = "Width is DimFill",
-            BindKeyToApplication = true,
+            BindKeyToApplication = true
         };
 
         Application.Top.Add (appShortcut);
 
-
         var buttonShortcut = new Shortcut
         {
             Id = "buttonShortcut",
@@ -200,14 +216,13 @@ private void App_Loaded (object? sender, EventArgs e)
                 ShadowStyle = ShadowStyle.None,
                 HighlightStyle = HighlightStyle.None
             },
-            Key = Key.K,
+            Key = Key.K
         };
         var button = (Button)buttonShortcut.CommandView;
         buttonShortcut.Accepting += Button_Clicked;
 
         Application.Top.Add (buttonShortcut);
 
-
         var radioGroupShortcut = new Shortcut
         {
             Id = "radioGroupShortcut",
@@ -218,8 +233,8 @@ private void App_Loaded (object? sender, EventArgs e)
             CommandView = new RadioGroup
             {
                 Orientation = Orientation.Vertical,
-                RadioLabels = ["O_ne", "T_wo", "Th_ree", "Fo_ur"],
-            },
+                RadioLabels = ["O_ne", "T_wo", "Th_ree", "Fo_ur"]
+            }
         };
 
         ((RadioGroup)radioGroupShortcut.CommandView).SelectedItemChanged += (o, args) =>
@@ -246,21 +261,21 @@ private void App_Loaded (object? sender, EventArgs e)
                 Orientation = Orientation.Horizontal,
                 AllowEmpty = true
             },
-            Key = Key.F5,
+            Key = Key.F5
         };
 
         ((Slider<string>)sliderShortcut.CommandView).Options = [new () { Legend = "A" }, new () { Legend = "B" }, new () { Legend = "C" }];
         ((Slider<string>)sliderShortcut.CommandView).SetOption (0);
 
         ((Slider<string>)sliderShortcut.CommandView).OptionsChanged += (o, args) =>
-        {
-            eventSource.Add ($"OptionsChanged: {o?.GetType ().Name} - {string.Join (",", ((Slider<string>)o!)!.GetSetOptions ())}");
-            eventLog.MoveDown ();
-        };
+                                                                       {
+                                                                           eventSource.Add (
+                                                                                            $"OptionsChanged: {o?.GetType ().Name} - {string.Join (",", ((Slider<string>)o!)!.GetSetOptions ())}");
+                                                                           eventLog.MoveDown ();
+                                                                       };
 
         Application.Top.Add (sliderShortcut);
 
-
         var noCommandShortcut = new Shortcut
         {
             Id = "noCommandShortcut",
@@ -281,12 +296,11 @@ private void App_Loaded (object? sender, EventArgs e)
             Width = Dim.Width (noCommandShortcut),
 
             Title = "No Ke_y",
-            HelpText = "Keyless",
+            HelpText = "Keyless"
         };
 
         Application.Top.Add (noKeyShortcut);
 
-
         var noHelpShortcut = new Shortcut
         {
             Id = "noHelpShortcut",
@@ -295,7 +309,7 @@ private void App_Loaded (object? sender, EventArgs e)
             Width = Dim.Width (noKeyShortcut),
             Key = Key.F6,
             Title = "Not _very much help",
-            HelpText = "",
+            HelpText = ""
         };
 
         Application.Top.Add (noHelpShortcut);
@@ -310,7 +324,7 @@ private void App_Loaded (object? sender, EventArgs e)
             Key = Key.K.WithCtrl,
             Text = "Resize frame",
             BorderStyle = LineStyle.Dotted,
-            Arrangement = ViewArrangement.RightResizable | ViewArrangement.BottomResizable,
+            Arrangement = ViewArrangement.RightResizable | ViewArrangement.BottomResizable
         };
         framedShortcut.Orientation = Orientation.Horizontal;
 
@@ -322,12 +336,12 @@ private void App_Loaded (object? sender, EventArgs e)
 
         if (framedShortcut.CommandView.Margin is { })
         {
-            framedShortcut.CommandView.Margin.ColorScheme = framedShortcut.CommandView.ColorScheme = Colors.ColorSchemes ["Error"];
-            framedShortcut.HelpView.Margin!.ColorScheme = framedShortcut.HelpView.ColorScheme = Colors.ColorSchemes ["Dialog"];
-            framedShortcut.KeyView.Margin!.ColorScheme = framedShortcut.KeyView.ColorScheme = Colors.ColorSchemes ["Menu"];
+            framedShortcut.CommandView.Margin.SchemeName = framedShortcut.CommandView.SchemeName = "Error";
+            framedShortcut.HelpView.Margin!.SchemeName = framedShortcut.HelpView.SchemeName = "Dialog";
+            framedShortcut.KeyView.Margin!.SchemeName = framedShortcut.KeyView.SchemeName = "Menu";
         }
 
-        framedShortcut.ColorScheme = Colors.ColorSchemes ["Toplevel"];
+        framedShortcut.SchemeName = "TopLevel";
         Application.Top.Add (framedShortcut);
 
         // Horizontal
@@ -337,7 +351,7 @@ private void App_Loaded (object? sender, EventArgs e)
             X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
             Y = Pos.AnchorEnd () - 1,
             Key = Key.F7,
-            HelpText = "Horizontal",
+            HelpText = "Horizontal"
         };
 
         progressShortcut.CommandView = new ProgressBar
@@ -355,32 +369,34 @@ private void App_Loaded (object? sender, EventArgs e)
 
         Timer timer = new (10)
         {
-            AutoReset = true,
+            AutoReset = true
         };
+
         timer.Elapsed += (o, args) =>
-        {
-            if (progressShortcut.CommandView is ProgressBar pb)
-            {
-                if (pb.Fraction == 1.0)
-                {
-                    pb.Fraction = 0;
-                }
-                pb.Fraction += 0.01f;
+                         {
+                             if (progressShortcut.CommandView is ProgressBar pb)
+                             {
+                                 if (pb.Fraction == 1.0)
+                                 {
+                                     pb.Fraction = 0;
+                                 }
 
-                Application.Wakeup ();
+                                 pb.Fraction += 0.01f;
 
-                pb.SetNeedsDraw ();
-            }
-        };
+                                 Application.Wakeup ();
+
+                                 pb.SetNeedsDraw ();
+                             }
+                         };
         timer.Start ();
 
         Application.Top.Add (progressShortcut);
 
-        var textField = new TextField ()
+        var textField = new TextField
         {
             Text = "Edit me",
             Width = 10,
-            Height = 1,
+            Height = 1
         };
 
         var textFieldShortcut = new Shortcut
@@ -391,7 +407,7 @@ private void App_Loaded (object? sender, EventArgs e)
             Key = Key.F8,
             HelpText = "TextField",
             CanFocus = true,
-            CommandView = textField,
+            CommandView = textField
         };
         textField.CanFocus = true;
 
@@ -403,13 +419,13 @@ private void App_Loaded (object? sender, EventArgs e)
             X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
             Y = Pos.AnchorEnd (),
             Key = Key.F9,
-            HelpText = "Cycles BG Color",
+            HelpText = "Cycles BG Color"
         };
 
-        var bgColor = new ColorPicker16 ()
+        var bgColor = new ColorPicker16
         {
             BoxHeight = 1,
-            BoxWidth = 1,
+            BoxWidth = 1
         };
 
         bgColorShortcut.Selecting += (o, args) =>
@@ -425,23 +441,28 @@ private void App_Loaded (object? sender, EventArgs e)
 
                                              return;
                                          }
+
                                          bgColor.SelectedColor++;
                                          args.Handled = true;
                                      };
 
         bgColor.ColorChanged += (o, args) =>
-        {
-            if (o is { })
-            {
-                eventSource.Add ($"ColorChanged: {o.GetType ().Name} - {args.CurrentValue}");
-                eventLog.MoveDown ();
-
-                Application.Top.ColorScheme = new ColorScheme (Application.Top.ColorScheme)
-                {
-                    Normal = new (Application.Top!.GetNormalColor ().Foreground, args.CurrentValue),
-                };
-            }
-        };
+                                {
+                                    if (o is { })
+                                    {
+                                        eventSource.Add ($"ColorChanged: {o.GetType ().Name} - {args.CurrentValue}");
+                                        eventLog.MoveDown ();
+
+                                        Application.Top.SetScheme (
+                                                                   new (Application.Top.GetScheme ())
+                                                                   {
+                                                                       Normal = new (
+                                                                                     Application.Top!.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                                     args.CurrentValue,
+                                                                                     Application.Top!.GetAttributeForRole (VisualRole.Normal).Style)
+                                                                   });
+                                    }
+                                };
         bgColorShortcut.CommandView = bgColor;
 
         Application.Top.Add (bgColorShortcut);
@@ -454,59 +475,60 @@ private void App_Loaded (object? sender, EventArgs e)
             Key = Key.Esc,
             BindKeyToApplication = true,
             Title = "Quit",
-            HelpText = "App Scope",
-        };
-        appQuitShortcut.Accepting += (o, args) =>
-        {
-            Application.RequestStop ();
+            HelpText = "App Scope"
         };
+        appQuitShortcut.Accepting += (o, args) => { Application.RequestStop (); };
 
         Application.Top.Add (appQuitShortcut);
 
         foreach (Shortcut shortcut in Application.Top.SubViews.OfType<Shortcut> ())
         {
             shortcut.Selecting += (o, args) =>
-            {
-                if (args.Handled)
-                {
-                    return;
-                }
-                eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
-                eventLog.MoveDown ();
-            };
+                                  {
+                                      if (args.Handled)
+                                      {
+                                          return;
+                                      }
+
+                                      eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                      eventLog.MoveDown ();
+                                  };
 
             shortcut.CommandView.Selecting += (o, args) =>
-            {
-                if (args.Handled)
-                {
-                    return;
-                }
-                eventSource.Add ($"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
-                eventLog.MoveDown ();
-                args.Handled = true;
-            };
+                                              {
+                                                  if (args.Handled)
+                                                  {
+                                                      return;
+                                                  }
+
+                                                  eventSource.Add (
+                                                                   $"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                                  eventLog.MoveDown ();
+                                                  args.Handled = true;
+                                              };
 
             shortcut.Accepting += (o, args) =>
-            {
-                eventSource.Add ($"{shortcut!.Id}.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
-                eventLog.MoveDown ();
-                // We don't want this to exit the Scenario
-                args.Handled = true;
-            };
+                                  {
+                                      eventSource.Add ($"{shortcut!.Id}.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                      eventLog.MoveDown ();
 
-            shortcut.CommandView.Accepting += (o, args) =>
-            {
-                eventSource.Add ($"{shortcut!.Id}.CommandView.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
-                eventLog.MoveDown ();
-            };
+                                      // We don't want this to exit the Scenario
+                                      args.Handled = true;
+                                  };
 
+            shortcut.CommandView.Accepting += (o, args) =>
+                                              {
+                                                  eventSource.Add (
+                                                                   $"{shortcut!.Id}.CommandView.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
+                                                  eventLog.MoveDown ();
+                                              };
         }
     }
 
     private void Button_Clicked (object? sender, CommandEventArgs e)
     {
         e.Handled = true;
-        View? view = sender as View;
+        var view = sender as View;
         MessageBox.Query ("Hi", $"You clicked {view?.Text}", "_Ok");
     }
 }
diff --git a/Examples/UICatalog/Scenarios/SimpleDialog.cs b/Examples/UICatalog/Scenarios/SimpleDialog.cs
deleted file mode 100644
index f9bb198d73..0000000000
--- a/Examples/UICatalog/Scenarios/SimpleDialog.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-#nullable enable
-using Terminal.Gui;
-
-namespace UICatalog.Scenarios;
-
-[ScenarioMetadata ("SimpleDialog", "SimpleDialog ")]
-public sealed class SimpleDialog : Scenario
-{
-    public override void Main ()
-    {
-        // Init
-        Application.Init ();
-
-        // Setup - Create a top-level application window and configure it.
-        Window appWindow = new ()
-        {
-            Title = GetQuitKeyAndName (),
-            BorderStyle = LineStyle.None
-        };
-
-
-        appWindow.DrawingText += (s, e) =>
-                                 {
-                                     appWindow!.FillRect (appWindow!.Viewport, Glyphs.Dot);
-                                     e.Cancel = true;
-                                 };
-
-        Dialog dialog = new () { Id = "dialog", Width = 20, Height = 4, Title = "Dialog" };
-        dialog.Arrangement |= ViewArrangement.Resizable;
-
-        var button = new Button
-        {
-            Id = "button", 
-            X = 0,
-            Y = 0, 
-            NoDecorations = true,
-            NoPadding = true,
-            Text = "A",
-            //WantContinuousButtonPressed = false,
-            HighlightStyle = HighlightStyle.None,
-            ShadowStyle = ShadowStyle.Transparent,
-        };
-
-        button.Accepting += (s, e) =>
-                            {
-                                Application.Run (dialog);
-                                e.Handled = true;
-                            };
-        appWindow.Add (button);
-
-        // Run - Start the application.
-        Application.Run (appWindow);
-        dialog.Dispose ();
-        appWindow.Dispose ();
-
-        // Shutdown - Calling Application.Shutdown is required.
-        Application.Shutdown ();
-    }
-}
diff --git a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
index cab60495ca..7b676b7178 100644
--- a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
+++ b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs
@@ -278,7 +278,7 @@ bool Close ()
             Y = 1;
             Height = Dim.Fill (1);
             Title = $"Worker started at {start}.{start:fff}";
-            ColorScheme = Colors.ColorSchemes ["Base"];
+            SchemeName = "Base";
 
             Add (
                  new ListView
diff --git a/Examples/UICatalog/Scenarios/Sliders.cs b/Examples/UICatalog/Scenarios/Sliders.cs
index 5dc1d212f6..3dcb42c7bd 100644
--- a/Examples/UICatalog/Scenarios/Sliders.cs
+++ b/Examples/UICatalog/Scenarios/Sliders.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.Tracing;
-using System.Linq;
+using System.Collections.ObjectModel;
 using System.Text;
 using Terminal.Gui;
 
@@ -28,6 +24,7 @@ public void MakeSliders (View v, List<object> options)
                 Type = type,
                 AllowEmpty = true
             };
+
             //view.Padding.Thickness = new (0,1,0,0);
             v.Add (view);
             prev = view;
@@ -90,24 +87,21 @@ public void MakeSliders (View v, List<object> options)
                                 {
                                     if (single.Orientation == Orientation.Horizontal)
                                     {
-                                        single.Style.SpaceChar = new Cell { Rune = Glyphs.HLine };
-                                        single.Style.OptionChar = new Cell { Rune = Glyphs.HLine };
+                                        single.Style.SpaceChar = new () { Rune = Glyphs.HLine };
+                                        single.Style.OptionChar = new () { Rune = Glyphs.HLine };
                                     }
                                     else
                                     {
-                                        single.Style.SpaceChar = new Cell { Rune = Glyphs.VLine };
-                                        single.Style.OptionChar = new Cell { Rune = Glyphs.VLine };
+                                        single.Style.SpaceChar = new () { Rune = Glyphs.VLine };
+                                        single.Style.OptionChar = new () { Rune = Glyphs.VLine };
                                     }
                                 };
-        single.Style.SetChar = new Cell { Rune = Glyphs.ContinuousMeterSegment };
-        single.Style.DragChar = new Cell { Rune = Glyphs.ContinuousMeterSegment };
+        single.Style.SetChar = new () { Rune = Glyphs.ContinuousMeterSegment };
+        single.Style.DragChar = new () { Rune = Glyphs.ContinuousMeterSegment };
 
         v.Add (single);
 
-        single.OptionsChanged += (s, e) =>
-                                 {
-                                     single.Title = $"_Continuous {e.Options.FirstOrDefault ().Key}";
-                                 };
+        single.OptionsChanged += (s, e) => { single.Title = $"_Continuous {e.Options.FirstOrDefault ().Key}"; };
 
         List<object> oneOption = new () { "The Only Option" };
 
@@ -134,7 +128,7 @@ public override void Main ()
 
         MakeSliders (
                      app,
-                     new List<object>
+                     new ()
                      {
                          500,
                          1000,
@@ -156,7 +150,7 @@ public override void Main ()
             Y = 0,
             Width = Dim.Fill (),
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Dialog"]
+            SchemeName = "Dialog"
         };
 
         app.Add (configView);
@@ -177,7 +171,7 @@ public override void Main ()
         optionsSlider.Style.SetChar = optionsSlider.Style.SetChar with { Attribute = new Attribute (Color.BrightGreen, Color.Black) };
         optionsSlider.Style.LegendAttributes.SetAttribute = new Attribute (Color.Green, Color.Black);
 
-        optionsSlider.Options = new List<SliderOption<string>>
+        optionsSlider.Options = new ()
         {
             new () { Legend = "Legends" },
             new () { Legend = "RangeAllowSingle" },
@@ -188,38 +182,38 @@ public override void Main ()
         configView.Add (optionsSlider);
 
         optionsSlider.OptionsChanged += (sender, e) =>
-                                 {
-                                     foreach (Slider s in app.SubViews.OfType<Slider> ())
-                                     {
-                                         s.ShowLegends = e.Options.ContainsKey (0);
-                                         s.RangeAllowSingle = e.Options.ContainsKey (1);
-                                         s.ShowEndSpacing = e.Options.ContainsKey (2);
-
-                                         if (e.Options.ContainsKey (3))
-                                         {
-                                             s.Width = Dim.Auto (DimAutoStyle.Content);
-                                             s.Height = Dim.Auto (DimAutoStyle.Content);
-                                         }
-                                         else
-                                         {
-                                             if (s.Orientation == Orientation.Horizontal)
-                                             {
-                                                 s.Width = Dim.Percent (50);
-
-                                                 int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
-                                                             ? s.Options.Max (o => o.Legend.Length) + 3
-                                                             : 4;
-                                                 s.Height = h;
-                                             }
-                                             else
-                                             {
-                                                 int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
-                                                 s.Width = w;
-                                                 s.Height = Dim.Fill ();
-                                             }
-                                         }
-                                     }
-                                 };
+                                        {
+                                            foreach (Slider s in app.SubViews.OfType<Slider> ())
+                                            {
+                                                s.ShowLegends = e.Options.ContainsKey (0);
+                                                s.RangeAllowSingle = e.Options.ContainsKey (1);
+                                                s.ShowEndSpacing = e.Options.ContainsKey (2);
+
+                                                if (e.Options.ContainsKey (3))
+                                                {
+                                                    s.Width = Dim.Auto (DimAutoStyle.Content);
+                                                    s.Height = Dim.Auto (DimAutoStyle.Content);
+                                                }
+                                                else
+                                                {
+                                                    if (s.Orientation == Orientation.Horizontal)
+                                                    {
+                                                        s.Width = Dim.Percent (50);
+
+                                                        int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
+                                                                    ? s.Options.Max (o => o.Legend.Length) + 3
+                                                                    : 4;
+                                                        s.Height = h;
+                                                    }
+                                                    else
+                                                    {
+                                                        int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
+                                                        s.Width = w;
+                                                        s.Height = Dim.Fill ();
+                                                    }
+                                                }
+                                            }
+                                        };
         optionsSlider.SetOption (0); // Legends
         optionsSlider.SetOption (1); // RangeAllowSingle
         optionsSlider.SetOption (3); // DimAuto
@@ -232,17 +226,17 @@ public override void Main ()
         };
 
         dimAutoUsesMin.CheckedStateChanging += (sender, e) =>
-                                  {
-                                      foreach (Slider s in app.SubViews.OfType<Slider> ())
-                                      {
-                                          s.UseMinimumSize = !s.UseMinimumSize;
-                                      }
-                                  };
+                                               {
+                                                   foreach (Slider s in app.SubViews.OfType<Slider> ())
+                                                   {
+                                                       s.UseMinimumSize = !s.UseMinimumSize;
+                                                   }
+                                               };
         configView.Add (dimAutoUsesMin);
 
         #region Slider Orientation Slider
 
-        Slider<string> orientationSlider = new (new List<string> { "Horizontal", "Vertical" })
+        Slider<string> orientationSlider = new (new () { "Horizontal", "Vertical" })
         {
             Title = "Slider Orientation",
             X = 0,
@@ -255,79 +249,79 @@ public override void Main ()
         configView.Add (orientationSlider);
 
         orientationSlider.OptionsChanged += (sender, e) =>
+                                            {
+                                                View prev = null;
+
+                                                foreach (Slider s in app.SubViews.OfType<Slider> ())
+                                                {
+                                                    if (e.Options.ContainsKey (0))
                                                     {
-                                                        View prev = null;
+                                                        s.Orientation = Orientation.Horizontal;
+
+                                                        s.Style.SpaceChar = new () { Rune = Glyphs.HLine };
 
-                                                        foreach (Slider s in app.SubViews.OfType<Slider> ())
+                                                        if (prev == null)
                                                         {
-                                                            if (e.Options.ContainsKey (0))
-                                                            {
-                                                                s.Orientation = Orientation.Horizontal;
-
-                                                                s.Style.SpaceChar = new Cell { Rune = Glyphs.HLine };
-
-                                                                if (prev == null)
-                                                                {
-                                                                    s.Y = 0;
-                                                                }
-                                                                else
-                                                                {
-                                                                    s.Y = Pos.Bottom (prev) + 1;
-                                                                }
-
-                                                                s.X = 0;
-                                                                prev = s;
-                                                            }
-                                                            else if (e.Options.ContainsKey (1))
-                                                            {
-                                                                s.Orientation = Orientation.Vertical;
-
-                                                                s.Style.SpaceChar = new Cell { Rune = Glyphs.VLine };
-
-                                                                if (prev == null)
-                                                                {
-                                                                    s.X = 0;
-                                                                }
-                                                                else
-                                                                {
-                                                                    s.X = Pos.Right (prev) + 2;
-                                                                }
-
-                                                                s.Y = 0;
-                                                                prev = s;
-                                                            }
-
-                                                            if (optionsSlider.GetSetOptions ().Contains (3))
-                                                            {
-                                                                s.Width = Dim.Auto (DimAutoStyle.Content);
-                                                                s.Height = Dim.Auto (DimAutoStyle.Content);
-                                                            }
-                                                            else
-                                                            {
-                                                                if (s.Orientation == Orientation.Horizontal)
-                                                                {
-                                                                    s.Width = Dim.Percent (50);
-
-                                                                    int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
-                                                                                ? s.Options.Max (o => o.Legend.Length) + 3
-                                                                                : 4;
-                                                                    s.Height = h;
-                                                                }
-                                                                else
-                                                                {
-                                                                    int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
-                                                                    s.Width = w;
-                                                                    s.Height = Dim.Fill ();
-                                                                }
-                                                            }
+                                                            s.Y = 0;
                                                         }
-                                                    };
+                                                        else
+                                                        {
+                                                            s.Y = Pos.Bottom (prev) + 1;
+                                                        }
+
+                                                        s.X = 0;
+                                                        prev = s;
+                                                    }
+                                                    else if (e.Options.ContainsKey (1))
+                                                    {
+                                                        s.Orientation = Orientation.Vertical;
+
+                                                        s.Style.SpaceChar = new () { Rune = Glyphs.VLine };
+
+                                                        if (prev == null)
+                                                        {
+                                                            s.X = 0;
+                                                        }
+                                                        else
+                                                        {
+                                                            s.X = Pos.Right (prev) + 2;
+                                                        }
+
+                                                        s.Y = 0;
+                                                        prev = s;
+                                                    }
+
+                                                    if (optionsSlider.GetSetOptions ().Contains (3))
+                                                    {
+                                                        s.Width = Dim.Auto (DimAutoStyle.Content);
+                                                        s.Height = Dim.Auto (DimAutoStyle.Content);
+                                                    }
+                                                    else
+                                                    {
+                                                        if (s.Orientation == Orientation.Horizontal)
+                                                        {
+                                                            s.Width = Dim.Percent (50);
+
+                                                            int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
+                                                                        ? s.Options.Max (o => o.Legend.Length) + 3
+                                                                        : 4;
+                                                            s.Height = h;
+                                                        }
+                                                        else
+                                                        {
+                                                            int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
+                                                            s.Width = w;
+                                                            s.Height = Dim.Fill ();
+                                                        }
+                                                    }
+                                                }
+                                            };
 
         #endregion Slider Orientation Slider
 
         #region Legends Orientation Slider
 
-        Slider<string> legendsOrientationSlider = new (new List<string> { "Horizontal", "Vertical" })
+        Slider<string> legendsOrientationSlider = new (new () { "Horizontal", "Vertical" })
         {
             Title = "Legends Orientation",
             X = 0,
@@ -340,48 +334,46 @@ public override void Main ()
         configView.Add (legendsOrientationSlider);
 
         legendsOrientationSlider.OptionsChanged += (sender, e) =>
-                                                     {
-                                                         foreach (Slider s in app.SubViews.OfType<Slider> ())
-                                                         {
-                                                             if (e.Options.ContainsKey (0))
-                                                             {
-                                                                 s.LegendsOrientation = Orientation.Horizontal;
-                                                             }
-                                                             else if (e.Options.ContainsKey (1))
-                                                             {
-                                                                 s.LegendsOrientation = Orientation.Vertical;
-                                                             }
-
-                                                             if (optionsSlider.GetSetOptions ().Contains (3))
-                                                             {
-                                                                 s.Width = Dim.Auto (DimAutoStyle.Content);
-                                                                 s.Height = Dim.Auto (DimAutoStyle.Content);
-                                                             }
-                                                             else
-                                                             {
-                                                                 if (s.Orientation == Orientation.Horizontal)
-                                                                 {
-                                                                     s.Width = Dim.Percent (50);
-
-                                                                     int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
-                                                                                 ? s.Options.Max (o => o.Legend.Length) + 3
-                                                                                 : 4;
-                                                                     s.Height = h;
-                                                                 }
-                                                                 else
-                                                                 {
-                                                                     int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
-                                                                     s.Width = w;
-                                                                     s.Height = Dim.Fill ();
-                                                                 }
-                                                             }
-                                                         }
-
-                                                     };
+                                                   {
+                                                       foreach (Slider s in app.SubViews.OfType<Slider> ())
+                                                       {
+                                                           if (e.Options.ContainsKey (0))
+                                                           {
+                                                               s.LegendsOrientation = Orientation.Horizontal;
+                                                           }
+                                                           else if (e.Options.ContainsKey (1))
+                                                           {
+                                                               s.LegendsOrientation = Orientation.Vertical;
+                                                           }
+
+                                                           if (optionsSlider.GetSetOptions ().Contains (3))
+                                                           {
+                                                               s.Width = Dim.Auto (DimAutoStyle.Content);
+                                                               s.Height = Dim.Auto (DimAutoStyle.Content);
+                                                           }
+                                                           else
+                                                           {
+                                                               if (s.Orientation == Orientation.Horizontal)
+                                                               {
+                                                                   s.Width = Dim.Percent (50);
+
+                                                                   int h = s.ShowLegends && s.LegendsOrientation == Orientation.Vertical
+                                                                               ? s.Options.Max (o => o.Legend.Length) + 3
+                                                                               : 4;
+                                                                   s.Height = h;
+                                                               }
+                                                               else
+                                                               {
+                                                                   int w = s.ShowLegends ? s.Options.Max (o => o.Legend.Length) + 3 : 3;
+                                                                   s.Width = w;
+                                                                   s.Height = Dim.Fill ();
+                                                               }
+                                                           }
+                                                       }
+                                                   };
 
         #endregion Legends Orientation Slider
 
-
         #region Spacing Options
 
         FrameView spacingOptions = new ()
@@ -396,7 +388,7 @@ public override void Main ()
 
         Label label = new ()
         {
-            Text = "Min _Inner Spacing:",
+            Text = "Min _Inner Spacing:"
         };
 
         NumericUpDown<int> innerSpacingUpDown = new ()
@@ -421,8 +413,6 @@ public override void Main ()
                                                 }
                                             };
 
-
-
         spacingOptions.Add (label, innerSpacingUpDown);
         configView.Add (spacingOptions);
 
@@ -432,10 +422,10 @@ public override void Main ()
 
         foreach (Slider s in app.SubViews.OfType<Slider> ())
         {
-            s.Style.OptionChar = s.Style.OptionChar with { Attribute = app.GetNormalColor () };
-            s.Style.SetChar = s.Style.SetChar with { Attribute = app.GetNormalColor () };
-            s.Style.LegendAttributes.SetAttribute = app.GetNormalColor ();
-            s.Style.RangeChar = s.Style.RangeChar with { Attribute = app.GetNormalColor () };
+            s.Style.OptionChar = s.Style.OptionChar with { Attribute = app.GetAttributeForRole (VisualRole.Normal) };
+            s.Style.SetChar = s.Style.SetChar with { Attribute = app.GetAttributeForRole (VisualRole.Normal) };
+            s.Style.LegendAttributes.SetAttribute = app.GetAttributeForRole (VisualRole.Normal);
+            s.Style.RangeChar = s.Style.RangeChar with { Attribute = app.GetAttributeForRole (VisualRole.Normal) };
         }
 
         Slider<(Color, Color)> sliderFGColor = new ()
@@ -465,10 +455,10 @@ public override void Main ()
             var colorName = colorIndex.ToString ();
 
             colorOptions.Add (
-                              new SliderOption<(Color, Color)>
+                              new ()
                               {
-                                  Data = (new Color (colorIndex),
-                                          new Color (colorIndex)),
+                                  Data = (new (colorIndex),
+                                          new (colorIndex)),
                                   Legend = colorName,
                                   LegendAbbr = (Rune)colorName [0]
                               }
@@ -487,19 +477,23 @@ public override void Main ()
 
                                                 foreach (Slider s in app.SubViews.OfType<Slider> ())
                                                 {
-                                                    s.ColorScheme = new ColorScheme (s.ColorScheme);
-
-                                                    s.ColorScheme = new ColorScheme (s.ColorScheme)
-                                                    {
-                                                        Normal = new Attribute (
-                                                                                data.Item2,
-                                                                                s.ColorScheme.Normal.Background
-                                                                               )
-                                                    };
+                                                    s.SetScheme (
+                                                                 new (s.GetScheme ())
+                                                                 {
+                                                                     Normal = new (
+                                                                                   data.Item2,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Style
+                                                                                  )
+                                                                 });
 
                                                     s.Style.OptionChar = s.Style.OptionChar with
                                                     {
-                                                        Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background)
+                                                        Attribute = new Attribute (
+                                                                                   data.Item1,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Style
+                                                                                  )
                                                     };
 
                                                     s.Style.SetChar = s.Style.SetChar with
@@ -507,23 +501,39 @@ public override void Main ()
                                                         Attribute = new Attribute (
                                                                                    data.Item1,
                                                                                    s.Style.SetChar.Attribute?.Background
-                                                                                   ?? s.ColorScheme.Normal.Background
+                                                                                   ?? s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                                   s.Style.SetChar.Attribute?.Style
+                                                                                   ?? s.GetAttributeForRole (VisualRole.Normal).Style
                                                                                   )
                                                     };
-                                                    s.Style.LegendAttributes.SetAttribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
+
+                                                    s.Style.LegendAttributes.SetAttribute =
+                                                        new Attribute (
+                                                                       data.Item1,
+                                                                       s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                       s.GetAttributeForRole (VisualRole.Normal).Style);
 
                                                     s.Style.RangeChar = s.Style.RangeChar with
                                                     {
-                                                        Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background)
+                                                        Attribute = new Attribute (
+                                                                                   data.Item1,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Style)
                                                     };
 
                                                     s.Style.SpaceChar = s.Style.SpaceChar with
                                                     {
-                                                        Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background)
+                                                        Attribute = new Attribute (
+                                                                                   data.Item1,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Style)
                                                     };
 
                                                     s.Style.LegendAttributes.NormalAttribute =
-                                                        new Attribute (data.Item1, s.ColorScheme.Normal.Background);
+                                                        new Attribute (
+                                                                       data.Item1,
+                                                                       s.GetAttributeForRole (VisualRole.Normal).Background,
+                                                                       s.GetAttributeForRole (VisualRole.Normal).Style);
                                                 }
                                             }
                                         };
@@ -557,13 +567,14 @@ public override void Main ()
 
                                                 foreach (Slider s in app.SubViews.OfType<Slider> ())
                                                 {
-                                                    s.ColorScheme = new ColorScheme (s.ColorScheme)
-                                                    {
-                                                        Normal = new Attribute (
-                                                                                s.ColorScheme.Normal.Foreground,
-                                                                                data.Item2
-                                                                               )
-                                                    };
+                                                    s.SetScheme (
+                                                                 new (s.GetScheme ())
+                                                                 {
+                                                                     Normal = new (
+                                                                                   s.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                                   data.Item2
+                                                                                  )
+                                                                 });
                                                 }
                                             }
                                         };
@@ -573,32 +584,33 @@ public override void Main ()
         #endregion Config Slider
 
         ObservableCollection<string> eventSource = new ();
+
         var eventLog = new ListView
         {
             X = Pos.Right (sliderBGColor),
             Y = Pos.Bottom (spacingOptions),
             Width = Dim.Fill (),
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (eventSource)
         };
         configView.Add (eventLog);
 
-
         foreach (Slider slider in app.SubViews.Where (v => v is Slider)!)
         {
             slider.Accepting += (o, args) =>
-                             {
-                                 eventSource.Add ($"Accept: {string.Join(",", slider.GetSetOptions ())}");
-                                 eventLog.MoveDown ();
-                                 args.Handled = true;
-                             };
+                                {
+                                    eventSource.Add ($"Accept: {string.Join (",", slider.GetSetOptions ())}");
+                                    eventLog.MoveDown ();
+                                    args.Handled = true;
+                                };
+
             slider.OptionsChanged += (o, args) =>
-                             {
-                                 eventSource.Add ($"OptionsChanged: {string.Join (",", slider.GetSetOptions ())}");
-                                 eventLog.MoveDown ();
-                                 args.Cancel = true;
-                             };
+                                     {
+                                         eventSource.Add ($"OptionsChanged: {string.Join (",", slider.GetSetOptions ())}");
+                                         eventLog.MoveDown ();
+                                         args.Cancel = true;
+                                     };
         }
 
         app.FocusDeepest (NavigationDirection.Forward, null);
diff --git a/Examples/UICatalog/Scenarios/Snake.cs b/Examples/UICatalog/Scenarios/Snake.cs
index 04538885bd..957ec67578 100644
--- a/Examples/UICatalog/Scenarios/Snake.cs
+++ b/Examples/UICatalog/Scenarios/Snake.cs
@@ -291,7 +291,7 @@ public SnakeView (SnakeState state)
         {
             _appleRune = Glyphs.Apple;
 
-            if (!Driver.IsRuneSupported (_appleRune))
+            if (!Application.Driver!.IsRuneSupported (_appleRune))
             {
                 _appleRune = Glyphs.AppleBMP;
             }
@@ -299,14 +299,7 @@ public SnakeView (SnakeState state)
             State = state;
             CanFocus = true;
 
-            base.ColorScheme = new ()
-            {
-                Normal = white,
-                Focus = white,
-                HotNormal = white,
-                HotFocus = white,
-                Disabled = white
-            };
+            base.SetScheme (new (white));
 
             KeyBindings.Add (Key.CursorLeft, Command.Left);
             KeyBindings.Add (Key.CursorRight, Command.Right);
diff --git a/Examples/UICatalog/Scenarios/SyntaxHighlighting.cs b/Examples/UICatalog/Scenarios/SyntaxHighlighting.cs
index 9f235d1a36..c7f9bf6c3d 100644
--- a/Examples/UICatalog/Scenarios/SyntaxHighlighting.cs
+++ b/Examples/UICatalog/Scenarios/SyntaxHighlighting.cs
@@ -100,7 +100,7 @@ public class SyntaxHighlighting : Scenario
     /// <typeparam name="T">The type of object to read from the file.</typeparam>
     /// <param name="filePath">The file path to read the object instance from.</param>
     /// <returns>Returns a new instance of the object read from the Json file.</returns>
-    public static T ReadFromJsonFile<T> (string filePath) where T : new ()
+    public static T ReadFromJsonFile<T> (string filePath) where T : new()
     {
         TextReader reader = null;
 
@@ -170,7 +170,7 @@ public override void Main ()
         };
         appWindow.Add (menu);
 
-        _textView = new()
+        _textView = new ()
         {
             Y = 1,
             Width = Dim.Fill (),
@@ -212,7 +212,7 @@ public override void Main ()
     ///     If false the file will be overwritten if it already exists. If true the contents will be appended
     ///     to the file.
     /// </param>
-    public static void WriteToJsonFile<T> (string filePath, T objectToWrite, bool append = false) where T : new ()
+    public static void WriteToJsonFile<T> (string filePath, T objectToWrite, bool append = false) where T : new()
     {
         TextWriter writer = null;
 
@@ -237,16 +237,16 @@ private void ApplyLoadCells ()
 
         List<Cell> cells = new ();
 
-        foreach (KeyValuePair<string, ColorScheme> color in Colors.ColorSchemes)
+        foreach (KeyValuePair<string, Scheme> color in SchemeManager.GetSchemesForCurrentTheme ())
         {
             string csName = color.Key;
 
             foreach (Rune rune in csName.EnumerateRunes ())
             {
-                cells.Add (new() { Rune = rune, Attribute = color.Value.Normal });
+                cells.Add (new () { Rune = rune, Attribute = color.Value.Normal });
             }
 
-            cells.Add (new() { Rune = (Rune)'\n', Attribute = color.Value.Focus });
+            cells.Add (new () { Rune = (Rune)'\n', Attribute = color.Value.Focus });
         }
 
         if (File.Exists (_path))
@@ -271,7 +271,7 @@ private void ApplySyntaxHighlighting ()
         _blue = new Attribute (Color.Blue, Color.Black);
         _magenta = new Attribute (Color.Magenta, Color.Black);
         _white = new Attribute (Color.White, Color.Black);
-        _textView.ColorScheme = new () { Focus = _white };
+        _textView.SetScheme (new () { Focus = _white });
 
         _textView.Text =
             "/*Query to select:\nLots of data*/\nSELECT TOP 100 * \nfrom\n MyDb.dbo.Biochemistry where TestCode = 'blah';";
@@ -296,7 +296,7 @@ private void ClearAllEvents ()
     private void HighlightTextBasedOnKeywords ()
     {
         // Comment blocks, quote blocks etc
-        Dictionary<Rune, ColorScheme> blocks = new ();
+        Dictionary<Rune, Scheme> blocks = new ();
 
         var comments = new Regex (@"/\*.*?\*/", RegexOptions.Singleline);
         MatchCollection commentMatches = comments.Matches (_textView.Text);
diff --git a/Examples/UICatalog/Scenarios/TableEditor.cs b/Examples/UICatalog/Scenarios/TableEditor.cs
index 20b459b93e..bb8391743c 100644
--- a/Examples/UICatalog/Scenarios/TableEditor.cs
+++ b/Examples/UICatalog/Scenarios/TableEditor.cs
@@ -318,7 +318,7 @@ public class TableEditor : Scenario
         new (0xE0000, 0xE007F, "Tags")
     };
 
-    private ColorScheme _alternatingColorScheme;
+    private Scheme _alternatingScheme;
     private DataTable _currentTable;
     private MenuItem _miAlternatingColors;
     private MenuItem _miAlwaysShowHeaders;
@@ -336,8 +336,8 @@ public class TableEditor : Scenario
     private MenuItem _miShowHeaders;
     private MenuItem _miShowHorizontalScrollIndicators;
     private MenuItem _miSmoothScrolling;
-    private ColorScheme _redColorScheme;
-    private ColorScheme _redColorSchemeAlt;
+    private Scheme _redScheme;
+    private Scheme _redSchemeAlt;
     private TableView _tableView;
 
     /// <summary>
@@ -664,27 +664,27 @@ public override void Main ()
 
         //SetupScrollBar ();
 
-        _redColorScheme = new ()
+        _redScheme = new ()
         {
-            Disabled = appWindow.ColorScheme.Disabled,
-            HotFocus = appWindow.ColorScheme.HotFocus,
-            Focus = appWindow.ColorScheme.Focus,
-            Normal = new (Color.Red, appWindow.ColorScheme.Normal.Background)
+            Disabled = appWindow.GetAttributeForRole(VisualRole.Disabled),
+            HotFocus = appWindow.GetAttributeForRole(VisualRole.HotFocus),
+            Focus = appWindow.GetAttributeForRole(VisualRole.Focus),
+            Normal = new (Color.Red, appWindow.GetAttributeForRole(VisualRole.Normal).Background)
         };
 
-        _alternatingColorScheme = new ()
+        _alternatingScheme = new ()
         {
-            Disabled = appWindow.ColorScheme.Disabled,
-            HotFocus = appWindow.ColorScheme.HotFocus,
-            Focus = appWindow.ColorScheme.Focus,
+            Disabled = appWindow.GetAttributeForRole(VisualRole.Disabled),
+            HotFocus = appWindow.GetAttributeForRole(VisualRole.HotFocus),
+            Focus = appWindow.GetAttributeForRole(VisualRole.Focus),
             Normal = new (Color.White, Color.BrightBlue)
         };
 
-        _redColorSchemeAlt = new ()
+        _redSchemeAlt = new ()
         {
-            Disabled = appWindow.ColorScheme.Disabled,
-            HotFocus = appWindow.ColorScheme.HotFocus,
-            Focus = appWindow.ColorScheme.Focus,
+            Disabled = appWindow.GetAttributeForRole(VisualRole.Disabled),
+            HotFocus = appWindow.GetAttributeForRole(VisualRole.HotFocus),
+            Focus = appWindow.GetAttributeForRole(VisualRole.Focus),
             Normal = new (Color.Red, Color.BrightBlue)
         };
 
@@ -1099,8 +1099,8 @@ private void SetDemoTableStyles ()
                                    d <= 0.0000001
                                        ? a.RowIndex % 2 == 0
                                          && _miAlternatingColors.Checked == true
-                                             ? _redColorSchemeAlt
-                                             : _redColorScheme
+                                             ? _redSchemeAlt
+                                             : _redScheme
                                        :
 
                                        // use normal scheme for positive values
@@ -1334,7 +1334,7 @@ private void ToggleAlternatingColors ()
 
         if (_miAlternatingColors.Checked == true)
         {
-            _tableView.Style.RowColorGetter = a => { return a.RowIndex % 2 == 0 ? _alternatingColorScheme : null; };
+            _tableView.Style.RowColorGetter = a => { return a.RowIndex % 2 == 0 ? _alternatingScheme : null; };
         }
         else
         {
diff --git a/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs b/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
index 36a1adecbe..fbebd89b18 100644
--- a/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
+++ b/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs
@@ -13,7 +13,7 @@ public class TextAlignmentAndDirection : Scenario
 
     internal class AlignmentAndDirectionView : View
     {
-        public AlignmentAndDirectionView()
+        public AlignmentAndDirectionView ()
         {
             ViewportSettings = Terminal.Gui.ViewportSettings.Transparent;
             BorderStyle = LineStyle.Dotted;
@@ -31,8 +31,8 @@ public override void Main ()
 
         var txt = $"Hello World{Environment.NewLine}HELLO WORLD{Environment.NewLine}世界 您好";
 
-        var color1 = new ColorScheme { Normal = new (Color.Black, Color.Gray) };
-        var color2 = new ColorScheme { Normal = new (Color.Black, Color.DarkGray) };
+        SchemeManager.AddScheme ("TextAlignmentAndDirection1", new Scheme { Normal = new (Color.Black, Color.Gray) });
+        SchemeManager.AddScheme ("TextAlignmentAndDirection2", new Scheme { Normal = new (Color.Black, Color.DarkGray) });
 
         List<View> singleLineLabels = new (); // single line
         List<View> multiLineLabels = new (); // multi line
@@ -46,7 +46,7 @@ public override void Main ()
             Width = 6,
             Height = 1,
             TextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
+            SchemeName = "Dialog",
             Text = "Start",
         };
 
@@ -57,7 +57,7 @@ public override void Main ()
             Width = 6,
             Height = 1,
             TextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
+            SchemeName = "Dialog",
             Text = "Center"
         };
 
@@ -68,7 +68,7 @@ public override void Main ()
             Width = 6,
             Height = 1,
             TextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
+            SchemeName = "Dialog",
             Text = "End"
         };
 
@@ -79,7 +79,7 @@ public override void Main ()
             Width = 6,
             Height = 1,
             TextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
+            SchemeName = "Dialog",
             Text = "Fill"
         };
 
@@ -89,7 +89,7 @@ public override void Main ()
             Y = Pos.Y (labelHL),
             Width = Dim.Fill (9),
             Height = 1,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextAlignment = Alignment.Start,
             Text = txt,
             ViewportSettings = Terminal.Gui.ViewportSettings.Transparent
@@ -101,7 +101,7 @@ public override void Main ()
             Y = Pos.Y (labelHC),
             Width = Dim.Fill (9),
             Height = 1,
-            ColorScheme = color2,
+            SchemeName = "TextAlignmentAndDirection2",
             TextAlignment = Alignment.Center,
             Text = txt,
             ViewportSettings = Terminal.Gui.ViewportSettings.Transparent
@@ -113,7 +113,7 @@ public override void Main ()
             Y = Pos.Y (labelHR),
             Width = Dim.Fill (9),
             Height = 1,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextAlignment = Alignment.End,
             Text = txt,
             ViewportSettings = Terminal.Gui.ViewportSettings.Transparent
@@ -125,7 +125,7 @@ public override void Main ()
             Y = Pos.Y (labelHJ),
             Width = Dim.Fill (9),
             Height = 1,
-            ColorScheme = color2,
+            SchemeName = "TextAlignmentAndDirection2",
             TextAlignment = Alignment.Fill,
             Text = txt,
             ViewportSettings = Terminal.Gui.ViewportSettings.Transparent
@@ -153,7 +153,7 @@ public override void Main ()
             Y = 0,
             Width = 2,
             Height = 6,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.End,
             Text = "Start"
@@ -166,7 +166,7 @@ public override void Main ()
             Y = 0,
             Width = 2,
             Height = 6,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.End,
             Text = "Center"
@@ -179,7 +179,7 @@ public override void Main ()
             Y = 0,
             Width = 2,
             Height = 6,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.End,
             Text = "End"
@@ -192,7 +192,7 @@ public override void Main ()
             Y = 0,
             Width = 2,
             Height = 6,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.End,
             Text = "Fill"
@@ -205,7 +205,7 @@ public override void Main ()
             Y = Pos.Bottom (labelVT) + 1,
             Width = 2,
             Height = Dim.Fill (),
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.Start,
             Text = txt,
@@ -219,7 +219,7 @@ public override void Main ()
             Y = Pos.Bottom (labelVM) + 1,
             Width = 2,
             Height = Dim.Fill (),
-            ColorScheme = color2,
+            SchemeName = "TextAlignmentAndDirection2",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.Center,
             Text = txt,
@@ -233,7 +233,7 @@ public override void Main ()
             Y = Pos.Bottom (labelVB) + 1,
             Width = 2,
             Height = Dim.Fill (),
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.End,
             Text = txt,
@@ -247,7 +247,7 @@ public override void Main ()
             Y = Pos.Bottom (labelVJ) + 1,
             Width = 2,
             Height = Dim.Fill (),
-            ColorScheme = color2,
+            SchemeName = "TextAlignmentAndDirection2",
             TextDirection = TextDirection.TopBottom_LeftRight,
             VerticalTextAlignment = Alignment.Fill,
             Text = txt,
@@ -278,7 +278,7 @@ public override void Main ()
             Width = Dim.Fill (31),
             Height = Dim.Fill (4)
 
-            //ColorScheme = color2
+            //SchemeName = "TextAlignmentAndDirection2"
         };
 
         var txtLabelTL = new AlignmentAndDirectionView
@@ -289,7 +289,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.Start,
             VerticalTextAlignment = Alignment.Start,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelTL.TextFormatter.MultiLine = true;
@@ -302,7 +302,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.Center,
             VerticalTextAlignment = Alignment.Start,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelTC.TextFormatter.MultiLine = true;
@@ -315,7 +315,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.End,
             VerticalTextAlignment = Alignment.Start,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelTR.TextFormatter.MultiLine = true;
@@ -328,7 +328,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.Start,
             VerticalTextAlignment = Alignment.Center,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelML.TextFormatter.MultiLine = true;
@@ -341,7 +341,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.Center,
             VerticalTextAlignment = Alignment.Center,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelMC.TextFormatter.MultiLine = true;
@@ -354,7 +354,7 @@ public override void Main ()
             Height = Dim.Percent (100 / 3),
             TextAlignment = Alignment.End,
             VerticalTextAlignment = Alignment.Center,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelMR.TextFormatter.MultiLine = true;
@@ -367,7 +367,7 @@ public override void Main ()
             Height = Dim.Percent (100, DimPercentMode.Position),
             TextAlignment = Alignment.Start,
             VerticalTextAlignment = Alignment.End,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelBL.TextFormatter.MultiLine = true;
@@ -380,7 +380,7 @@ public override void Main ()
             Height = Dim.Percent (100, DimPercentMode.Position),
             TextAlignment = Alignment.Center,
             VerticalTextAlignment = Alignment.End,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelBC.TextFormatter.MultiLine = true;
@@ -388,12 +388,12 @@ public override void Main ()
         var txtLabelBR = new AlignmentAndDirectionView
         {
             X = Pos.X (txtLabelMR),
-            Y = Pos.Bottom(txtLabelMR),
+            Y = Pos.Bottom (txtLabelMR),
             Width = Dim.Percent (100, DimPercentMode.Position),
             Height = Dim.Percent (100, DimPercentMode.Position),
             TextAlignment = Alignment.End,
             VerticalTextAlignment = Alignment.End,
-            ColorScheme = color1,
+            SchemeName = "TextAlignmentAndDirection1",
             Text = txt,
         };
         txtLabelBR.TextFormatter.MultiLine = true;
@@ -578,6 +578,12 @@ public override void Main ()
         app.Dispose ();
         Application.Shutdown ();
 
+        // Be a good citizen and remove the schemes we added
+        SchemeManager.RemoveScheme ("TextAlignmentAndDirection1");
+        SchemeManager.RemoveScheme ("TextAlignmentAndDirection2");
+
+        return;
+
         void ToggleJustify (bool oldValue, bool wasJustOptions = false)
         {
             if (oldValue)
diff --git a/Examples/UICatalog/Scenarios/TextEffectsScenario.cs b/Examples/UICatalog/Scenarios/TextEffectsScenario.cs
index 399cfc5c22..0598b43198 100644
--- a/Examples/UICatalog/Scenarios/TextEffectsScenario.cs
+++ b/Examples/UICatalog/Scenarios/TextEffectsScenario.cs
@@ -34,14 +34,14 @@ public override void Main ()
                               }
                           };
 
-        w.ColorScheme = new ()
+        w.SetScheme (new ()
         {
             Normal = new (ColorName16.White, ColorName16.Black),
             Focus = new (ColorName16.Black, ColorName16.White),
             HotNormal = new (ColorName16.White, ColorName16.Black),
             HotFocus = new (ColorName16.White, ColorName16.Black),
             Disabled = new (ColorName16.Gray, ColorName16.Black)
-        };
+        });
 
         var gradientsView = new GradientsView
         {
@@ -159,7 +159,7 @@ private void CenterText (string text, int xOffset, int yOffset)
 
         int width = text.Length;
         int x = xOffset + (GRADIENT_WIDTH - width) / 2; // Center the text within the gradient area width
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
         Move (x, yOffset + 1);
         AddStr (text);
     }
diff --git a/Examples/UICatalog/Scenarios/TextFormatterDemo.cs b/Examples/UICatalog/Scenarios/TextFormatterDemo.cs
index d24f863cfc..c6b983e95b 100644
--- a/Examples/UICatalog/Scenarios/TextFormatterDemo.cs
+++ b/Examples/UICatalog/Scenarios/TextFormatterDemo.cs
@@ -31,7 +31,7 @@ public override void Main ()
 
         var blockText = new Label
         {
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             X = 0,
             Y = 0,
 
@@ -78,7 +78,7 @@ public override void Main ()
 
                 Width = Dim.Fill (),
                 Height = 1,
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
                 Text = text
             };
 
@@ -89,7 +89,7 @@ public override void Main ()
 
                 Width = Dim.Fill (),
                 Height = multiLineHeight,
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
                 Text = text
             };
         }
diff --git a/Examples/UICatalog/Scenarios/Text.cs b/Examples/UICatalog/Scenarios/TextInputControls.cs
similarity index 87%
rename from Examples/UICatalog/Scenarios/Text.cs
rename to Examples/UICatalog/Scenarios/TextInputControls.cs
index 541aec2add..dc4cdb1814 100644
--- a/Examples/UICatalog/Scenarios/Text.cs
+++ b/Examples/UICatalog/Scenarios/TextInputControls.cs
@@ -1,11 +1,6 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Text;
+using System.Text;
 using System.Text.RegularExpressions;
 using Terminal.Gui;
-using Terminal.Gui.TextValidateProviders;
 
 namespace UICatalog.Scenarios;
 
@@ -13,7 +8,7 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Controls")]
 [ScenarioCategory ("Mouse and Keyboard")]
 [ScenarioCategory ("Text and Formatting")]
-public class Text : Scenario
+public class TextInputControls : Scenario
 {
     private Label _labelMirroringTimeField;
     private TimeField _timeField;
@@ -22,8 +17,9 @@ public override void Main ()
     {
         Application.Init ();
         var win = new Window { Title = GetQuitKeyAndName () };
+
         // TextField is a simple, single-line text input control
-        var label = new Label { Text = "_TextField:" };
+        var label = new Label { Text = " _TextField:" };
         win.Add (label);
 
         var textField = new TextField
@@ -36,9 +32,9 @@ public override void Main ()
 
         var singleWordGenerator = new SingleWordSuggestionGenerator ();
         textField.Autocomplete.SuggestionGenerator = singleWordGenerator;
-        textField.TextChanging += TextField_TextChanging;
+        textField.TextChanging += TextFieldTextChanging;
 
-        void TextField_TextChanging (object sender, CancelEventArgs<string> e)
+        void TextFieldTextChanging (object sender, CancelEventArgs<string> e)
         {
             singleWordGenerator.AllSuggestions = Regex.Matches (e.NewValue, "\\w+")
                                                       .Select (s => s.Value)
@@ -60,16 +56,34 @@ void TextField_TextChanging (object sender, CancelEventArgs<string> e)
         win.Add (labelMirroringTextField);
         textField.TextChanged += (s, prev) => { labelMirroringTextField.Text = textField.Text; };
 
+        label = new Label
+        {
+            Text = "Te_xtField2:",
+            X = 0,
+            Y = Pos.Bottom (textField)
+        };
+        win.Add (label);
+
+        textField = new TextField
+        {
+            X = Pos.Right (label) + 1,
+            Y = Pos.Bottom (textField),
+            Width = Dim.Percent (50) - 1,
+            Caption = "TextField with caption"
+        };
+
+        win.Add (textField);
+
         // TextView is a rich (as in functionality, not formatting) text editing control
-        label = new() { Text = "T_extView:", Y = Pos.Bottom (label) + 1 };
+        label = new () { Text = "T_extView:", Y = Pos.Bottom (label) + 1 };
         win.Add (label);
 
         var textView = new TextView
         {
-            X = Pos.Right (label) + 1, 
-            Y = Pos.Top (label), 
-            Width = Dim.Percent (50) - 1, 
-            Height = Dim.Percent (20)
+            X = Pos.Right (label) + 1,
+            Y = Pos.Top (label),
+            Width = Dim.Percent (50) - 1,
+            Height = Dim.Percent (10)
         };
         textView.Text = "TextView with some more test text. Unicode shouldn't 𝔹Aℝ𝔽!";
         textView.DrawingContent += TextView_DrawContent;
@@ -104,11 +118,18 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
                                         labelMirroringTextView.Text = textView.Text;
                                     };
 
+        CheckBox chxReadOnly = new ()
+        {
+            X = Pos.Left (textView), Y = Pos.Bottom (textView), CheckedState = textView.ReadOnly ? CheckState.Checked : CheckState.UnChecked, Text = "Read_Only"
+        };
+        chxReadOnly.CheckedStateChanging += (sender, args) => textView.ReadOnly = args.NewValue == CheckState.Checked;
+        win.Add (chxReadOnly);
+
         // By default TextView is a multi-line control. It can be forced to 
         // single-line mode.
         var chxMultiline = new CheckBox
         {
-            X = Pos.Left (textView), Y = Pos.Bottom (textView), CheckedState = textView.Multiline ? CheckState.Checked : CheckState.UnChecked, Text = "_Multiline"
+            X = Pos.Right (chxReadOnly) + 2, Y = Pos.Bottom (textView), CheckedState = textView.Multiline ? CheckState.Checked : CheckState.UnChecked, Text = "_Multiline"
         };
         win.Add (chxMultiline);
 
@@ -169,7 +190,7 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
         win.Add (chxCaptureTabs);
 
         // Hex editor
-        label = new() { Text = "_HexView:", Y = Pos.Bottom (chxMultiline) + 1 };
+        label = new () { Text = "_HexView:", Y = Pos.Bottom (chxMultiline) + 1 };
         win.Add (label);
 
         var hexEditor =
@@ -201,7 +222,7 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
         win.Add (labelMirroringHexEditor);
 
         // DateField
-        label = new() { Text = "_DateField:", Y = Pos.Bottom (hexEditor) + 1 };
+        label = new () { Text = "_DateField:", Y = Pos.Bottom (hexEditor) + 1 };
         win.Add (label);
 
         var dateField = new DateField (DateTime.Now) { X = Pos.Right (label) + 1, Y = Pos.Bottom (hexEditor) + 1, Width = 20 };
@@ -221,10 +242,10 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
         dateField.TextChanged += (s, prev) => { labelMirroringDateField.Text = dateField.Text; };
 
         // TimeField
-        label = new() { Text = "T_imeField:", Y = Pos.Top (dateField), X = Pos.Right (labelMirroringDateField) + 5 };
+        label = new () { Text = "T_imeField:", Y = Pos.Top (dateField), X = Pos.Right (labelMirroringDateField) + 5 };
         win.Add (label);
 
-        _timeField = new()
+        _timeField = new ()
         {
             X = Pos.Right (label) + 1,
             Y = Pos.Top (dateField),
@@ -234,7 +255,7 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
         };
         win.Add (_timeField);
 
-        _labelMirroringTimeField = new()
+        _labelMirroringTimeField = new ()
         {
             X = Pos.Right (_timeField) + 1,
             Y = Pos.Top (_timeField),
@@ -324,7 +345,7 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
 
         appendAutocompleteTextField.Autocomplete.SuggestionGenerator = new SingleWordSuggestionGenerator
         {
-            AllSuggestions = new()
+            AllSuggestions = new ()
             {
                 "fish",
                 "flipper",
@@ -444,8 +465,11 @@ void TextView_DrawContent (object sender, DrawEventArgs e)
 
         win.Accepting += WinOnAccept;
 
+        ConfigurationManager.Applied += ConfigurationManagerOnApplied;
+
         Application.Run (win);
         win.Dispose ();
+        win = null;
         Application.Shutdown ();
 
         return;
@@ -454,7 +478,7 @@ void WinOnAccept (object sender, CommandEventArgs e)
         {
             e.Handled = true; // Don't let it close
 
-            acceptView.Text = $"Accept was Invoked via {win.Focused.GetType().Name}";
+            acceptView.Text = $"Accept was Invoked via {win.Focused.GetType ().Name}";
 
             // Start a task that will set acceptView.Text to an empty string after 1 second
             System.Threading.Tasks.Task.Run (async () =>
@@ -463,8 +487,17 @@ void WinOnAccept (object sender, CommandEventArgs e)
                 Application.Invoke (() => acceptView.Text = "");
             });
         }
+
+        void ConfigurationManagerOnApplied (object sender, ConfigurationManagerEventArgs e)
+        {
+            if (win is { })
+            {
+                win.SetNeedsDraw ();
+            }
+        }
     }
 
 
+
     private void TimeChanged (object sender, DateTimeEventArgs<TimeSpan> e) { _labelMirroringTimeField.Text = _timeField.Text; }
 }
diff --git a/Examples/UICatalog/Scenarios/TextStyles.cs b/Examples/UICatalog/Scenarios/TextStyles.cs
index c30bffdc51..e76d2ef8c5 100644
--- a/Examples/UICatalog/Scenarios/TextStyles.cs
+++ b/Examples/UICatalog/Scenarios/TextStyles.cs
@@ -8,6 +8,8 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("Colors")]
 public sealed class TestStyles : Scenario
 {
+    private CheckBox? _drawDirectly;
+
     public override void Main ()
     {
         // Init
@@ -16,11 +18,33 @@ public override void Main ()
         // Setup - Create a top-level application window and configure it.
         Window appWindow = new ()
         {
-            Title = GetQuitKeyAndName (),
-            BorderStyle = LineStyle.None
+            Id = "appWindow",
+            Title = GetQuitKeyAndName ()
         };
 
+        //appWindow.ContentSizeTracksViewport = false;
+        appWindow.VerticalScrollBar.AutoShow = true;
+        appWindow.HorizontalScrollBar.AutoShow = true;
+
+        appWindow.SubViewsLaidOut += (sender, _) =>
+                                     {
+                                         if (sender is View sendingView)
+                                         {
+                                             sendingView.SetContentSize (new Size(sendingView.GetContentSize().Width, sendingView.GetHeightRequiredForSubViews()));
+                                         }
+                                     };
+
         appWindow.DrawingContent += OnAppWindowOnDrawingContent;
+        appWindow.DrawingSubViews += OnAppWindowOnDrawingSubviews;
+
+        _drawDirectly = new ()
+        {
+            Title = "_Draw styled text directly using DrawingContent vs. Buttons",
+            CheckedState = CheckState.UnChecked
+        };
+
+        appWindow.Add (_drawDirectly);
+        AddButtons (appWindow);
 
         // Run - Start the application.
         Application.Run (appWindow);
@@ -30,47 +54,130 @@ public override void Main ()
         Application.Shutdown ();
     }
 
+    private void AddButtons (Window appWindow)
+    {
+        var y = 1;
+
+        TextStyle [] allStyles = Enum.GetValues (typeof (TextStyle))
+                                     .Cast<TextStyle> ()
+                                     .Where (style => style != TextStyle.None)
+                                     .ToArray ();
+
+        // Add individual flags as labels
+        foreach (TextStyle style in allStyles)
+        {
+            y++;
+
+            var button = new Button
+            {
+                X = 0,
+                Y = y,
+                Title = $"{Enum.GetName (typeof (TextStyle), style)}",
+                Visible = _drawDirectly!.CheckedState != CheckState.Checked
+            };
+
+            button.GettingAttributeForRole += (sender, args) =>
+                                              {
+                                                  if (sender is not Button buttonSender)
+                                                  {
+                                                      return;
+                                                  }
+                                                  args.NewValue = args.NewValue with { Style = style };
+                                                  args.Cancel = true;
+                                              };
+
+            appWindow.Add (button);
+        }
+
+        // Add a blank line
+        y += 1;
+
+        // Generate all combinations of TextStyle (excluding individual flags)
+        int totalCombinations = 1 << allStyles.Length; // 2^n combinations
+
+        for (var i = 1; i < totalCombinations; i++) // Start from 1 to skip "None"
+        {
+            var combination = (TextStyle)0;
+            List<string> styleNames = [];
+
+            for (var bit = 0; bit < allStyles.Length; bit++)
+            {
+                if ((i & (1 << bit)) != 0)
+                {
+                    combination |= allStyles [bit];
+                    styleNames.Add (Enum.GetName (typeof (TextStyle), allStyles [bit])!);
+                }
+            }
+
+            // Skip individual flags
+            if (styleNames.Count == 1)
+            {
+                continue;
+            }
+
+            y++;
+
+            var button = new Button
+            {
+                X = 0,
+                Y = y,
+                Text = $"[{string.Join (" | ", styleNames)}]",
+                Visible = _drawDirectly!.CheckedState != CheckState.Checked
+            };
+            button.GettingAttributeForRole += (_, args) =>
+                                              {
+                                                  args.NewValue = args.NewValue with { Style = combination };
+                                                  args.Cancel = true;
+                                              };
+            appWindow.Add (button);
+        }
+    }
+
+    private void OnAppWindowOnDrawingSubviews (object? sender, DrawEventArgs e)
+    {
+        if (sender is not View sendingVioew)
+        {
+            return;
+        }
+
+        foreach (Button view in sendingVioew.SubViews.OfType<Button> ())
+        {
+            view.Visible = _drawDirectly!.CheckedState != CheckState.Checked;
+        }
+
+        e.Cancel = false;
+    }
+
     private void OnAppWindowOnDrawingContent (object? sender, DrawEventArgs args)
     {
-        if (sender is View { } sendingView)
+        if (sender is View { } sendingView && _drawDirectly!.CheckedState == CheckState.Checked)
         {
-            var y = 0;
-            var x = 0;
-            int maxWidth = sendingView.Viewport.Width; // Get the available width of the view
+            int y = 2 - args.NewViewport.Y; // Start drawing below the checkbox
 
             TextStyle [] allStyles = Enum.GetValues (typeof (TextStyle))
                                          .Cast<TextStyle> ()
                                          .Where (style => style != TextStyle.None)
                                          .ToArray ();
 
-            // Draw individual flags on the first line
+            // Draw individual flags, one per line
             foreach (TextStyle style in allStyles)
             {
                 string text = Enum.GetName (typeof (TextStyle), style)!;
-                int textWidth = text.Length;
 
-                // Check if the text fits in the current line
-                if (x + textWidth >= maxWidth)
-                {
-                    x = 0; // Move to the next line
-                    y++;
-                }
-
-                sendingView.Move (x, y);
+                sendingView.Move (0, y);
 
-                var attr = new Attribute (sendingView.GetNormalColor ())
+                var attr = new Attribute (sendingView.GetAttributeForRole (VisualRole.Normal))
                 {
-                    TextStyle = style
+                    Style = style
                 };
                 sendingView.SetAttribute (attr);
                 sendingView.AddStr (text);
 
-                x += textWidth + 2; // Add spacing between entries
+                y++; // Move to the next line
             }
 
             // Add a blank line
-            y += 2;
-            x = 0;
+            y++;
 
             // Generate all combinations of TextStyle (excluding individual flags)
             int totalCombinations = 1 << allStyles.Length; // 2^n combinations
@@ -78,7 +185,7 @@ private void OnAppWindowOnDrawingContent (object? sender, DrawEventArgs args)
             for (var i = 1; i < totalCombinations; i++) // Start from 1 to skip "None"
             {
                 var combination = (TextStyle)0;
-                List<string> styleNames = new ();
+                List<string> styleNames = [];
 
                 for (var bit = 0; bit < allStyles.Length; bit++)
                 {
@@ -95,26 +202,18 @@ private void OnAppWindowOnDrawingContent (object? sender, DrawEventArgs args)
                     continue;
                 }
 
-                string text = $"[{string.Join (" | ", styleNames)}]";
-                int textWidth = text.Length;
-
-                // Check if the text fits in the current line
-                if (x + textWidth >= maxWidth)
-                {
-                    x = 0; // Move to the next line
-                    y++;
-                }
+                var text = $"[{string.Join (" | ", styleNames)}]";
 
-                sendingView.Move (x, y);
+                sendingView.Move (00, y);
 
-                var attr = new Attribute (sendingView.GetNormalColor ())
+                var attr = new Attribute (sendingView.GetAttributeForRole (VisualRole.Normal))
                 {
-                    TextStyle = combination
+                    Style = combination
                 };
                 sendingView.SetAttribute (attr);
                 sendingView.AddStr (text);
 
-                x += textWidth + 2; // Add spacing between entries
+                y++; // Move to the next line
             }
 
             args.Cancel = true;
diff --git a/Examples/UICatalog/Scenarios/Themes.cs b/Examples/UICatalog/Scenarios/Themes.cs
new file mode 100644
index 0000000000..2d5dcb7369
--- /dev/null
+++ b/Examples/UICatalog/Scenarios/Themes.cs
@@ -0,0 +1,276 @@
+#nullable enable
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+[ScenarioMetadata ("Themes", "Shows off Themes, Schemes, and VisualRoles.")]
+[ScenarioCategory ("Colors")]
+[ScenarioCategory ("Drawing")]
+[ScenarioCategory ("Configuration")]
+public sealed class Themes : Scenario
+{
+    private View? _view;
+
+    public override void Main ()
+    {
+        // Init
+        Application.Init ();
+
+        // Setup - Create a top-level application window and configure it.
+        Window appWindow = new ()
+        {
+            Title = GetQuitKeyAndName (),
+            BorderStyle = LineStyle.None
+        };
+
+        string[]  options = ThemeManager.GetThemeNames ().Select (option => option = "_" + option).ToArray ();
+        RadioGroup themeOptionSelector = new ()
+        {
+            Title = "_Themes",
+            BorderStyle = LineStyle.Rounded,
+            Width = Dim.Auto (),
+            Height = Dim.Auto (),
+            RadioLabels= options,
+            SelectedItem = ThemeManager.GetThemeNames ().IndexOf (ThemeManager.Theme)
+        };
+        themeOptionSelector.Border!.Thickness = new (0, 1, 0, 0);
+        themeOptionSelector.Margin!.Thickness = new (0, 0, 1, 0);
+
+        themeOptionSelector.SelectedItemChanged += (sender, args) =>
+                                             {
+                                                 RadioGroup? optionSelector = sender as RadioGroup;
+                                                 if (optionSelector is null)
+                                                 {
+                                                     return;
+                                                 }
+                                                 var newTheme = optionSelector!.RadioLabels! [(int)args.SelectedItem!] as string;
+                                                 // strip off the leading underscore
+                                                 ThemeManager.Theme = newTheme!.Substring (1);
+                                                 ConfigurationManager.Apply ();
+                                             };
+
+        var themeViewer = new ThemeViewer
+        {
+            X = Pos.Right (themeOptionSelector)
+        };
+
+        Dictionary<string, Type> viewClasses = GetAllViewClassesCollection ()
+                                               .OrderBy (t => t.Name)
+                                               .Select (t => new KeyValuePair<string, Type> (t.Name, t))
+                                               .ToDictionary (t => t.Key, t => t.Value);
+
+        CheckBox? allViewsCheckBox = new ()
+        {
+            Title = "_All Views",
+            X = Pos.Right (themeViewer),
+        };
+
+        ListView viewListView = new ()
+        {
+            X = Pos.Right (themeViewer),
+            Y = Pos.Bottom(allViewsCheckBox),
+            Title = "_Views",
+            BorderStyle = LineStyle.Rounded,
+            Width = Dim.Auto (),
+            Height = Dim.Fill (),
+            Source = new ListWrapper<string> (new (viewClasses.Keys))
+        };
+        viewListView.Border!.Thickness = new (0, 1, 0, 0);
+        viewListView.Margin!.Thickness = new (0, 0, 1, 0);
+
+        viewListView.VerticalScrollBar.AutoShow = true;
+
+
+        ViewPropertiesEditor viewPropertiesEditor = new ()
+        {
+            X = Pos.Right (viewListView),
+            Width = Dim.Fill (),
+            Height = Dim.Auto (),
+        };
+
+        FrameView? viewFrame = new ()
+        {
+            X = Pos.Right (viewListView),
+            Y = Pos.Bottom(viewPropertiesEditor),
+            Title = "The View",
+            BorderStyle = LineStyle.Rounded,
+            Width = Dim.Fill (),
+            Height = Dim.Fill (),
+            TabStop = TabBehavior.TabStop
+        };
+        viewFrame.Border!.Thickness = new (0, 1, 0, 0);
+
+        viewListView.SelectedItemChanged += (sender, args) =>
+                                            {
+                                                var listView = sender as ListView;
+
+                                                if (_view is { })
+                                                {
+                                                    viewPropertiesEditor.ViewToEdit = null;
+                                                    viewFrame.Remove (_view);
+                                                    _view.Dispose ();
+                                                    _view = null;
+                                                }
+
+                                                _view = CreateView (viewClasses [(args.Value as string)!]);
+
+                                                if (_view is { })
+                                                {
+                                                    viewFrame.Add (_view);
+                                                    viewPropertiesEditor.ViewToEdit = _view;
+                                                }
+                                            };
+
+
+        appWindow.Add (themeOptionSelector, themeViewer, allViewsCheckBox, viewListView, viewPropertiesEditor, viewFrame);
+
+        viewListView.SelectedItem = 0;
+
+        themeViewer.SettingSchemeName += (sender, args) =>
+                                         {
+                                             if (_view is { })
+                                             {
+                                                 Application.Top!.SchemeName = args.NewString;
+
+                                                 if (_view.HasScheme)
+                                                 {
+                                                     _view.SetScheme (null);
+                                                 }
+
+                                                 _view.SchemeName = args.NewString;
+                                             }
+                                         };
+
+        AllViewsView? allViewsView = null;
+
+        allViewsCheckBox.CheckedStateChanged += (sender, args) =>
+                                                {
+                                                    if (args.CurrentValue == CheckState.Checked)
+                                                    {
+                                                        viewListView.Visible = false;
+                                                        appWindow.Remove (viewFrame);
+
+                                                        allViewsView = new AllViewsView ()
+                                                        {
+                                                            X = Pos.Right (themeViewer),
+                                                            Y = Pos.Bottom (viewPropertiesEditor),
+                                                            Title = "All Views - Focused: {None}",
+                                                            BorderStyle = LineStyle.Rounded,
+                                                            Width = Dim.Fill (),
+                                                            Height = Dim.Fill (),
+                                                            TabStop = TabBehavior.TabStop
+                                                        };
+
+                                                        allViewsView.FocusedChanged += (s, args) =>
+                                                                                       {
+                                                                                           allViewsView.Title =
+                                                                                               $"All Views - Focused: {args.NewFocused.Title}";
+                                                                                           viewPropertiesEditor.ViewToEdit = args.NewFocused.SubViews.ElementAt(0);
+
+                                                                                       };
+                                                        appWindow.Add (allViewsView);
+                                                    }
+                                                    else
+                                                    {
+                                                        appWindow.Remove (allViewsView);
+                                                        allViewsView.Dispose ();
+                                                        allViewsView = null;
+
+                                                        appWindow.Add (viewFrame);
+                                                        viewListView.Visible = true;
+                                                    }
+                                                };
+
+        // Run - Start the application.
+        Application.Run (appWindow);
+        viewFrame.Dispose ();
+        appWindow.Dispose ();
+
+        // Shutdown - Calling Application.Shutdown is required.
+        Application.Shutdown ();
+    }
+
+    private static List<Type> GetAllViewClassesCollection ()
+    {
+        List<Type> types = typeof (View).Assembly.GetTypes ()
+                                        .Where (
+                                                myType => myType is { IsClass: true, IsAbstract: false, IsPublic: true }
+                                                          && myType.IsSubclassOf (typeof (View)))
+                                        .ToList ();
+
+        types.Add (typeof (View));
+
+        return types;
+    }
+
+    private View? CreateView (Type type)
+    {
+        // If we are to create a generic Type
+        if (type.IsGenericType)
+        {
+            // For each of the <T> arguments
+            List<Type> typeArguments = new ();
+
+            // use <object> or the original type if applicable
+            foreach (Type arg in type.GetGenericArguments ())
+            {
+                if (arg.IsValueType && Nullable.GetUnderlyingType (arg) == null)
+                {
+                    typeArguments.Add (arg);
+                }
+                else
+                {
+                    typeArguments.Add (typeof (object));
+                }
+            }
+
+            // And change what type we are instantiating from MyClass<T> to MyClass<object> or MyClass<T>
+            type = type.MakeGenericType (typeArguments.ToArray ());
+        }
+
+        // Ensure the type does not contain any generic parameters
+        if (type.ContainsGenericParameters)
+        {
+            Logging.Warning ($"Cannot create an instance of {type} because it contains generic parameters.");
+
+            //throw new ArgumentException ($"Cannot create an instance of {type} because it contains generic parameters.");
+            return null;
+        }
+
+        // Instantiate view
+        var view = (View)Activator.CreateInstance (type)!;
+        var demoText = "This, that, and the other thing.";
+
+        if (view is IDesignable designable)
+        {
+            designable.EnableForDesign (ref demoText);
+        }
+        else
+        {
+            view.Text = demoText;
+            view.Title = "_Test Title";
+        }
+
+        view.Initialized += OnViewInitialized;
+
+        return view;
+    }
+
+    private void OnViewInitialized (object? sender, EventArgs e)
+    {
+        if (sender is not View view)
+        {
+            return;
+        }
+
+        if (view.Width == Dim.Absolute (0) || view.Width is null)
+        {
+            view.Width = Dim.Fill ();
+        }
+
+        if (view.Height == Dim.Absolute (0) || view.Height is null)
+        {
+            view.Height = Dim.Fill ();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Examples/UICatalog/Scenarios/Threading.cs b/Examples/UICatalog/Scenarios/Threading.cs
index 69ddbb01c2..0770586d95 100644
--- a/Examples/UICatalog/Scenarios/Threading.cs
+++ b/Examples/UICatalog/Scenarios/Threading.cs
@@ -66,7 +66,7 @@ public override void Main ()
             Y = Pos.Y (_btnActionCancel) + 6,
             Width = 10,
             Height = 10,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"]
+            SchemeName = "TopLevel"
         };
 
         win.Add (new Label { X = Pos.Right (_itemsList) + 10, Y = Pos.Y (_btnActionCancel) + 4, Text = "Task Logs:" });
@@ -77,7 +77,7 @@ public override void Main ()
             Y = Pos.Y (_itemsList),
             Width = 50,
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (_log)
         };
 
diff --git a/Examples/UICatalog/Scenarios/Transparent.cs b/Examples/UICatalog/Scenarios/Transparent.cs
index b80db63fec..5ca1bd7d36 100644
--- a/Examples/UICatalog/Scenarios/Transparent.cs
+++ b/Examples/UICatalog/Scenarios/Transparent.cs
@@ -17,7 +17,7 @@ public override void Main ()
             Title = GetQuitKeyAndName (),
         };
         appWindow.BorderStyle = LineStyle.None;
-        appWindow.ColorScheme = Colors.ColorSchemes ["Error"];
+        appWindow.SchemeName = "Error";
 
         appWindow.Text = "App Text - Centered Vertically and Horizontally.\n2nd Line of Text.\n3rd Line of Text.";
         appWindow.TextAlignment = Alignment.Center;
@@ -45,10 +45,13 @@ public override void Main ()
             Y = 4,
             Title = "_AppButton",
         };
-        appButton.Accepting += (sender, args) => MessageBox.Query ("AppButton", "Transparency is cool!", "_Ok");
+        appButton.Accepting += (sender, args) =>
+                               {
+                                   MessageBox.Query ("AppButton", "Transparency is cool!", "_Ok");
+                                   args.Handled = true;
+                               };
         appWindow.Add (appButton);
 
-
         var tv = new TransparentView ()
         {
             X = 3,
@@ -77,11 +80,11 @@ public TransparentView ()
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Resizable | ViewArrangement.Movable;
             ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent | Terminal.Gui.ViewportSettings.TransparentMouse;
             BorderStyle = LineStyle.RoundedDotted;
-            base.ColorScheme = Colors.ColorSchemes ["Base"];
+            //SchemeName = "Base";
 
             var transparentSubView = new View ()
             {
-                Text = "Sizable/Movable View with border. Should be opaque. The shadow should be semi-opaque.",
+                Text = "Sizable/Movable View with border. Should be opaque. No Shadow.",
                 Id = "transparentSubView",
                 X = 4,
                 Y = 8,
@@ -89,31 +92,36 @@ public TransparentView ()
                 Height = 8,
                 BorderStyle = LineStyle.Dashed,
                 Arrangement = ViewArrangement.Movable | ViewArrangement.Resizable,
-               // ShadowStyle = ShadowStyle.Transparent,
+                // ShadowStyle = ShadowStyle.Transparent,
             };
             transparentSubView.Border!.Thickness = new (1, 1, 1, 1);
-            transparentSubView.ColorScheme = Colors.ColorSchemes ["Dialog"];
-            transparentSubView.Visible = false;
+            transparentSubView.SchemeName = "Dialog";
+            //transparentSubView.Visible = false;
 
             Button button = new Button ()
             {
                 Title = "_Opaque Shadows No Worky",
                 X = Pos.Center (),
                 Y = 2,
-                ColorScheme = Colors.ColorSchemes ["Dialog"],
+                SchemeName = "Dialog",
             };
-            button.Visible = false;
+            button.Accepting += (sender, args) =>
+                                {
+                                    MessageBox.Query ("Clicked!", "Button in Transparent View", "_Ok");
+                                    args.Handled = true;
+                                };
+            //button.Visible = false;
 
 
             var shortcut = new Shortcut ()
             {
                 Id = "shortcut",
                 X = Pos.Center (),
-                Y = Pos.AnchorEnd(),
+                Y = Pos.AnchorEnd (),
                 Title = "A _Shortcut",
                 HelpText = "Help!",
                 Key = Key.F11,
-                ColorScheme = Colors.ColorSchemes ["Base"]
+                SchemeName = "Base"
 
             };
 
@@ -126,6 +134,12 @@ public TransparentView ()
             base.Add (button);
             base.Add (shortcut);
             base.Add (transparentSubView);
+
+            //Padding.Thickness = new (1);
+            //Padding.SchemeName = "Error";
+
+            Margin!.Thickness = new (1);
+           // Margin.ViewportSettings |= Terminal.Gui.ViewportSettings.Transparent;
         }
 
         /// <inheritdoc />
diff --git a/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs b/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
index b194d95179..22a51f04a2 100644
--- a/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
+++ b/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs
@@ -177,7 +177,7 @@ public override void Main ()
         };
         top.Add (menu);
 
-        _treeViewFiles = new() { X = 0, Y = 0, Width = Dim.Percent (50), Height = Dim.Fill () };
+        _treeViewFiles = new () { X = 0, Y = 0, Width = Dim.Percent (50), Height = Dim.Fill () };
         _treeViewFiles.DrawLine += TreeViewFiles_DrawLine;
 
         _treeViewFiles.VerticalScrollBar.AutoShow = false;
@@ -247,15 +247,15 @@ private void SetCustomColors ()
                                          {
                                              if (m is IDirectoryInfo && m.Attributes.HasFlag (FileAttributes.Hidden))
                                              {
-                                                 return new()
+                                                 return new ()
                                                  {
                                                      Focus = new (
                                                                   Color.BrightRed,
-                                                                  _treeViewFiles.ColorScheme.Focus.Background
+                                                                  _treeViewFiles.GetAttributeForRole (VisualRole.Focus).Background
                                                                  ),
                                                      Normal = new (
                                                                    Color.BrightYellow,
-                                                                   _treeViewFiles.ColorScheme.Normal.Background
+                                                                   _treeViewFiles.GetAttributeForRole (VisualRole.Normal).Background
                                                                   )
                                                  };
 
@@ -264,15 +264,15 @@ private void SetCustomColors ()
 
                                              if (m is IFileInfo && m.Attributes.HasFlag (FileAttributes.Hidden))
                                              {
-                                                 return new()
+                                                 return new ()
                                                  {
                                                      Focus = new (
                                                                   Color.BrightRed,
-                                                                  _treeViewFiles.ColorScheme.Focus.Background
+                                                                  _treeViewFiles.GetAttributeForRole (VisualRole.Focus).Background
                                                                  ),
                                                      Normal = new (
                                                                    Color.BrightYellow,
-                                                                   _treeViewFiles.ColorScheme.Normal.Background
+                                                                   _treeViewFiles.GetAttributeForRole (VisualRole.Normal).Background
                                                                   )
                                                  };
 
@@ -447,7 +447,8 @@ private void TreeViewFiles_DrawLine (object sender, DrawTreeViewLineEventArgs<IF
 
                     cell.Attribute = new Attribute (
                                                     Color.BrightYellow,
-                                                    cell.Attribute!.Value.Background
+                                                    cell.Attribute!.Value.Background,
+                                                    cell.Attribute!.Value.Style
                                                    );
                 }
             }
diff --git a/Examples/UICatalog/Scenarios/TrueColors.cs b/Examples/UICatalog/Scenarios/TrueColors.cs
index a401149844..16b623b1c8 100644
--- a/Examples/UICatalog/Scenarios/TrueColors.cs
+++ b/Examples/UICatalog/Scenarios/TrueColors.cs
@@ -105,19 +105,19 @@ public override void Main ()
 
                                       if (e.Flags == MouseFlags.Button1Clicked)
                                       {
-                                          Attribute normal = e.View.GetNormalColor ();
+                                          Attribute normal = e.View.GetAttributeForRole (VisualRole.Normal);
 
-                                          lblLighter.ColorScheme = new (e.View.ColorScheme)
+                                          lblLighter.SetScheme (new (e.View.GetScheme ())
                                           {
                                               Normal = new (
                                                             normal.Foreground,
-                                                            normal.Background.GetHighlightColor ()
+                                                            normal.Background.GetBrighterColor ()
                                                            )
-                                          };
+                                          });
                                       }
                                       else
                                       {
-                                          Attribute normal = e.View.GetNormalColor ();
+                                          Attribute normal = e.View.GetAttributeForRole (VisualRole.Normal);
                                           lblRed.Text = normal.Foreground.R.ToString ();
                                           lblGreen.Text = normal.Foreground.G.ToString ();
                                           lblBlue.Text = normal.Foreground.B.ToString ();
@@ -140,16 +140,15 @@ void SetupGradient (string name, int x, ref int y, Func<int, Color> colorFunc)
                 var l = new Label
                 {
                     X = dx++,
-                    Y = y,
-                    ColorScheme = new()
-                    {
-                        Normal = new (
-                                      colorFunc (Math.Clamp (i, 0, 255)),
-                                      colorFunc (Math.Clamp (i, 0, 255))
-                                     )
-                    },
-                    Text = " "
+                    Y = y
                 };
+                l.SetScheme (new ()
+                {
+                    Normal = new (
+                                  colorFunc (Math.Clamp (i, 0, 255)),
+                                  colorFunc (Math.Clamp (i, 0, 255))
+                                 )
+                });
                 app.Add (l);
             }
 
diff --git a/Examples/UICatalog/Scenarios/ViewportSettings.cs b/Examples/UICatalog/Scenarios/ViewportSettings.cs
index dcaef47c09..964ae24c48 100644
--- a/Examples/UICatalog/Scenarios/ViewportSettings.cs
+++ b/Examples/UICatalog/Scenarios/ViewportSettings.cs
@@ -19,7 +19,7 @@ public ViewportSettingsDemoView ()
             Id = "ViewportSettingsDemoView";
             Width = Dim.Fill ();
             Height = Dim.Fill ();
-            base.ColorScheme = Colors.ColorSchemes ["Base"];
+            SchemeName = "base";
 
             base.Text =
                 "Text (ViewportSettingsDemoView.Text). This is long text.\nThe second line.\n3\n4\n5th line\nLine 6. This is a longer line that should wrap automatically.";
@@ -103,13 +103,13 @@ public override void Main ()
             Title = GetQuitKeyAndName (),
 
             // Use a different colorscheme so ViewSettings.ClearContentOnly is obvious
-            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            SchemeName = "Toplevel",
             BorderStyle = LineStyle.None
         };
 
         var adornmentsEditor = new AdornmentsEditor
         {
-            X = Pos.AnchorEnd(),
+            X = Pos.AnchorEnd (),
             AutoSelectViewToEdit = true,
             ShowViewIdentifier = true
         };
@@ -117,7 +117,7 @@ public override void Main ()
 
         ViewportSettingsEditor viewportSettingsEditor = new ViewportSettingsEditor ()
         {
-            Y = Pos.AnchorEnd(),
+            Y = Pos.AnchorEnd (),
             //X = Pos.Right (adornmentsEditor),
         };
         app.Add (viewportSettingsEditor);
@@ -125,7 +125,7 @@ public override void Main ()
         var view = new ViewportSettingsDemoView
         {
             Title = "ViewportSettings Demo View",
-            Width = Dim.Fill (Dim.Func (() => app.IsInitialized ? adornmentsEditor.Frame.Width+1: 1)),
+            Width = Dim.Fill (Dim.Func (() => app.IsInitialized ? adornmentsEditor.Frame.Width + 1 : 1)),
             Height = Dim.Fill (Dim.Func (() => app.IsInitialized ? viewportSettingsEditor.Frame.Height : 1))
         };
 
@@ -139,13 +139,14 @@ public override void Main ()
 
         colorPicker.ColorChanged += (s, e) =>
                                     {
-                                        colorPicker.SuperView.ColorScheme = new (colorPicker.SuperView.ColorScheme)
-                                        {
-                                            Normal = new (
-                                                          colorPicker.SuperView.ColorScheme.Normal.Foreground,
-                                                          e.CurrentValue
-                                                         )
-                                        };
+                                        colorPicker.SuperView!.SetScheme (
+                                                                         new (colorPicker.SuperView.GetScheme ())
+                                                                         {
+                                                                             Normal = new (
+                                                                                           colorPicker.SuperView.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                                           e.CurrentValue
+                                                                                          )
+                                                                         });
                                     };
 
         var textView = new TextView
diff --git a/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs b/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs
index 5d5182d053..9b70240563 100644
--- a/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs
+++ b/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs
@@ -31,7 +31,7 @@ public override void Main ()
 
         var inputHorizontalRuler = new Label
         {
-            Y = Pos.Bottom (btnInput), Width = Dim.Fill (), ColorScheme = Colors.ColorSchemes ["Error"]
+            Y = Pos.Bottom (btnInput), Width = Dim.Fill (), SchemeName = "Error"
         };
         win.Add (inputHorizontalRuler);
 
@@ -41,7 +41,7 @@ public override void Main ()
 
             Width = 1,
             Height = Dim.Percent (50),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             TextDirection = TextDirection.TopBottom_LeftRight
         };
         win.Add (inputVerticalRuler);
@@ -67,7 +67,7 @@ public override void Main ()
             Y = Pos.Bottom (btnOutput),
 
             Width = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Error"]
+            SchemeName = "Error"
         };
         win.Add (outputHorizontalRuler);
 
@@ -77,7 +77,7 @@ public override void Main ()
 
             Width = 1,
             Height = Dim.Fill (),
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             TextDirection = TextDirection.TopBottom_LeftRight
         };
         win.Add (outputVerticalRuler);
diff --git a/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs b/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
index f15bcabfe8..3569457fcc 100644
--- a/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
+++ b/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs
@@ -40,7 +40,7 @@ static int About ()
             Y = 1,
             Width = Dim.Fill (15),
             Height = 10,
-            ColorScheme = Colors.ColorSchemes ["Dialog"],
+            SchemeName = "Dialog",
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Movable | ViewArrangement.Resizable
         };
         win.Padding.Thickness = new (padding);
@@ -50,7 +50,7 @@ static int About ()
         {
             X = Pos.Center (),
             Y = 0,
-            ColorScheme = Colors.ColorSchemes ["Error"],
+            SchemeName = "Error",
             Text = $"Padding of container is {padding}"
         };
         paddingButton.Accepting += (s, e) => About ();
@@ -61,7 +61,7 @@ static int About ()
                  {
                      X = Pos.Center (),
                      Y = Pos.AnchorEnd (),
-                     ColorScheme = Colors.ColorSchemes ["Error"],
+                     SchemeName = "Error",
                      Text = "Press ME! (Y = Pos.AnchorEnd(1))"
                  }
                 );
@@ -81,7 +81,7 @@ static int About ()
         {
             Window loopWin = null;
 
-            loopWin = new()
+            loopWin = new ()
             {
                 Title = $"{listWin.Count} - Window Loop - padding = {pad}",
                 X = margin,
@@ -92,11 +92,11 @@ static int About ()
             };
             loopWin.Padding.Thickness = new (pad);
 
-            loopWin.ColorScheme = Colors.ColorSchemes ["Dialog"];
+            loopWin.SchemeName = "Dialog";
 
             var pressMeButton = new Button
             {
-                X = Pos.Center (), Y = 0, ColorScheme = Colors.ColorSchemes ["Error"], Text = "Press me! (Y = 0)",
+                X = Pos.Center (), Y = 0, SchemeName = "Error", Text = "Press me! (Y = 0)",
             };
 
             pressMeButton.Accepting += (s, e) =>
@@ -110,14 +110,14 @@ static int About ()
                 Y = 1,
                 Width = Dim.Percent (50),
                 Height = 5,
-                ColorScheme = Colors.ColorSchemes ["Base"],
+                SchemeName = "Base",
                 Text = "The Text in the Window",
                 Arrangement = ViewArrangement.Overlapped | ViewArrangement.Movable | ViewArrangement.Resizable
 
             };
 
             subWin.Add (
-                        new TextField { Y = 1, ColorScheme = Colors.ColorSchemes ["Error"], Text = "Edit me! " + loopWin.Title }
+                        new TextField { Y = 1, SchemeName = "Error", Text = "Edit me! " + loopWin.Title }
                        );
             loopWin.Add (subWin);
 
@@ -127,7 +127,7 @@ static int About ()
                 Y = 1,
                 Width = Dim.Percent (100, DimPercentMode.Position), // Or Dim.Percent (50)
                 Height = 5,
-                ColorScheme = Colors.ColorSchemes ["Base"],
+                SchemeName = "Base",
                 Text = "The Text in the FrameView",
                 Title = "This is a Sub-FrameView"
             };
@@ -143,7 +143,7 @@ static int About ()
 
         FrameView frame = null;
 
-        frame = new()
+        frame = new ()
         {
             X = margin,
             Y = Pos.Bottom (listWin.Last ()) + margin / 2,
@@ -151,12 +151,12 @@ static int About ()
             Height = contentHeight + 2, // 2 for default padding
             Title = "This is a FrameView"
         };
-        frame.ColorScheme = Colors.ColorSchemes ["Dialog"];
+        frame.SchemeName = "Dialog";
 
         frame.Add (
                    new Label
                    {
-                       X = Pos.Center (), Y = 0, ColorScheme = Colors.ColorSchemes ["Error"], Text = "This is a Label! (Y = 0)"
+                       X = Pos.Center (), Y = 0, SchemeName = "Error", Text = "This is a Label! (Y = 0)"
                    }
                   );
 
@@ -167,14 +167,14 @@ static int About ()
             Y = 1,
             Width = Dim.Percent (50),
             Height = Dim.Fill () - 1,
-            ColorScheme = Colors.ColorSchemes ["Base"],
+            SchemeName = "Base",
             Text = "The Text in the Window",
             Arrangement = ViewArrangement.Overlapped | ViewArrangement.Movable | ViewArrangement.Resizable
 
         };
 
         subWinofFV.Add (
-                        new TextField { ColorScheme = Colors.ColorSchemes ["Error"], Text = "Edit Me" }
+                        new TextField { SchemeName = "Error", Text = "Edit Me" }
                        );
 
         subWinofFV.Add (new CheckBox { Y = 1, Text = "Check me" });
@@ -188,7 +188,7 @@ static int About ()
             Y = 1,
             Width = Dim.Percent (100),
             Height = Dim.Fill () - 1,
-            ColorScheme = Colors.ColorSchemes ["Base"],
+            SchemeName = "Base",
             Text = "The Text in the FrameView",
             Title = "this is a Sub-FrameView"
         };
@@ -209,7 +209,7 @@ static int About ()
         app.Add (frame);
         listWin.Add (frame);
 
-        app.ColorScheme = Colors.ColorSchemes ["Base"];
+        app.SchemeName = "Base";
 
         Application.Run (app);
         app.Dispose ();
diff --git a/Examples/UICatalog/Scenarios/Wizards.cs b/Examples/UICatalog/Scenarios/Wizards.cs
index df7b1f97ef..734ce57cb3 100644
--- a/Examples/UICatalog/Scenarios/Wizards.cs
+++ b/Examples/UICatalog/Scenarios/Wizards.cs
@@ -21,7 +21,7 @@ public override void Main ()
             X = Pos.Center (),
             Y = 0,
             Width = Dim.Percent (75),
-            ColorScheme = Colors.ColorSchemes ["Base"],
+            SchemeName = "Base",
             Title = "Wizard Options"
         };
         win.Add (frame);
@@ -99,7 +99,7 @@ void Win_Loaded (object sender, EventArgs args)
 
         var actionLabel = new Label
         {
-            X = Pos.Right (label), Y = Pos.AnchorEnd (1), ColorScheme = Colors.ColorSchemes ["Error"]
+            X = Pos.Right (label), Y = Pos.AnchorEnd (1), SchemeName = "Error"
         };
         win.Add (actionLabel);
 
@@ -278,7 +278,7 @@ void Win_Loaded (object sender, EventArgs args)
                                                Width = Dim.Fill (),
                                                WordWrap = true,
                                                AllowsTab = false,
-                                               ColorScheme = Colors.ColorSchemes ["Base"]
+                                               SchemeName = "Base"
                                            };
 
                                            someText.Height = Dim.Fill (
diff --git a/Examples/UICatalog/UICatalog.cs b/Examples/UICatalog/UICatalog.cs
index 6b50fd5083..4b9d09f62e 100644
--- a/Examples/UICatalog/UICatalog.cs
+++ b/Examples/UICatalog/UICatalog.cs
@@ -14,7 +14,6 @@
 using Serilog.Core;
 using Serilog.Events;
 using Terminal.Gui;
-using static Terminal.Gui.ConfigurationManager;
 using Command = Terminal.Gui.Command;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
@@ -77,6 +76,13 @@ private static int Main (string [] args)
         driverOption.AddAlias ("-d");
         driverOption.AddAlias ("--d");
 
+        // Configuration Management
+        Option<bool> disableConfigManagement = new (
+                                                    "--disable-cm",
+                                                    "Indicates Configuration Management should not be enabled. Only `ConfigLocations.HardCoded` settings will be loaded.");
+        disableConfigManagement.AddAlias ("-dcm");
+        disableConfigManagement.AddAlias ("--dcm");
+
         Option<bool> benchmarkFlag = new ("--benchmark", "Enables benchmarking. If a Scenario is specified, just that Scenario will be benchmarked.");
         benchmarkFlag.AddAlias ("-b");
         benchmarkFlag.AddAlias ("--b");
@@ -109,13 +115,13 @@ private static int Main (string [] args)
                                                                   getDefaultValue: () => "none"
                                                                  ).FromAmong (
                                                                               UICatalogTop.CachedScenarios.Select (s => s.GetName ())
-                                                                                               .Append ("none")
-                                                                                               .ToArray ()
+                                                                                          .Append ("none")
+                                                                                          .ToArray ()
                                                                              );
 
         var rootCommand = new RootCommand ("A comprehensive sample library and test app for Terminal.Gui")
         {
-            scenarioArgument, debugLogLevel, benchmarkFlag, benchmarkTimeout, resultsFile, driverOption
+            scenarioArgument, debugLogLevel, benchmarkFlag, benchmarkTimeout, resultsFile, driverOption, disableConfigManagement
         };
 
         rootCommand.SetHandler (
@@ -125,6 +131,7 @@ private static int Main (string [] args)
                                     {
                                         Scenario = context.ParseResult.GetValueForArgument (scenarioArgument),
                                         Driver = context.ParseResult.GetValueForOption (driverOption) ?? string.Empty,
+                                        DontEnableConfigurationManagement = context.ParseResult.GetValueForOption (disableConfigManagement),
                                         Benchmark = context.ParseResult.GetValueForOption (benchmarkFlag),
                                         BenchmarkTimeout = context.ParseResult.GetValueForOption (benchmarkTimeout),
                                         ResultsFile = context.ParseResult.GetValueForOption (resultsFile) ?? string.Empty,
@@ -217,16 +224,7 @@ private static Scenario RunUICatalogTopLevel ()
 
         Application.Init (driverName: _forceDriver);
 
-        if (string.IsNullOrWhiteSpace (UICatalogTop.CachedTheme))
-        {
-            UICatalogTop.CachedTheme = Themes?.Theme;
-        }
-        else
-        {
-            Themes!.Theme = UICatalogTop.CachedTheme;
-        }
-
-        UICatalogTop top = Application.Run<UICatalogTop> ();
+        var top = Application.Run<UICatalogTop> ();
         top.Dispose ();
         Application.Shutdown ();
         VerifyObjectsWereDisposed ();
@@ -308,14 +306,13 @@ private static void ConfigFileChanged (object sender, FileSystemEventArgs e)
             return;
         }
 
-        Load ();
-        Apply ();
+        Logging.Debug ($"{e.FullPath} {e.ChangeType} - Loading and Applying");
+        ConfigurationManager.Load (ConfigLocations.All);
+        ConfigurationManager.Apply ();
     }
 
     private static void UICatalogMain (UICatalogCommandLineOptions options)
     {
-        StartConfigFileWatcher ();
-
         // By setting _forceDriver we ensure that if the user has specified a driver on the command line, it will be used
         // regardless of what's in a config file.
         Application.ForceDriver = _forceDriver = options.Driver;
@@ -324,12 +321,17 @@ private static void UICatalogMain (UICatalogCommandLineOptions options)
         // run it and exit when done.
         if (options.Scenario != "none")
         {
+            if (!Options.DontEnableConfigurationManagement)
+            {
+                ConfigurationManager.Enable (ConfigLocations.All);
+            }
+
             int item = UICatalogTop.CachedScenarios!.IndexOf (
-                                                                   UICatalogTop.CachedScenarios!.FirstOrDefault (
-                                                                        s =>
-                                                                            s.GetName ()
-                                                                             .Equals (options.Scenario, StringComparison.OrdinalIgnoreCase)
-                                                                       )!);
+                                                              UICatalogTop.CachedScenarios!.FirstOrDefault (
+                                                                   s =>
+                                                                       s.GetName ()
+                                                                        .Equals (options.Scenario, StringComparison.OrdinalIgnoreCase)
+                                                                  )!);
             UICatalogTop.CachedSelectedScenario = (Scenario)Activator.CreateInstance (UICatalogTop.CachedScenarios [item].GetType ())!;
 
             BenchmarkResults? results = RunScenario (UICatalogTop.CachedSelectedScenario, options.Benchmark);
@@ -358,14 +360,18 @@ private static void UICatalogMain (UICatalogCommandLineOptions options)
             return;
         }
 
-
 #if DEBUG_IDISPOSABLE
         View.EnableDebugIDisposableAsserts = true;
 #endif
 
-        while (RunUICatalogTopLevel () is { } scenario)
+        if (!Options.DontEnableConfigurationManagement)
         {
+            ConfigurationManager.Enable (ConfigLocations.All);
+            StartConfigFileWatcher ();
+        }
 
+        while (RunUICatalogTopLevel () is { } scenario)
+        {
 #if DEBUG_IDISPOSABLE
             VerifyObjectsWereDisposed ();
 
diff --git a/Examples/UICatalog/UICatalog.csproj b/Examples/UICatalog/UICatalog.csproj
index 40dc982c85..b1aa4908ea 100644
--- a/Examples/UICatalog/UICatalog.csproj
+++ b/Examples/UICatalog/UICatalog.csproj
@@ -27,14 +27,14 @@
         <None Update="Scenarios\AnimationScenario\Spinning_globe_dark_small.gif" CopyToOutputDirectory="PreserveNewest" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations"  PrivateAssets="all" />
-        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"/>
+        <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
         <PackageReference Include="Serilog" />
         <PackageReference Include="Serilog.Extensions.Logging" />
-        <PackageReference Include="Serilog.Sinks.Debug"  />
+        <PackageReference Include="Serilog.Sinks.Debug" />
         <PackageReference Include="Serilog.Sinks.File" />
         <PackageReference Include="SixLabors.ImageSharp" />
-        <PackageReference Include="CsvHelper"  />
+        <PackageReference Include="CsvHelper" />
         <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
         <PackageReference Include="System.CommandLine" V="" />
     </ItemGroup>
diff --git a/Examples/UICatalog/UICatalogCommandLineOptions.cs b/Examples/UICatalog/UICatalogCommandLineOptions.cs
index c39b9f2b27..b297c06ee4 100644
--- a/Examples/UICatalog/UICatalogCommandLineOptions.cs
+++ b/Examples/UICatalog/UICatalogCommandLineOptions.cs
@@ -5,6 +5,8 @@ public struct UICatalogCommandLineOptions
 {
     public string Driver { get; set; }
 
+    public bool DontEnableConfigurationManagement { get; set; }
+
     public string Scenario { get; set; }
 
     public uint BenchmarkTimeout { get; set; }
diff --git a/Examples/UICatalog/UICatalogTop.cs b/Examples/UICatalog/UICatalogTop.cs
index c5fc081338..6dd78e7a48 100644
--- a/Examples/UICatalog/UICatalogTop.cs
+++ b/Examples/UICatalog/UICatalogTop.cs
@@ -1,12 +1,10 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
 using Terminal.Gui;
-using static Terminal.Gui.ConfigurationManager;
 using Command = Terminal.Gui.Command;
 using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
 
@@ -24,13 +22,10 @@ public class UICatalogTop : Toplevel
     // members are cached so that when the scenario exits the
     // main app UI can be restored to previous state
 
-    // Theme Management
-    public static string? CachedTheme { get; set; }
-
     // Note, we used to pass this to scenarios that run, but it just added complexity
     // So that was removed. But we still have this here to demonstrate how changing
     // the scheme works.
-    public static string? CachedTopLevelColorScheme { get; set; }
+    public static string? CachedTopLevelScheme { get; set; }
 
     // Diagnostics
     private static ViewDiagnosticFlags _diagnosticFlags;
@@ -53,7 +48,8 @@ public UICatalogTop ()
         _categoryList.SelectedItem = _cachedCategoryIndex;
         _scenarioList.SelectedRow = _cachedScenarioIndex;
 
-        Applied += ConfigAppliedHandler;
+        SchemeName = CachedTopLevelScheme = SchemeManager.SchemesToSchemeName (Schemes.Base);
+        ConfigurationManager.Applied += ConfigAppliedHandler;
     }
 
 
@@ -68,7 +64,7 @@ private void LoadedHandler (object? sender, EventArgs? args)
 
         if (_shVersion is { })
         {
-            _shVersion.Title = $"{RuntimeEnvironment.OperatingSystem} {RuntimeEnvironment.OperatingSystemVersion}, {Driver!.GetVersionInfo ()}";
+            _shVersion.Title = $"{RuntimeEnvironment.OperatingSystem} {RuntimeEnvironment.OperatingSystemVersion}, {Application.Driver!.GetVersionInfo ()}";
         }
 
         if (CachedSelectedScenario != null)
@@ -90,14 +86,11 @@ private void LoadedHandler (object? sender, EventArgs? args)
         Loaded -= LoadedHandler;
         _categoryList!.EnsureSelectedItemVisible ();
         _scenarioList.EnsureSelectedCellIsVisible ();
-
-        Apply ();
-
     }
 
     private void UnloadedHandler (object? sender, EventArgs? args)
     {
-        Applied -= ConfigAppliedHandler;
+        ConfigurationManager.Applied -= ConfigAppliedHandler;
         Unloaded -= UnloadedHandler;
     }
 
@@ -191,59 +184,73 @@ View [] CreateThemeMenuItems ()
 
             menuItems.Add (new Line ());
 
-            _themesRg = new ()
-            {
-                HighlightStyle = HighlightStyle.None,
-                SelectedItem = Themes.Keys.ToList ().IndexOf (CachedTheme!.Replace ("_", string.Empty))
-            };
-
-            _themesRg.SelectedItemChanged += (_, args) =>
-            {
-                Themes!.Theme = Themes!.Keys.ToArray () [args.SelectedItem!.Value];
-                CachedTheme = Themes!.Keys.ToArray () [args.SelectedItem!.Value];
-                Apply ();
-                SetNeedsDraw ();
-            };
-
-            var menuItem = new MenuItemv2
+            if (ConfigurationManager.IsEnabled)
             {
-                CommandView = _themesRg,
-                HelpText = "Cycle Through Themes",
-                Key = Key.T.WithCtrl
-            };
-            menuItems.Add (menuItem);
+                _themesRg = new ()
+                {
+                    HighlightStyle = HighlightStyle.None,
+                };
 
-            menuItems.Add (new Line ());
+                _themesRg.SelectedItemChanged += (_, args) =>
+                                                 {
+                                                     if (args.SelectedItem is null)
+                                                     {
+                                                         return;
+                                                     }
+                                                     ThemeManager.Theme = ThemeManager.GetThemeNames () [args.SelectedItem!.Value];
+                                                 };
 
-            _topSchemeRg = new ()
-            {
-                HighlightStyle = HighlightStyle.None,
-                SelectedItem = Colors.ColorSchemes.Keys.ToList().IndexOf(CachedTopLevelColorScheme!)
-            };
+                var menuItem = new MenuItemv2
+                {
+                    CommandView = _themesRg,
+                    HelpText = "Cycle Through Themes",
+                    Key = Key.T.WithCtrl
+                };
+                menuItems.Add (menuItem);
 
-            _topSchemeRg.SelectedItemChanged += (_, args) =>
-            {
-                CachedTopLevelColorScheme = Colors.ColorSchemes.Keys.ToArray () [args.SelectedItem!.Value];
-                ColorScheme = Colors.ColorSchemes [CachedTopLevelColorScheme];
-                SetNeedsDraw ();
-            };
+                menuItems.Add (new Line ());
 
-            menuItem = new ()
+                _topSchemeRg = new ()
+                {
+                    HighlightStyle = HighlightStyle.None,
+                };
+
+                _topSchemeRg.SelectedItemChanged += (_, args) =>
+                                                    {
+                                                        if (args.SelectedItem is null)
+                                                        {
+                                                            return;
+                                                        }
+                                                        CachedTopLevelScheme = SchemeManager.GetSchemesForCurrentTheme ()!.Keys.ToArray () [args.SelectedItem!.Value];
+                                                        SchemeName = CachedTopLevelScheme;
+                                                        SetNeedsDraw ();
+                                                    };
+
+                menuItem = new ()
+                {
+                    Title = "Scheme for Toplevel",
+                    SubMenu = new (
+                                   [
+                                       new ()
+                                       {
+                                           CommandView = _topSchemeRg,
+                                           HelpText = "Cycle Through schemes",
+                                           Key = Key.S.WithCtrl
+                                       }
+                                   ])
+                };
+                menuItems.Add (menuItem);
+
+                UpdateThemesMenu ();
+            }
+            else
             {
-                Title = "Color Scheme for Application._Top",
-                SubMenu = new (
-                               [
-                                   new ()
-                               {
-                                   CommandView = _topSchemeRg,
-                                   HelpText = "Cycle Through Color Schemes",
-                                   Key = Key.S.WithCtrl
-                               }
-                               ])
-            };
-            menuItems.Add (menuItem);
-
-            UpdateThemesMenu ();
+                menuItems.Add (new MenuItemv2 ()
+                {
+                    Title = "Configuration Manager is not Enabled",
+                    Enabled = false
+                });
+            }
 
             return menuItems.ToArray ();
         }
@@ -346,10 +353,11 @@ private void UpdateThemesMenu ()
             return;
         }
 
+        _themesRg.SelectedItem = null;
         _themesRg.AssignHotKeysToCheckBoxes = true;
         _themesRg.UsedHotKeys.Clear ();
-        _themesRg.Options = Themes!.Keys.ToArray ();
-        _themesRg.SelectedItem = Themes.Keys.ToList ().IndexOf (CachedTheme!.Replace ("_", string.Empty));
+        _themesRg.Options = ThemeManager.GetThemeNames ();
+        _themesRg.SelectedItem =ThemeManager.GetThemeNames ().IndexOf (ThemeManager.GetCurrentThemeName ());
 
         if (_topSchemeRg is null)
         {
@@ -358,16 +366,21 @@ private void UpdateThemesMenu ()
 
         _topSchemeRg.AssignHotKeysToCheckBoxes = true;
         _topSchemeRg.UsedHotKeys.Clear ();
-        int? selected = _topSchemeRg.SelectedItem;
-        _topSchemeRg.Options = Colors.ColorSchemes.Keys.ToArray ();
-        _topSchemeRg.SelectedItem = selected;
+        int? selectedScheme = _topSchemeRg.SelectedItem;
+        _topSchemeRg.Options = SchemeManager.GetSchemeNames ();
+        _topSchemeRg.SelectedItem = selectedScheme;
 
-        if (CachedTopLevelColorScheme is null || !Colors.ColorSchemes.ContainsKey (CachedTopLevelColorScheme))
+        if (CachedTopLevelScheme is null || !SchemeManager.GetSchemeNames ().Contains (CachedTopLevelScheme))
         {
-            CachedTopLevelColorScheme = "Base";
+            CachedTopLevelScheme = SchemeManager.SchemesToSchemeName (Schemes.Base);
         }
 
-        _topSchemeRg.SelectedItem = Array.IndexOf (Colors.ColorSchemes.Keys.ToArray (), CachedTopLevelColorScheme);
+        int newSelectedItem = SchemeManager.GetSchemeNames ().IndexOf (CachedTopLevelScheme!);
+        // if the item is in bounds then select it
+        if (newSelectedItem >= 0 && newSelectedItem < SchemeManager.GetSchemeNames ().Count)
+        {
+            _topSchemeRg.SelectedItem = newSelectedItem;
+        }
     }
 
     #endregion MenuBar
@@ -564,7 +577,7 @@ private void CategoryView_SelectedChanged (object? sender, ListViewItemEventArgs
 
     private readonly StatusBar? _statusBar;
 
-    [SerializableConfigurationProperty (Scope = typeof (AppScope), OmitClassName = true)]
+    [ConfigurationProperty (Scope = typeof (AppSettingsScope), OmitClassName = true)]
     [JsonPropertyName ("UICatalog.StatusBar")]
     public static bool ShowStatusBar { get; set; } = true;
 
@@ -642,6 +655,11 @@ private StatusBar CreateStatusBar ()
                        _shVersion
                       );
 
+        if (UICatalog.Options.DontEnableConfigurationManagement)
+        {
+            statusBar.AddShortcutAt (statusBar.SubViews.ToList ().IndexOf (_shVersion), new Shortcut () { Title = "CM is Disabled" });
+        }
+
         return statusBar;
     }
 
@@ -654,11 +672,9 @@ private StatusBar CreateStatusBar ()
     /// </summary>
     private void ConfigApplied ()
     {
-        CachedTheme = Themes?.Theme;
-
         UpdateThemesMenu ();
 
-        ColorScheme = Colors.ColorSchemes [CachedTopLevelColorScheme!];
+        SchemeName = CachedTopLevelScheme;
 
         if (_shQuit is { })
         {
diff --git a/Terminal.Gui/Application/Application.Driver.cs b/Terminal.Gui/Application/Application.Driver.cs
index 23844adcc1..e66c5dc963 100644
--- a/Terminal.Gui/Application/Application.Driver.cs
+++ b/Terminal.Gui/Application/Application.Driver.cs
@@ -14,7 +14,7 @@ public static partial class Application // Driver abstractions
     ///     <see cref="ColorName16"/>. The default is <see langword="false"/>, meaning 24-bit (TrueColor) colors will be output
     ///     as long as the selected <see cref="IConsoleDriver"/> supports TrueColor.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static bool Force16Colors { get; set; }
 
     // BUGBUG: ForceDriver should be nullable.
@@ -26,7 +26,7 @@ public static partial class Application // Driver abstractions
     ///     Note, <see cref="Application.Init(IConsoleDriver, string)"/> will override this configuration setting if called
     ///     with either `driver` or `driverName` specified.
     /// </remarks>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static string ForceDriver { get; set; } = string.Empty;
 
     /// <summary>
diff --git a/Terminal.Gui/Application/Application.Initialization.cs b/Terminal.Gui/Application/Application.Initialization.cs
index 30f2f58216..e5dca86b62 100644
--- a/Terminal.Gui/Application/Application.Initialization.cs
+++ b/Terminal.Gui/Application/Application.Initialization.cs
@@ -7,6 +7,7 @@ namespace Terminal.Gui;
 
 public static partial class Application // Initialization (Init/Shutdown)
 {
+
     /// <summary>Initializes a new instance of a Terminal.Gui Application. <see cref="Shutdown"/> must be called when the application is closing.</summary>
     /// <para>Call this method once per instance (or after <see cref="Shutdown"/> has been called).</para>
     /// <para>
@@ -95,19 +96,17 @@ internal static void InternalInit (
 
             if (driver is FakeDriver)
             {
-                // We're running unit tests. Disable loading config files other than default
-                if (Locations == ConfigLocations.All)
-                {
-                    Locations = ConfigLocations.Default;
-                    Reset ();
-                }
+                //// We're running unit tests. Disable loading config files other than default
+                //if (Locations == ConfigLocations.All)
+                //{
+                //    Locations = ConfigLocations.Default;
+                //    ResetAllSettings ();
+                //}
             }
         }
 
         AddKeyBindings ();
 
-        InitializeConfigurationManagement ();
-
         // Ignore Configuration for ForceDriver if driverName is specified
         if (!string.IsNullOrEmpty (driverName))
         {
@@ -177,25 +176,6 @@ internal static void InternalInit (
         InitializedChanged?.Invoke (null, new (init));
     }
 
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    internal static void InitializeConfigurationManagement ()
-    {
-        // Start the process of configuration management.
-        // Note that we end up calling LoadConfigurationFromAllSources
-        // multiple times. We need to do this because some settings are only
-        // valid after a Driver is loaded. In this case we need just
-        // `Settings` so we can determine which driver to use.
-        // Don't reset, so we can inherit the theme from the previous run.
-        string previousTheme = Themes?.Theme ?? string.Empty;
-        Load ();
-        if (Themes is { } && !string.IsNullOrEmpty (previousTheme) && previousTheme != "Default")
-        {
-            ThemeManager.SelectedTheme = previousTheme;
-        }
-        Apply ();
-    }
-
     internal static void SubscribeDriverEvents ()
     {
         ArgumentNullException.ThrowIfNull (Driver);
diff --git a/Terminal.Gui/Application/Application.Keyboard.cs b/Terminal.Gui/Application/Application.Keyboard.cs
index b2b6aa41a9..4e586ac190 100644
--- a/Terminal.Gui/Application/Application.Keyboard.cs
+++ b/Terminal.Gui/Application/Application.Keyboard.cs
@@ -118,7 +118,7 @@ public static bool RaiseKeyDownEvent (Key key)
     }
 
     /// <summary>
-    ///     Invokes an Application-bound commmand.
+    ///     Invokes an Application-bound command.
     /// </summary>
     /// <param name="command">The Command to invoke</param>
     /// <param name="key">The Application-bound Key that was pressed.</param>
@@ -185,6 +185,9 @@ public static bool RaiseKeyUpEvent (Key key)
             return true;
         }
 
+
+        // TODO: Add Popover support
+
         foreach (Toplevel topLevel in TopLevels.ToList ())
         {
             if (topLevel.NewKeyUpEvent (key))
@@ -203,7 +206,10 @@ public static bool RaiseKeyUpEvent (Key key)
 
     #region Application-scoped KeyBindings
 
-    static Application () { AddKeyBindings (); }
+    static Application ()
+    {
+        AddKeyBindings ();
+    }
 
     /// <summary>Gets the Application-scoped key bindings.</summary>
     public static KeyBindings KeyBindings { get; internal set; } = new (null);
@@ -277,13 +283,7 @@ internal static void AddKeyBindings ()
                         return false;
                     });
 
-        // Resources/config.json overrides
-        QuitKey = Key.Esc;
-        NextTabKey = Key.Tab;
-        PrevTabKey = Key.Tab.WithShift;
-        NextTabGroupKey = Key.F6;
-        PrevTabGroupKey = Key.F6.WithShift;
-        ArrangeKey = Key.F5.WithCtrl;
+        //SetKeysToHardCodedDefaults ();
 
         // Need to clear after setting the above to ensure actually clear
         // because set_QuitKey etc.. may call Add
diff --git a/Terminal.Gui/Application/Application.Mouse.cs b/Terminal.Gui/Application/Application.Mouse.cs
index acc5cbc955..0febcfb476 100644
--- a/Terminal.Gui/Application/Application.Mouse.cs
+++ b/Terminal.Gui/Application/Application.Mouse.cs
@@ -6,19 +6,22 @@ namespace Terminal.Gui;
 
 public static partial class Application // Mouse handling
 {
-    internal static Point? _lastMousePosition;
+    /// <summary>
+    /// INTERNAL API: Holds the last mouse position.
+    /// </summary>
+    internal static Point? LastMousePosition { get; set; }
 
     /// <summary>
     ///     Gets the most recent position of the mouse.
     /// </summary>
-    public static Point? GetLastMousePosition () { return _lastMousePosition; }
+    public static Point? GetLastMousePosition () { return LastMousePosition; }
 
     /// <summary>Disable or enable the mouse. The mouse is enabled by default.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static bool IsMouseDisabled { get; set; }
 
-    /// <summary>The current <see cref="View"/> object that wants continuous mouse button pressed events.</summary>
-    public static View? WantContinuousButtonPressedView { get; private set; }
+    /// <summary>Gets <see cref="View"/> that has registered to get continuous mouse button pressed events.</summary>
+    public static View? WantContinuousButtonPressedView { get; internal set; }
 
     /// <summary>
     ///     Gets the view that grabbed the mouse (e.g. for dragging). When this is set, all mouse events will be routed to
@@ -51,7 +54,12 @@ public static void GrabMouse (View? view)
         }
 
         RaiseGrabbedMouseEvent (view);
-        MouseGrabView = view;
+
+        if (Initialized)
+        {
+            // MouseGrabView is a static; only set if the application is initialized.
+            MouseGrabView = view;
+        }
     }
 
     /// <summary>Releases the mouse grab, so mouse events will be routed to the view on which the mouse is.</summary>
@@ -136,7 +144,11 @@ private static void RaiseUnGrabbedMouseEvent (View? view)
     /// <param name="mouseEvent">The mouse event with coordinates relative to the screen.</param>
     internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
     {
-        _lastMousePosition = mouseEvent.ScreenPosition;
+        if (Initialized)
+        {
+            // LastMousePosition is a static; only set if the application is initialized.
+            LastMousePosition = mouseEvent.ScreenPosition;
+        }
 
         if (IsMouseDisabled)
         {
@@ -147,7 +159,7 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
         //Debug.Assert (mouseEvent.Position == mouseEvent.ScreenPosition);
         mouseEvent.Position = mouseEvent.ScreenPosition;
 
-        List<View?> currentViewsUnderMouse = View.GetViewsUnderMouse (mouseEvent.ScreenPosition);
+        List<View?> currentViewsUnderMouse = View.GetViewsUnderLocation (mouseEvent.ScreenPosition, ViewportSettings.TransparentMouse);
 
         View? deepestViewUnderMouse = currentViewsUnderMouse.LastOrDefault ();
 
@@ -191,11 +203,14 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
             return;
         }
 
-        WantContinuousButtonPressedView = deepestViewUnderMouse switch
+        if (Initialized)
         {
-            { WantContinuousButtonPressed: true } => deepestViewUnderMouse,
-            _ => null
-        };
+            WantContinuousButtonPressedView = deepestViewUnderMouse switch
+                                              {
+                                                  { WantContinuousButtonPressed: true } => deepestViewUnderMouse,
+                                                  _ => null
+                                              };
+        }
 
         // May be null before the prior condition or the condition may set it as null.
         // So, the checking must be outside the prior condition.
@@ -204,6 +219,13 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
             return;
         }
 
+        // if the mouse is outside the Application.Top or Application.Popover hierarchy, we don't want to
+        // send the mouse event to the deepest view under the mouse.
+        if (!View.IsInHierarchy (Application.Top, deepestViewUnderMouse, true) && !View.IsInHierarchy (Popover?.GetActivePopover () as View, deepestViewUnderMouse, true))
+        {
+            return;
+        }
+
         // Create a view-relative mouse event to send to the view that is under the mouse.
         MouseEventArgs viewMouseEvent;
 
@@ -234,8 +256,6 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
         else
         {
             // The mouse was outside any View's Viewport.
-            //Debug.Fail ("this should not happen.");
-
             // Debug.Fail ("This should never happen. If it does please file an Issue!!");
 
             return;
@@ -243,7 +263,10 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
 
         RaiseMouseEnterLeaveEvents (viewMouseEvent.ScreenPosition, currentViewsUnderMouse);
 
-        WantContinuousButtonPressedView = deepestViewUnderMouse.WantContinuousButtonPressed ? deepestViewUnderMouse : null;
+        if (Initialized)
+        {
+            WantContinuousButtonPressedView = deepestViewUnderMouse.WantContinuousButtonPressed ? deepestViewUnderMouse : null;
+        }
 
         while (deepestViewUnderMouse.NewMouseEvent (viewMouseEvent) is not true && MouseGrabView is not { })
         {
@@ -335,17 +358,20 @@ internal static bool HandleMouseGrab (View? deepestViewUnderMouse, MouseEventArg
         return false;
     }
 
-    internal static readonly List<View?> _cachedViewsUnderMouse = new ();
+    /// <summary>
+    ///     INTERNAL: Holds the non-<see cref="ViewportSettings.TransparentMouse"/> views that are currently under the mouse.
+    /// </summary>
+    internal static List<View?> CachedViewsUnderMouse { get; } = [];
 
     /// <summary>
     ///     INTERNAL: Raises the MouseEnter and MouseLeave events for the views that are under the mouse.
     /// </summary>
     /// <param name="screenPosition">The position of the mouse.</param>
-    /// <param name="currentViewsUnderMouse">The most recent result from GetViewsUnderMouse().</param>
+    /// <param name="currentViewsUnderMouse">The most recent result from GetViewsUnderLocation().</param>
     internal static void RaiseMouseEnterLeaveEvents (Point screenPosition, List<View?> currentViewsUnderMouse)
     {
         // Tell any views that are no longer under the mouse that the mouse has left
-        List<View?> viewsToLeave = _cachedViewsUnderMouse.Where (v => v is { } && !currentViewsUnderMouse.Contains (v)).ToList ();
+        List<View?> viewsToLeave = CachedViewsUnderMouse.Where (v => v is { } && !currentViewsUnderMouse.Contains (v)).ToList ();
 
         foreach (View? view in viewsToLeave)
         {
@@ -355,7 +381,7 @@ internal static void RaiseMouseEnterLeaveEvents (Point screenPosition, List<View
             }
 
             view.NewMouseLeaveEvent ();
-            _cachedViewsUnderMouse.Remove (view);
+            CachedViewsUnderMouse.Remove (view);
         }
 
         // Tell any views that are now under the mouse that the mouse has entered and add them to the list
@@ -366,12 +392,12 @@ internal static void RaiseMouseEnterLeaveEvents (Point screenPosition, List<View
                 continue;
             }
 
-            if (_cachedViewsUnderMouse.Contains (view))
+            if (CachedViewsUnderMouse.Contains (view))
             {
                 continue;
             }
 
-            _cachedViewsUnderMouse.Add (view);
+            CachedViewsUnderMouse.Add (view);
             var raise = false;
 
             if (view is Adornment { Parent: { } } adornmentView)
diff --git a/Terminal.Gui/Application/Application.Navigation.cs b/Terminal.Gui/Application/Application.Navigation.cs
index 1d3aca97cb..3f4d929595 100644
--- a/Terminal.Gui/Application/Application.Navigation.cs
+++ b/Terminal.Gui/Application/Application.Navigation.cs
@@ -14,13 +14,13 @@ public static partial class Application // Navigation stuff
     private static Key _prevTabKey = Key.Tab.WithShift; // Resources/config.json overrides
 
     /// <summary>Alternative key to navigate forwards through views. Ctrl+Tab is the primary key.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key NextTabGroupKey
     {
         get => _nextTabGroupKey;
         set
         {
-            if (_nextTabGroupKey != value)
+            //if (_nextTabGroupKey != value)
             {
                 KeyBindings.Replace (_nextTabGroupKey, value);
                 _nextTabGroupKey = value;
@@ -29,13 +29,13 @@ public static Key NextTabGroupKey
     }
 
     /// <summary>Alternative key to navigate forwards through views. Ctrl+Tab is the primary key.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key NextTabKey
     {
         get => _nextTabKey;
         set
         {
-            if (_nextTabKey != value)
+            //if (_nextTabKey != value)
             {
                 KeyBindings.Replace (_nextTabKey, value);
                 _nextTabKey = value;
@@ -58,13 +58,13 @@ public static Key NextTabKey
     /// </remarks>
     public static event EventHandler<Key>? KeyUp;
     /// <summary>Alternative key to navigate backwards through views. Shift+Ctrl+Tab is the primary key.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key PrevTabGroupKey
     {
         get => _prevTabGroupKey;
         set
         {
-            if (_prevTabGroupKey != value)
+            //if (_prevTabGroupKey != value)
             {
                 KeyBindings.Replace (_prevTabGroupKey, value);
                 _prevTabGroupKey = value;
@@ -73,13 +73,13 @@ public static Key PrevTabGroupKey
     }
 
     /// <summary>Alternative key to navigate backwards through views. Shift+Ctrl+Tab is the primary key.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key PrevTabKey
     {
         get => _prevTabKey;
         set
-        {   
-            if (_prevTabKey != value)
+        {
+            //if (_prevTabKey != value)
             {
                 KeyBindings.Replace (_prevTabKey, value);
                 _prevTabKey = value;
diff --git a/Terminal.Gui/Application/Application.Run.cs b/Terminal.Gui/Application/Application.Run.cs
index d69a34e922..a3798e28f4 100644
--- a/Terminal.Gui/Application/Application.Run.cs
+++ b/Terminal.Gui/Application/Application.Run.cs
@@ -9,13 +9,13 @@ public static partial class Application // Run (Begin, Run, End, Stop)
     private static Key _quitKey = Key.Esc; // Resources/config.json overrides
 
     /// <summary>Gets or sets the key to quit the application.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key QuitKey
     {
         get => _quitKey;
         set
         {
-            if (_quitKey != value)
+            //if (_quitKey != value)
             {
                 KeyBindings.Replace (_quitKey, value);
                 _quitKey = value;
@@ -26,13 +26,13 @@ public static Key QuitKey
     private static Key _arrangeKey = Key.F5.WithCtrl; // Resources/config.json overrides
 
     /// <summary>Gets or sets the key to activate arranging views using the keyboard.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key ArrangeKey
     {
         get => _arrangeKey;
         set
         {
-            if (_arrangeKey != value)
+            //if (_arrangeKey != value)
             {
                 KeyBindings.Replace (_arrangeKey, value);
                 _arrangeKey = value;
diff --git a/Terminal.Gui/Application/Application.cs b/Terminal.Gui/Application/Application.cs
index f11104c8c2..03a602b4b2 100644
--- a/Terminal.Gui/Application/Application.cs
+++ b/Terminal.Gui/Application/Application.cs
@@ -212,7 +212,7 @@ internal static void ResetState (bool ignoreDisposed = false)
         // Do not clear _lastMousePosition; Popover's require it to stay set with
         // last mouse pos.
         //_lastMousePosition = null;
-        _cachedViewsUnderMouse.Clear ();
+        CachedViewsUnderMouse.Clear ();
         WantContinuousButtonPressedView = null;
         MouseEvent = null;
         GrabbedMouse = null;
diff --git a/Terminal.Gui/Application/ApplicationImpl.cs b/Terminal.Gui/Application/ApplicationImpl.cs
index 04c5eed6f8..e6b8fe3999 100644
--- a/Terminal.Gui/Application/ApplicationImpl.cs
+++ b/Terminal.Gui/Application/ApplicationImpl.cs
@@ -219,8 +219,7 @@ public virtual void Shutdown ()
 
         bool wasInitialized = Application.Initialized;
         Application.ResetState ();
-        LogJsonErrors ();
-        PrintJsonErrors ();
+        ConfigurationManager.PrintJsonErrors ();
 
         if (wasInitialized)
         {
diff --git a/Terminal.Gui/Application/ApplicationNavigation.cs b/Terminal.Gui/Application/ApplicationNavigation.cs
index 985d5124e0..d135773c61 100644
--- a/Terminal.Gui/Application/ApplicationNavigation.cs
+++ b/Terminal.Gui/Application/ApplicationNavigation.cs
@@ -32,6 +32,7 @@ public ApplicationNavigation ()
         return _focused;
     }
 
+    // BUGBUG: This only gets Subviews and ignores Adornments. Should it use View.IsInHierarchy?
     /// <summary>
     ///     Gets whether <paramref name="view"/> is in the SubView hierarchy of <paramref name="start"/>.
     /// </summary>
diff --git a/Terminal.Gui/Application/ApplicationPopover.cs b/Terminal.Gui/Application/ApplicationPopover.cs
index b8238140b6..8c2512e1c2 100644
--- a/Terminal.Gui/Application/ApplicationPopover.cs
+++ b/Terminal.Gui/Application/ApplicationPopover.cs
@@ -35,6 +35,13 @@ public ApplicationPopover () { }
     {
         if (popover is { } && !_popovers.Contains (popover))
         {
+
+            // When created, set IPopover.Toplevel to the current Application.Top
+            if (popover.Toplevel is null)
+            {
+                popover.Toplevel = Application.Top;
+            }
+
             _popovers.Add (popover);
         }
 
@@ -104,6 +111,7 @@ public void Show (IPopover? popover)
         if (popover is View newPopover)
         {
             Register (popover);
+
             if (!newPopover.IsInitialized)
             {
                 newPopover.BeginInit ();
@@ -147,6 +155,7 @@ internal bool DispatchKeyDown (Key key)
         if (activePopover is { Visible: true })
         {
             Logging.Debug ($"Active - Calling NewKeyDownEvent ({key}) on {activePopover.Title}");
+
             if (activePopover.NewKeyDownEvent (key))
             {
                 return true;
@@ -159,7 +168,9 @@ internal bool DispatchKeyDown (Key key)
 
         foreach (IPopover popover in _popovers)
         {
-            if (popover == activePopover || popover is not View popoverView)
+            if (popover == activePopover
+                || popover is not View popoverView
+                || (popover.Toplevel is { } && popover.Toplevel != Application.Top))
             {
                 continue;
             }
diff --git a/Terminal.Gui/Application/IPopover.cs b/Terminal.Gui/Application/IPopover.cs
index d168241fe5..9ec5d05b1c 100644
--- a/Terminal.Gui/Application/IPopover.cs
+++ b/Terminal.Gui/Application/IPopover.cs
@@ -6,5 +6,13 @@ namespace Terminal.Gui;
 /// </summary>
 public interface IPopover
 {
-
+    /// <summary>
+    ///     Gets or sets the <see cref="Toplevel"/> that this Popover is associated with. If null, it is not associated with
+    ///     any Toplevel and will receive all keyboard
+    ///     events from the <see cref="Application"/>. If set, it will only receive keyboard events the Toplevel would normally
+    ///     receive.
+    ///     When <see cref="ApplicationPopover.Register"/> is called, the <see cref="Toplevel"/> is set to the current
+    ///     <see cref="Application.Top"/> if not already set.
+    /// </summary>
+    public Toplevel? Toplevel { get; set; }
 }
diff --git a/Terminal.Gui/Application/PopoverBaseImpl.cs b/Terminal.Gui/Application/PopoverBaseImpl.cs
index dfa05c8970..b16411e987 100644
--- a/Terminal.Gui/Application/PopoverBaseImpl.cs
+++ b/Terminal.Gui/Application/PopoverBaseImpl.cs
@@ -16,6 +16,7 @@ namespace Terminal.Gui;
 /// </remarks>
 public abstract class PopoverBaseImpl : View, IPopover
 {
+
     /// <summary>
     ///     Creates a new PopoverBaseImpl.
     /// </summary>
@@ -74,4 +75,8 @@ protected override bool OnVisibleChanging ()
 
         return ret;
     }
+
+    /// <inheritdoc />
+    public Toplevel? Toplevel { get; set; }
+
 }
diff --git a/Terminal.Gui/Configuration/AppScope.cs b/Terminal.Gui/Configuration/AppSettingsScope.cs
similarity index 71%
rename from Terminal.Gui/Configuration/AppScope.cs
rename to Terminal.Gui/Configuration/AppSettingsScope.cs
index 9c522deccf..f32777b0f5 100644
--- a/Terminal.Gui/Configuration/AppScope.cs
+++ b/Terminal.Gui/Configuration/AppSettingsScope.cs
@@ -7,12 +7,12 @@ namespace Terminal.Gui;
 /// <remarks></remarks>
 /// <example>
 ///     <para>
-///         Use the <see cref="SerializableConfigurationProperty"/> attribute to mark properties that should be
+///         Use the <see cref="ConfigurationPropertyAttribute"/> attribute to mark properties that should be
 ///         serialized as part of application-defined configuration settings.
 ///     </para>
 ///     <code>
 ///  public class MyAppSettings {
-/// 	[SerializableConfigurationProperty (Scope = typeof (AppScope))]
+/// 	[ConfigurationProperty]
 /// 	public static bool? MyProperty { get; set; } = true;
 ///  }
 ///  </code>
@@ -24,6 +24,6 @@ namespace Terminal.Gui;
 ///    },
 ///  </code>
 /// </example>
-[JsonConverter (typeof (ScopeJsonConverter<AppScope>))]
-public class AppScope : Scope<AppScope>
+[JsonConverter (typeof (ScopeJsonConverter<AppSettingsScope>))]
+public class AppSettingsScope : Scope<AppSettingsScope>
 { }
diff --git a/Terminal.Gui/Configuration/AttributeJsonConverter.cs b/Terminal.Gui/Configuration/AttributeJsonConverter.cs
index ba291c75a3..543cf8953b 100644
--- a/Terminal.Gui/Configuration/AttributeJsonConverter.cs
+++ b/Terminal.Gui/Configuration/AttributeJsonConverter.cs
@@ -1,9 +1,12 @@
-using System.Text.Json;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
 /// <summary>Json converter from the <see cref="Attribute"/> class.</summary>
+[RequiresUnreferencedCode ("AOT")]
+
 internal class AttributeJsonConverter : JsonConverter<Attribute>
 {
     private static AttributeJsonConverter _instance;
@@ -32,6 +35,9 @@ public override Attribute Read (ref Utf8JsonReader reader, Type typeToConvert, J
         var attribute = new Attribute ();
         Color? foreground = null;
         Color? background = null;
+        TextStyle? style = null;
+
+        string propertyName = string.Empty;
 
         while (reader.Read ())
         {
@@ -39,60 +45,56 @@ public override Attribute Read (ref Utf8JsonReader reader, Type typeToConvert, J
             {
                 if (foreground is null || background is null)
                 {
-                    throw new JsonException ("Both Foreground and Background colors must be provided.");
+                    throw new JsonException ($"{propertyName}: Both Foreground and Background colors must be provided.");
                 }
 
-                return new Attribute (foreground.Value, background.Value);
+                if (style.HasValue)
+                {
+                    return new Attribute (foreground.Value, background.Value, style.Value);
+                }
+                else
+                {
+                    return new Attribute (foreground.Value, background.Value);
+                }
             }
 
             if (reader.TokenType != JsonTokenType.PropertyName)
             {
-                throw new JsonException ($"Unexpected token when parsing Attribute: {reader.TokenType}.");
+                throw new JsonException ($"{propertyName}: Unexpected token when parsing Attribute: {reader.TokenType}.");
             }
 
-            string propertyName = reader.GetString ();
+            propertyName = reader.GetString ();
             reader.Read ();
-            var color = $"\"{reader.GetString ()}\"";
+            var property = $"\"{reader.GetString ()}\"";
+
+            try
+            {
+                switch (propertyName?.ToLower ())
+                {
+                    case "foreground":
+                        foreground = JsonSerializer.Deserialize (property, ConfigurationManager.SerializerContext.Color);
+
+                        break;
+                    case "background":
+                        background = JsonSerializer.Deserialize (property, ConfigurationManager.SerializerContext.Color);
+
+                        break;
+                    case "style":
+                        style = JsonSerializer.Deserialize (property, ConfigurationManager.SerializerContext.TextStyle);
+
+                        break;
 
-            switch (propertyName?.ToLower ())
+                    default:
+                        throw new JsonException ($"{propertyName}: Unknown Attribute property .");
+                }
+            }
+            catch (JsonException ex)
             {
-                case "foreground":
-                    foreground = JsonSerializer.Deserialize (color, SerializerContext.Color);
-
-                    break;
-                case "background":
-                    background = JsonSerializer.Deserialize (color, SerializerContext.Color);
-
-                    break;
-
-                //case "bright":
-                //case "bold":
-                //	attribute.Bright = reader.GetBoolean ();
-                //	break;
-                //case "dim":
-                //	attribute.Dim = reader.GetBoolean ();
-                //	break;
-                //case "underline":
-                //	attribute.Underline = reader.GetBoolean ();
-                //	break;
-                //case "blink":
-                //	attribute.Blink = reader.GetBoolean ();
-                //	break;
-                //case "reverse":
-                //	attribute.Reverse = reader.GetBoolean ();
-                //	break;
-                //case "hidden":
-                //	attribute.Hidden = reader.GetBoolean ();
-                //	break;
-                //case "strike-through":
-                //	attribute.StrikeThrough = reader.GetBoolean ();
-                //	break;				
-                default:
-                    throw new JsonException ($"Unknown Attribute property {propertyName}.");
+                throw new JsonException ($"{propertyName}: \"{property}\" - {ex.Message}");
             }
         }
 
-        throw new JsonException ("Attribute");
+        throw new JsonException ($"{propertyName}: Bad Attribute.");
     }
 
     public override void Write (Utf8JsonWriter writer, Attribute value, JsonSerializerOptions options)
@@ -102,6 +104,11 @@ public override void Write (Utf8JsonWriter writer, Attribute value, JsonSerializ
         ColorJsonConverter.Instance.Write (writer, value.Foreground, options);
         writer.WritePropertyName (nameof (Attribute.Background));
         ColorJsonConverter.Instance.Write (writer, value.Background, options);
+        if (value.Style != TextStyle.None)
+        {
+            writer.WritePropertyName (nameof (Attribute.Style));
+            JsonSerializer.Serialize (writer, value.Style, ConfigurationManager.SerializerContext.TextStyle);
+        }
 
         writer.WriteEndObject ();
     }
diff --git a/Terminal.Gui/Configuration/ColorSchemeJsonConverter.cs b/Terminal.Gui/Configuration/ColorSchemeJsonConverter.cs
deleted file mode 100644
index 4b4f17c6aa..0000000000
--- a/Terminal.Gui/Configuration/ColorSchemeJsonConverter.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Terminal.Gui;
-
-/// <summary>Implements a JSON converter for <see cref="ColorScheme"/>.</summary>
-internal class ColorSchemeJsonConverter : JsonConverter<ColorScheme>
-{
-    private static ColorSchemeJsonConverter instance;
-
-    /// <summary>Singleton</summary>
-    public static ColorSchemeJsonConverter Instance
-    {
-        get
-        {
-            if (instance is null)
-            {
-                instance = new ColorSchemeJsonConverter ();
-            }
-
-            return instance;
-        }
-    }
-
-    /// <inheritdoc/>
-    public override ColorScheme Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        if (reader.TokenType != JsonTokenType.StartObject)
-        {
-            throw new JsonException ($"Unexpected StartObject token when parsing ColorScheme: {reader.TokenType}.");
-        }
-
-        var normal = Attribute.Default;
-        var focus = Attribute.Default;
-        var hotNormal = Attribute.Default;
-        var hotFocus = Attribute.Default;
-        var disabled = Attribute.Default;
-
-        while (reader.Read ())
-        {
-            if (reader.TokenType == JsonTokenType.EndObject)
-            {
-                var colorScheme = new ColorScheme
-                {
-                    Normal = normal,
-                    Focus = focus,
-                    HotNormal = hotNormal,
-                    HotFocus = hotFocus,
-                    Disabled = disabled
-                };
-
-                return colorScheme;
-            }
-
-            if (reader.TokenType != JsonTokenType.PropertyName)
-            {
-                throw new JsonException ($"Unexpected token when parsing Attribute: {reader.TokenType}.");
-            }
-
-            string propertyName = reader.GetString ();
-            reader.Read ();
-            var attribute = JsonSerializer.Deserialize (ref reader, SerializerContext.Attribute);
-
-            switch (propertyName.ToLower ())
-            {
-                case "normal":
-                    normal = attribute;
-
-                    break;
-                case "focus":
-                    focus = attribute;
-
-                    break;
-                case "hotnormal":
-                    hotNormal = attribute;
-
-                    break;
-                case "hotfocus":
-                    hotFocus = attribute;
-
-                    break;
-                case "disabled":
-                    disabled = attribute;
-
-                    break;
-                default:
-                    throw new JsonException ($"Unrecognized ColorScheme Attribute name: {propertyName}.");
-            }
-        }
-
-        throw new JsonException ();
-    }
-
-    /// <inheritdoc/>
-    public override void Write (Utf8JsonWriter writer, ColorScheme value, JsonSerializerOptions options)
-    {
-        writer.WriteStartObject ();
-
-        writer.WritePropertyName ("Normal");
-        AttributeJsonConverter.Instance.Write (writer, value.Normal, options);
-        writer.WritePropertyName ("Focus");
-        AttributeJsonConverter.Instance.Write (writer, value.Focus, options);
-        writer.WritePropertyName ("HotNormal");
-        AttributeJsonConverter.Instance.Write (writer, value.HotNormal, options);
-        writer.WritePropertyName ("HotFocus");
-        AttributeJsonConverter.Instance.Write (writer, value.HotFocus, options);
-        writer.WritePropertyName ("Disabled");
-        AttributeJsonConverter.Instance.Write (writer, value.Disabled, options);
-
-        writer.WriteEndObject ();
-    }
-}
diff --git a/Terminal.Gui/Configuration/ConcurrentDictionaryJsonConverter.cs b/Terminal.Gui/Configuration/ConcurrentDictionaryJsonConverter.cs
new file mode 100644
index 0000000000..bd1e3c2714
--- /dev/null
+++ b/Terminal.Gui/Configuration/ConcurrentDictionaryJsonConverter.cs
@@ -0,0 +1,66 @@
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Terminal.Gui;
+
+[RequiresUnreferencedCode("AOT")]
+internal class ConcurrentDictionaryJsonConverter<T> : JsonConverter<ConcurrentDictionary<string, T>>
+{
+    public override ConcurrentDictionary<string, T> Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException($"Expected a JSON array (\"[ {{ ... }} ]\"), but got \"{reader.TokenType}\".");
+        }
+
+        // If the Json options indicate ignoring case, use the invariant culture ignore case comparer
+        ConcurrentDictionary<string, T> dictionary = new (
+                                                          options.PropertyNameCaseInsensitive
+                                                              ? StringComparer.InvariantCultureIgnoreCase
+                                                              : StringComparer.InvariantCulture);
+
+        while (reader.Read())
+        {
+            if (reader.TokenType == JsonTokenType.StartObject)
+            {
+                reader.Read();
+
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    string key = reader.GetString();
+                    reader.Read();
+                    object value = JsonSerializer.Deserialize(ref reader, typeof(T), ConfigurationManager.SerializerContext);
+                    dictionary.TryAdd(key, (T)value);
+                }
+            }
+            else if (reader.TokenType == JsonTokenType.EndArray)
+            {
+                break;
+            }
+        }
+
+        return dictionary;
+    }
+
+    public override void Write(Utf8JsonWriter writer, ConcurrentDictionary<string, T> value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+
+        foreach (KeyValuePair<string, T> item in value)
+        {
+            writer.WriteStartObject();
+
+            writer.WritePropertyName(item.Key);
+            JsonSerializer.Serialize(writer, item.Value, typeof(T), ConfigurationManager.SerializerContext);
+            writer.WriteEndObject();
+        }
+
+        writer.WriteEndArray();
+    }
+}
diff --git a/Terminal.Gui/Configuration/ConfigLocations.cs b/Terminal.Gui/Configuration/ConfigLocations.cs
index b5469c1c92..10daa4b477 100644
--- a/Terminal.Gui/Configuration/ConfigLocations.cs
+++ b/Terminal.Gui/Configuration/ConfigLocations.cs
@@ -2,55 +2,67 @@
 namespace Terminal.Gui;
 
 /// <summary>
-///     Describes the location of the configuration files. The constants can be combined (bitwise) to specify multiple
-///     locations. The more significant the bit, the higher the priority meaning that the last location will override the
+///     Describes the location of the configuration settings. The constants can be combined (bitwise) to specify multiple
+///     locations. The more significant the bit, the higher the priority the location, meaning that the last location will
+///     override the
 ///     earlier ones.
 /// </summary>
-
 [Flags]
 public enum ConfigLocations
 {
-    /// <summary>No configuration will be loaded.</summary>
-    /// <remarks>
-    ///     Used for development and testing only. For Terminal,Gui to function properly, at least
-    ///     <see cref="Default"/> should be set.
-    /// </remarks>
-    None = 0,
+    /// <summary>
+    ///     No locaitons are specified. This is the default value.
+    /// </summary>
+    None = 0b_0000_0000,
+
+    /// <summary>
+    ///     Settings of the <see cref="ConfigurationPropertyAttribute"/> static properites when the module is
+    ///     initiallly loaded.
+    ///     <para>
+    ///         When the module is initialized, the <see cref="ConfigurationManager"/> will retrieve the values of the
+    ///         configuration
+    ///         properties
+    ///         from their corresponding static properties. These are default settigs available even if
+    ///         <see cref="ConfigurationManager.IsEnabled"/>
+    ///         is <see langword="false"/>.
+    ///     </para>
+    /// </summary>
+    HardCoded = 0b_0000_0001,
 
     /// <summary>
-    ///    Deafult configuration in <c>Terminal.Gui.dll</c>'s resources (<c>Terminal.Gui.Resources.config.json</c>).
+    ///     Settings defined in <c>Terminal.Gui.dll</c>'s resources (<c>Terminal.Gui.Resources.config.json</c>).
     /// </summary>
-    Default = 0b_0000_0001,
+    LibraryResources = 0b_0000_0010,
 
     /// <summary>
-    ///     App resources (e.g. <c>MyApp.Resources.config.json</c>).
+    ///     App resources (e.g. <c>MyApp.Resources.config.json</c>). See <see cref="AppSettingsScope"/>.
     /// </summary>
-    AppResources = 0b_0000_0010,
+    AppResources = 0b_0000_0100,
 
     /// <summary>
     ///     Settings in the <see cref="ConfigurationManager.RuntimeConfig"/> static property.
     /// </summary>
-    Runtime = 0b_0000_0100,
+    Runtime = 0b_0000_1000,
 
     /// <summary>
     ///     Global settings in the current directory (e.g. <c>./.tui/config.json</c>).
     /// </summary>
-    GlobalCurrent = 0b_0000_1000,
+    GlobalCurrent = 0b_0001_0000,
 
     /// <summary>
-    ///    Global settings in the home directory (e.g. <c>~/.tui/config.json</c>).
+    ///     Global settings in the home directory (e.g. <c>~/.tui/config.json</c>).
     /// </summary>
-    GlobalHome = 0b_0001_0000,
+    GlobalHome = 0b_0010_0000,
 
     /// <summary>
     ///     App settings in the current directory (e.g. <c>./.tui/MyApp.config.json</c>).
     /// </summary>
-    AppCurrent = 0b_0010_0000,
+    AppCurrent = 0b_0100_0000,
 
     /// <summary>
     ///     App settings in the home directory (e.g. <c>~/.tui/MyApp.config.json</c>).
     /// </summary>
-    AppHome = 0b_0100_0000,
+    AppHome = 0b_1000_0000,
 
     /// <summary>This constant is a combination of all locations</summary>
     All = 0b_1111_1111
diff --git a/Terminal.Gui/Configuration/ConfigProperty.cs b/Terminal.Gui/Configuration/ConfigProperty.cs
index 5a132b48c0..394e9e494f 100644
--- a/Terminal.Gui/Configuration/ConfigProperty.cs
+++ b/Terminal.Gui/Configuration/ConfigProperty.cs
@@ -1,4 +1,8 @@
 #nullable enable
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -7,11 +11,11 @@ namespace Terminal.Gui;
 
 /// <summary>
 ///     Holds a property's value and the <see cref="PropertyInfo"/> that allows <see cref="ConfigurationManager"/> to
-///     get and set the property's value.
+///     retrieve and apply the property's value.
 /// </summary>
 /// <remarks>
-///     Configuration properties must be <see langword="public"/> and <see langword="static"/> and have the
-///     <see cref="SerializableConfigurationProperty"/> attribute. If the type of the property requires specialized JSON
+///     Configuration properties must be <see langword="public"/>/<see langword="internal"/> and <see langword="static"/> and have the
+///     <see cref="ConfigurationPropertyAttribute"/> attribute. If the type of the property requires specialized JSON
 ///     serialization, a <see cref="JsonConverter"/> must be provided using the <see cref="JsonConverterAttribute"/>
 ///     attribute.
 /// </remarks>
@@ -20,45 +24,71 @@ public class ConfigProperty
     /// <summary>Describes the property.</summary>
     public PropertyInfo? PropertyInfo { get; set; }
 
+    /// <summary>INTERNAL: Cached value of ConfigurationPropertyAttribute.OmitClassName; makes more AOT friendly.</summary>
+    internal bool OmitClassName { get; set; }
+
+    /// <summary>INTERNAL: Cached value of ConfigurationPropertyAttribute.Scope; makes more AOT friendly.</summary>
+    internal string? ScopeType { get; set; }
+
+    private object? _propertyValue;
+
     /// <summary>
     ///     Holds the property's value as it was either read from the class's implementation or from a config file. If the
-    ///     property has not been set (e.g. because no configuration file specified a value), this will be
-    ///     <see langword="null"/>.
+    ///     property has not been set (e.g. because no configuration file specified a value), <see cref="HasValue"/> will be <see langword="false"/>.
     /// </summary>
-    /// <remarks>
-    ///     On <see langword="set"/>, performs a sparse-copy of the new value to the existing value (only copies elements
-    ///     of the object that are non-null).
-    /// </remarks>
-    public object? PropertyValue { get; set; }
+    public object? PropertyValue
+    {
+        get => _propertyValue;
+        set
+        {
+            if (Immutable)
+            {
+                throw new InvalidOperationException ($"Property {PropertyInfo?.Name} is immutable and cannot be set.");
+            }
+
+            // TODO: Verify value is correct type?
+
+            _propertyValue = value;
+            HasValue = true;
+        }
+    }
+
+    /// <summary>
+    ///     Gets or sets whether this config property has a value. This is set to <see langword="true"/> when <see cref="PropertyValue"/> is set.
+    /// </summary>
+    public bool HasValue { get; set; }
+
+    /// <summary>
+    ///     INTERNAL: Gets or sets whether this property is immutable. If <see langword="true"/>, the property cannot be changed.
+    /// </summary>
+    internal bool Immutable { get; set; }
 
     /// <summary>Applies the <see cref="PropertyValue"/> to the static property described by <see cref="PropertyInfo"/>.</summary>
     /// <returns></returns>
+    [RequiresDynamicCode ("Uses reflection to get and set property values")]
+    [RequiresUnreferencedCode ("Uses DeepCloner which requires types to be registered in SourceGenerationContext")]
     public bool Apply ()
     {
         try
         {
             if (PropertyInfo?.GetValue (null) is { })
             {
-                var val = DeepMemberWiseCopy (PropertyValue, PropertyInfo?.GetValue (null));
-                PropertyInfo?.SetValue (null, val);
+                // Use DeepCloner to create a deep copy of PropertyValue
+                object? val = DeepCloner.DeepClone (PropertyValue);
+                PropertyInfo.SetValue (null, val);
+
             }
         }
         catch (TargetInvocationException tie)
         {
-            // Check if there is an inner exception
             if (tie.InnerException is { })
             {
-                // Handle the inner exception separately without catching the outer exception
-                Exception? innerException = tie.InnerException;
-
-                // Handle the inner exception here
                 throw new JsonException (
-                                         $"Error Applying Configuration Change: {innerException.Message}",
-                                         innerException
+                                         $"Error Applying Configuration Change: {tie.InnerException.Message}",
+                                         tie.InnerException
                                         );
             }
 
-            // Handle the outer exception or rethrow it if needed
             throw new JsonException ($"Error Applying Configuration Change: {tie.Message}", tie);
         }
         catch (ArgumentException ae)
@@ -73,12 +103,72 @@ public bool Apply ()
     }
 
     /// <summary>
-    ///     Helper to get either the Json property named (specified by [JsonPropertyName(name)] or the actual property
+    /// INTERNAL: Creates a copy of a ConfigProperty with the same metadata but no value.
+    /// </summary>
+    /// <param name="source">The source ConfigProperty.</param>
+    /// <returns>A new ConfigProperty instance.</returns>
+    internal static ConfigProperty CreateCopy (ConfigProperty source)
+    {
+        return new ConfigProperty
+        {
+            Immutable = false,
+            PropertyInfo = source.PropertyInfo,
+            OmitClassName = source.OmitClassName,
+            ScopeType = source.ScopeType,
+            HasValue = false
+        };
+    }
+
+    /// <summary>
+    /// INTERNAL: Create an immutable ConfigProperty with cached attribute information
+    /// </summary>
+    /// <param name="propertyInfo">The PropertyInfo to create from</param>
+    /// <returns>A new ConfigProperty with attribute data cached</returns>
+    [RequiresDynamicCode ("Uses reflection to access custom attributes")]
+    internal static ConfigProperty CreateImmutableWithAttributeInfo (PropertyInfo propertyInfo)
+    {
+        var attr = propertyInfo.GetCustomAttribute (typeof (ConfigurationPropertyAttribute)) as ConfigurationPropertyAttribute;
+
+        return new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            OmitClassName = attr?.OmitClassName ?? false,
+            ScopeType = attr?.Scope!.Name,
+            // By default, properties are immutable
+            Immutable = true
+        };
+    }
+
+    /// <summary>
+    /// INTERNAL: Helper method to get the ConfigurationPropertyAttribute for a PropertyInfo
+    /// </summary>
+    /// <param name="propertyInfo">The PropertyInfo to get the attribute from</param>
+    /// <returns>The ConfigurationPropertyAttribute if found; otherwise, null</returns>
+    [RequiresDynamicCode ("Uses reflection to access custom attributes")]
+    internal static ConfigurationPropertyAttribute? GetConfigurationPropertyAttribute (PropertyInfo propertyInfo)
+    {
+        return propertyInfo.GetCustomAttribute (typeof (ConfigurationPropertyAttribute)) as ConfigurationPropertyAttribute;
+    }
+
+    /// <summary>
+    /// INTERNAL: Helper method to check if a PropertyInfo has a ConfigurationPropertyAttribute
+    /// </summary>
+    /// <param name="propertyInfo">The PropertyInfo to check</param>
+    /// <returns>True if the PropertyInfo has a ConfigurationPropertyAttribute; otherwise, false</returns>
+    [RequiresDynamicCode ("Uses reflection to access custom attributes")]
+    internal static bool HasConfigurationPropertyAttribute (PropertyInfo propertyInfo)
+    {
+        return propertyInfo.GetCustomAttribute (typeof (ConfigurationPropertyAttribute)) != null;
+    }
+
+    /// <summary>
+    ///     INTERNAL: Helper to get either the Json property named (specified by [JsonPropertyName(name)] or the actual property
     ///     name.
     /// </summary>
     /// <param name="pi"></param>
     /// <returns></returns>
-    public static string GetJsonPropertyName (PropertyInfo pi)
+    [RequiresDynamicCode ("Uses reflection to access custom attributes")]
+    internal static string GetJsonPropertyName (PropertyInfo pi)
     {
         var attr = pi.GetCustomAttribute (typeof (JsonPropertyNameAttribute)) as JsonPropertyNameAttribute;
 
@@ -86,49 +176,411 @@ public static string GetJsonPropertyName (PropertyInfo pi)
     }
 
     /// <summary>
-    ///     Retrieves (using reflection) the value of the static property described in <see cref="PropertyInfo"/> into
-    ///     <see cref="PropertyValue"/>.
+    ///     Updates (using reflection) the <see cref="PropertyValue"/> from the static  <see cref="ConfigurationPropertyAttribute"/>
+    ///     property described in <see cref="PropertyInfo"/>.
     /// </summary>
     /// <returns></returns>
-    public object? RetrieveValue () { return PropertyValue = PropertyInfo!.GetValue (null); }
+    [RequiresDynamicCode ("Uses reflection to retrieve property values")]
+    public object? UpdateToCurrentValue ()
+    {
+        return PropertyValue = PropertyInfo!.GetValue (null);
+    }
 
     /// <summary>
-    ///     Updates (using reflection) <see cref="PropertyValue"/> with the value in <paramref name="source"/> using a deep memberwise copy.
+    ///     INTERNAL: Updates <see cref="PropertyValue"/> with the value in <paramref name="source"/> using a deep memberwise copy that
+    ///     copies only the values that <see cref="HasValue"/>.
     /// </summary>
-    /// <param name="source"></param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentException"></exception>
-    internal object? UpdateValueFrom (object source)
+    /// <param name="source">The source object to copy values from.</param>
+    /// <returns>The updated property value.</returns>
+    /// <exception cref="ArgumentException">Thrown when the source type doesn't match the property type.</exception>
+    [RequiresUnreferencedCode ("Uses DeepCloner which requires types to be registered in SourceGenerationContext")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.DeepCloner.DeepClone<T>(T)")]
+    internal object? UpdateFrom (object? source)
     {
+        // If the source (higher-priority layer) doesn't provide a value, keep the existing value
+        // In the context of layering, a null source means the higher-priority layer doesn't specify a value,
+        // so we should retain the value from the lower-priority layer.
         if (source is null)
         {
             return PropertyValue;
         }
 
-        Type? ut = Nullable.GetUnderlyingType (PropertyInfo!.PropertyType);
+        // Process the source based on its type
+        if (source is ConcurrentDictionary<string, ThemeScope> themeDictSource &&
+            PropertyValue is ConcurrentDictionary<string, ThemeScope> themeDictDest)
+        {
+            UpdateThemeScopeDictionary (themeDictSource, themeDictDest);
+        }
+        else if (source is ConcurrentDictionary<string, ConfigProperty> concurrentDictSource &&
+                 PropertyValue is ConcurrentDictionary<string, ConfigProperty> concurrentDictDest)
+        {
+            UpdateConfigPropertyConcurrentDictionary (concurrentDictSource, concurrentDictDest);
+        }
+        else if (source is Dictionary<string, ConfigProperty> dictSource &&
+                 PropertyValue is Dictionary<string, ConfigProperty> dictDest)
+        {
+            UpdateConfigPropertyDictionary (dictSource, dictDest);
+        }
+        else if (source is ConfigProperty configProperty)
+        {
+            if (configProperty.HasValue)
+            {
+                PropertyValue = DeepCloner.DeepClone (configProperty.PropertyValue);
+            }
+        }
+        else if (source is Dictionary<string, Scheme> dictSchemeSource &&
+                 PropertyValue is Dictionary<string, Scheme> dictSchemesDest)
+        {
+            UpdateSchemeDictionary (dictSchemeSource, dictSchemesDest);
+        }
+        else if (source is Scheme scheme)
+        {
+            PropertyValue = new Scheme (scheme); // use copy constructor
+        }
 
-        if (source.GetType () != PropertyInfo!.PropertyType && ut is { } && source.GetType () != ut)
+        else
+        {
+            // Validate type compatibility for non-dictionary types
+            ValidateTypeCompatibility (source);
+
+            // For non-scope types, perform a deep copy of the source value to ensure immutability
+            PropertyValue = DeepCloner.DeepClone (source);
+        }
+
+        return PropertyValue;
+    }
+
+    /// <summary>
+    /// Validates that the source type is compatible with the property type.
+    /// </summary>
+    /// <param name="source">The source object to validate.</param>
+    /// <exception cref="ArgumentException">Thrown when the source type doesn't match the property type.</exception>
+    private void ValidateTypeCompatibility (object source)
+    {
+        Type? underlyingType = Nullable.GetUnderlyingType (PropertyInfo!.PropertyType);
+
+        bool isCompatibleType = source.GetType () == PropertyInfo.PropertyType ||
+                               (underlyingType is { } && source.GetType () == underlyingType);
+
+        if (!isCompatibleType)
         {
             throw new ArgumentException (
-                                         $"The source object ({
-                                             PropertyInfo!.DeclaringType
-                                         }.{
-                                             PropertyInfo!.Name
-                                         }) is not of type {
-                                             PropertyInfo!.PropertyType
-                                         }."
-                                        );
+                $"The source object ({PropertyInfo.DeclaringType}.{PropertyInfo.Name}) is not of type {PropertyInfo.PropertyType}."
+            );
         }
+    }
+
+
+    /// <summary>
+    /// Updates a Scheme object by selectively applying explicitly set attributes from the source.
+    /// </summary>
+    /// <param name="sourceScheme">The source Scheme.</param>
+    /// <param name="destScheme">The destination Scheme to update.</param>
+    private void UpdateScheme (Scheme sourceScheme, Scheme destScheme)
+    {
+        // We can't modify properties of a record directly, so we need to create a new one
+        // First, create a clone of the destination to preserve any values
+        var updatedScheme = new Scheme (destScheme);
 
-        if (PropertyValue is { })
+        //// Use with expressions to update only explicitly set attributes
+        //// For each role, check if the source has an explicitly set attribute
+        //if (sourceScheme.Normal.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Normal = sourceScheme.Normal };
+        //}
+
+        //if (sourceScheme.HotNormal.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { HotNormal = sourceScheme.HotNormal };
+        //}
+
+        //if (sourceScheme.Focus.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Focus = sourceScheme.Focus };
+        //}
+
+        //if (sourceScheme.HotFocus.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { HotFocus = sourceScheme.HotFocus };
+        //}
+
+        //if (sourceScheme.Active.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Active = sourceScheme.Active };
+        //}
+
+        //if (sourceScheme.HotActive.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { HotActive = sourceScheme.HotActive };
+        //}
+
+        //if (sourceScheme.Highlight.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Highlight = sourceScheme.Highlight };
+        //}
+
+        //if (sourceScheme.Editable.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Editable = sourceScheme.Editable };
+        //}
+
+        //if (sourceScheme.ReadOnly.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { ReadOnly = sourceScheme.ReadOnly };
+        //}
+
+        //if (sourceScheme.Disabled.IsExplicitlySet)
+        //{
+        //    updatedScheme = updatedScheme with { Disabled = sourceScheme.Disabled };
+        //}
+
+        // Update the PropertyValue with the merged scheme
+        PropertyValue = updatedScheme;
+    }
+
+    /// <summary>
+    /// Updates a ThemeScope dictionary with values from a source dictionary.
+    /// </summary>
+    /// <param name="source">The source ThemeScope dictionary.</param>
+    /// <param name="destination">The destination ThemeScope dictionary.</param>
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.Scope<T>.UpdateFrom(Scope<T>)")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.Scope<T>.UpdateFrom(Scope<T>)")]
+    private static void UpdateThemeScopeDictionary (
+        ConcurrentDictionary<string, ThemeScope> source,
+        ConcurrentDictionary<string, ThemeScope> destination)
+    {
+        foreach (KeyValuePair<string, ThemeScope> scope in source)
         {
-            PropertyValue = DeepMemberWiseCopy (source, PropertyValue);
+            if (!destination.ContainsKey (scope.Key))
+            {
+                destination.TryAdd (scope.Key, scope.Value);
+                continue;
+            }
+
+            destination [scope.Key].UpdateFrom (scope.Value);
         }
-        else
+    }
+
+    /// <summary>
+    /// Updates a ConfigProperty dictionary with values from a source dictionary.
+    /// </summary>
+    /// <param name="source">The source ConfigProperty dictionary.</param>
+    /// <param name="destination">The destination ConfigProperty dictionary.</param>
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    private static void UpdateConfigPropertyConcurrentDictionary (
+        ConcurrentDictionary<string, ConfigProperty> source,
+        ConcurrentDictionary<string, ConfigProperty> destination)
+    {
+        foreach (KeyValuePair<string, ConfigProperty> sourceProp in source)
         {
-            PropertyValue = source;
+            // Skip properties without values
+            if (!sourceProp.Value.HasValue)
+            {
+                continue;
+            }
+
+            if (!destination.ContainsKey (sourceProp.Key))
+            {
+                // Add the property to the destination
+                var copy = CreateCopy (sourceProp.Value);
+                destination.TryAdd (sourceProp.Key, copy);
+            }
+
+            // Update the value in the destination
+            destination [sourceProp.Key].UpdateFrom (sourceProp.Value);
         }
+    }
 
-        return PropertyValue;
+    /// <summary>
+    /// Updates a ConfigProperty dictionary with values from a source dictionary.
+    /// </summary>
+    /// <param name="source">The source ConfigProperty dictionary.</param>
+    /// <param name="destination">The destination ConfigProperty dictionary.</param>
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    private static void UpdateConfigPropertyDictionary (
+        Dictionary<string, ConfigProperty> source,
+        Dictionary<string, ConfigProperty> destination)
+    {
+        foreach (KeyValuePair<string, ConfigProperty> sourceProp in source)
+        {
+            // Skip properties without values
+            if (!sourceProp.Value.HasValue)
+            {
+                continue;
+            }
+
+            if (!destination.ContainsKey (sourceProp.Key))
+            {
+                // Add the property to the destination
+                var copy = CreateCopy (sourceProp.Value);
+                destination.Add (sourceProp.Key, copy);
+            }
+
+            // Update the value in the destination
+            destination [sourceProp.Key].UpdateFrom (sourceProp.Value);
+        }
+    }
+
+    /// <summary>
+    /// Updates a ConfigProperty dictionary with values from a source dictionary.
+    /// </summary>
+    /// <param name="source">The source ConfigProperty dictionary.</param>
+    /// <param name="destination">The destination ConfigProperty dictionary.</param>
+    private static void UpdateSchemeDictionary (
+        Dictionary<string, Scheme> source,
+        Dictionary<string, Scheme> destination)
+    {
+        foreach (KeyValuePair<string, Scheme> sourceProp in source)
+        {
+            if (!destination.ContainsKey (sourceProp.Key))
+            {
+                // Add the property to the destination
+                // Schemes are structs are passed by val
+                destination.Add (sourceProp.Key, sourceProp.Value);
+            }
+
+            // Update the value in the destination
+            // Schemes are structs are passed by val
+            destination [sourceProp.Key] = sourceProp.Value;
+        }
     }
+
+    #region Initialization
+
+    /// <summary>
+    ///     INTERNAL: A cache of all classes that have properties decorated with the <see cref="ConfigurationPropertyAttribute"/>.
+    /// </summary>
+    /// <remarks>Is <see langword="null"/> until <see cref="Initialize"/> is called.</remarks>
+    private static ImmutableSortedDictionary<string, Type>? _classesWithConfigProps;
+
+    /// <summary>
+    /// INTERNAL: Called from the <see cref="ModuleInitializers.InitializeConfigurationManager"/> method to initialize the
+    /// _classesWithConfigProps dictionary.
+    /// </summary>
+    [RequiresDynamicCode ("Uses reflection to scan assemblies for configuration properties. " +
+                        "Only called during initialization and not needed during normal operation. " +
+                        "In AOT environments, ensure all types with ConfigurationPropertyAttribute are preserved.")]
+    [RequiresUnreferencedCode ("Reflection requires all types with ConfigurationPropertyAttribute to be preserved in AOT. " +
+                             "Use the SourceGenerationContext to register all configuration property types.")]
+    internal static void Initialize ()
+    {
+        if (_classesWithConfigProps is { })
+        {
+            return;
+        }
+
+        Dictionary<string, Type> dict = new (StringComparer.InvariantCultureIgnoreCase);
+
+        // Process assemblies directly to avoid LINQ overhead
+        Assembly [] assemblies = AppDomain.CurrentDomain.GetAssemblies ();
+        foreach (Assembly assembly in assemblies)
+        {
+            try
+            {
+                if (assembly.IsDynamic)
+                {
+                    continue;
+                }
+
+                foreach (Type type in assembly.GetTypes ())
+                {
+                    PropertyInfo [] properties = type.GetProperties ();
+
+                    // Check if any property has the ConfigurationPropertyAttribute
+                    var hasConfigProp = false;
+                    foreach (PropertyInfo prop in properties)
+                    {
+                        if (HasConfigurationPropertyAttribute (prop))
+                        {
+                            hasConfigProp = true;
+                            break;
+                        }
+                    }
+
+                    if (hasConfigProp)
+                    {
+                        dict [type.Name] = type;
+                    }
+                }
+            }
+            // Skip problematic assemblies that can't be loaded or analyzed
+            catch (ReflectionTypeLoadException)
+            {
+                continue;
+            }
+            catch (BadImageFormatException)
+            {
+                continue;
+            }
+        }
+
+        _classesWithConfigProps = dict.ToImmutableSortedDictionary ();
+    }
+
+    /// <summary>
+    /// INTERNAL: Retrieves a dictionary of all properties annotated with <see cref="ConfigurationPropertyAttribute"/> from the classes in the module.
+    /// The dictionary case-insensitive and sorted.
+    /// The <see cref="ConfigProperty"/> items have <see cref="PropertyInfo"/> set, but not <see cref="PropertyValue"/>. 
+    /// <see cref="Immutable"/> is set to <see langword="true"/>.
+    /// </summary>
+    [RequiresDynamicCode ("Uses reflection to scan assemblies for configuration properties. " +
+                         "Only called during initialization and not needed during normal operation. " +
+                         "In AOT environments, ensure all types with ConfigurationPropertyAttribute are preserved.")]
+    [RequiresUnreferencedCode ("Reflection requires all types with ConfigurationPropertyAttribute to be preserved in AOT. " +
+                              "Use the SourceGenerationContext to register all configuration property types.")]
+    internal static ImmutableSortedDictionary<string, ConfigProperty> GetAllConfigProperties ()
+    {
+        if (_classesWithConfigProps is null)
+        {
+            throw new InvalidOperationException ("Initialize has not been called.");
+        }
+
+        // Estimate capacity to reduce resizing operations
+        int estimatedCapacity = _classesWithConfigProps.Count * 5; // Assume ~5 properties per class
+        Dictionary<string, ConfigProperty> allConfigProperties = new (estimatedCapacity, StringComparer.InvariantCultureIgnoreCase);
+
+        // Process each class with direct iteration instead of LINQ
+        foreach (KeyValuePair<string, Type> classEntry in _classesWithConfigProps)
+        {
+            Type type = classEntry.Value;
+
+            // Get all public static/instance properties
+            BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+            PropertyInfo [] properties = type.GetProperties (bindingFlags);
+
+            foreach (PropertyInfo propertyInfo in properties)
+            {
+                // Skip properties without our attribute
+                if (!HasConfigurationPropertyAttribute (propertyInfo))
+                {
+                    continue;
+                }
+
+                // Verify the property is static
+                if (!propertyInfo.GetGetMethod (true)!.IsStatic)
+                {
+                    throw new InvalidOperationException (
+                        $"Property {propertyInfo.Name} in class {propertyInfo.DeclaringType?.Name} is not static. " +
+                        "[ConfigurationProperty] properties must be static.");
+                }
+
+                // Create config property with cached attribute data
+                ConfigProperty configProperty = CreateImmutableWithAttributeInfo (propertyInfo);
+
+                // Use cached attribute data to determine the key
+                string key = configProperty.OmitClassName
+                    ? GetJsonPropertyName (propertyInfo)
+                    : $"{propertyInfo.DeclaringType?.Name}.{propertyInfo.Name}";
+
+                allConfigProperties.Add (key, configProperty);
+            }
+        }
+
+        return allConfigProperties.ToImmutableSortedDictionary (StringComparer.InvariantCultureIgnoreCase);
+    }
+
+
+    #endregion Initialization
 }
diff --git a/Terminal.Gui/Configuration/ConfigurationManager.cs b/Terminal.Gui/Configuration/ConfigurationManager.cs
index 82c01336a4..23d7311ea4 100644
--- a/Terminal.Gui/Configuration/ConfigurationManager.cs
+++ b/Terminal.Gui/Configuration/ConfigurationManager.cs
@@ -1,21 +1,20 @@
-global using static Terminal.Gui.ConfigurationManager;
-global using CM = Terminal.Gui.ConfigurationManager;
-using System.Collections;
+#nullable enable
+
+using System.Collections.Frozen;
+using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Runtime.Versioning;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Extensions.Logging;
-
-#nullable enable
+using Terminal.Gui.Configuration;
 
 namespace Terminal.Gui;
 
 /// <summary>
-///     Provides settings and configuration management for Terminal.Gui applications.
+///     Provides settings and configuration management for Terminal.Gui applications. See the Configuration Deep Dive for
+///     more information: <see href="https://gui-cs.github.io/Terminal.GuiV2Docs/docs/config.html"/>.
 ///     <para>
 ///         Users can set Terminal.Gui settings on a global or per-application basis by providing JSON formatted
 ///         configuration files. The configuration files can be placed in at <c>.tui</c> folder in the user's home
@@ -33,217 +32,383 @@ namespace Terminal.Gui;
 ///         <c>appname.config.json</c>, where <c>appname</c> is the assembly name of the application (e.g.
 ///         <c>UICatalog.config.json</c>).
 ///     </para>
-///     Settings are applied using the following precedence (higher precedence settings overwrite lower precedence
-///     settings):
 ///     <para>
-///         1. Application configuration found in the users' home directory (<c>~/.tui/appname.config.json</c>) --
-///         Highest precedence
+///         Settings are applied using the precedence defined in <see cref="ConfigLocations"/>.
+///     </para>
+///     <para>
+///         Configuration Management is based on static properties decorated with the
+///         <see cref="ConfigurationPropertyAttribute"/>. Since these properties are static, changes to
+///         configuration settings are applied process-wide.
 ///     </para>
 ///     <para>
-///         2. Application configuration found in the directory the app was launched from (
-///         <c>./.tui/appname.config.json</c>).
+///         Configuration Management is disabled by default and can be enabled by setting calling
+///         <see cref="ConfigurationManager.Enable"/>.
 ///     </para>
-///     <para>3. Application configuration found in the applications' resources (<c>Resources/config.json</c>).</para>
-///     <para>4. Global configuration found in the user's home directory (<c>~/.tui/config.json</c>).</para>
-///     <para>5. Global configuration found in the directory the app was launched from (<c>./.tui/config.json</c>).</para>
 ///     <para>
-///         6. Global configuration in <c>Terminal.Gui.dll</c>'s resources (<c>Terminal.Gui.Resources.config.json</c>) --
-///         Lowest Precedence.
+///         See the UICatalog example for a complete example of how to use ConfigurationManager.
 ///     </para>
 /// </summary>
-[ComponentGuarantees (ComponentGuaranteesOptions.None)]
 public static class ConfigurationManager
 {
+    /// <summary>The backing property for <see cref="Settings"/> (config settings of <see cref="SettingsScope"/>).</summary>
+    /// <remarks>
+    ///     Is <see langword="null"/> until <see cref="ResetToCurrentValues"/> is called. Gets set to a new instance by
+    ///     deserialization
+    ///     (see <see cref="Load"/>).
+    /// </remarks>
+    private static SettingsScope? _settings;
+
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly ReaderWriterLockSlim _settingsLockSlim = new ();
+#pragma warning restore IDE1006 // Naming Styles
+
     /// <summary>
-    ///     A dictionary of all properties in the Terminal.Gui project that are decorated with the
-    ///     <see cref="SerializableConfigurationProperty"/> attribute. The keys are the property names pre-pended with the
-    ///     class that implements the property (e.g. <c>Application.UseSystemConsole</c>). The values are instances of
-    ///     <see cref="ConfigProperty"/> which hold the property's value and the <see cref="PropertyInfo"/> that allows
-    ///     <see cref="ConfigurationManager"/> to get and set the property's value.
+    ///     The root object of Terminal.Gui configuration settings / JSON schema.
     /// </summary>
-    /// <remarks>Is <see langword="null"/> until <see cref="Initialize"/> is called.</remarks>
-    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-    internal static Dictionary<string, ConfigProperty>? _allConfigProperties;
-
-    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-    internal static readonly JsonSerializerOptions SerializerOptions = new ()
+    public static SettingsScope? Settings
     {
-        ReadCommentHandling = JsonCommentHandling.Skip,
-        PropertyNameCaseInsensitive = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        WriteIndented = true,
-        Converters =
+        get
         {
-            // We override the standard Rune converter to support specifying Glyphs in
-            // a flexible way
-            new RuneJsonConverter (),
+            _settingsLockSlim.EnterReadLock ();
 
-            // Override Key to support "Ctrl+Q" format.
-            new KeyJsonConverter ()
-        },
+            try
+            {
+                return _settings;
+            }
+            finally
+            {
+                _settingsLockSlim.ExitReadLock ();
+            }
+        }
+        set
+        {
+            _settingsLockSlim.EnterWriteLock ();
 
-        // Enables Key to be "Ctrl+Q" vs "Ctrl\u002BQ"
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        TypeInfoResolver = SourceGenerationContext.Default
-    };
+            try
+            {
+                _settings = value;
+            }
+            finally
+            {
+                _settingsLockSlim.ExitWriteLock ();
+            }
+        }
+    }
 
-    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-    internal static readonly SourceGenerationContext SerializerContext = new (SerializerOptions);
+    #region Initialization
 
-    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-    internal static StringBuilder _jsonErrors = new ();
+    // ConfigurationManager is initialized when the module is loaded, via ModuleInitializers.InitializeConfigurationManager
+    // Once initialized, the ConfigurationManager is never un-initialized.
+    // The _initialized field is set to true when the module is loaded and the ConfigurationManager is initialized.
+    private static bool _initialized;
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly object _initializedLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
 
-    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
-    private static readonly string _configFilename = "config.json";
+    /// <summary>
+    ///     INTERNAL: For Testing - Indicates whether the <see cref="ConfigurationManager"/> has been initialized.
+    /// </summary>
+    internal static bool IsInitialized ()
+    {
+        lock (_initializedLock)
+        {
+            {
+                return _initialized;
+            }
+        }
+    }
 
-    /// <summary>The backing property for <see cref="Settings"/>.</summary>
-    /// <remarks>
-    ///     Is <see langword="null"/> until <see cref="Reset"/> is called. Gets set to a new instance by deserialization
-    ///     (see <see cref="Load"/>).
-    /// </remarks>
-    private static SettingsScope? _settings;
+    /// <summary>
+    ///     A cache of all<see cref="ConfigurationPropertyAttribute"/> properties and their hard coded values.
+    /// </summary>
+    /// <remarks>Is <see langword="null"/> until <see cref="Initialize"/> is called.</remarks>
+#pragma warning disable IDE1006 // Naming Styles
+    internal static FrozenDictionary<string, ConfigProperty>? _hardCodedConfigPropertyCache;
+    private static readonly object _hardCodedConfigPropertyCacheLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
 
-    /// <summary>Name of the running application. By default, this property is set to the application's assembly name.</summary>
-    public static string AppName { get; set; } = Assembly.GetEntryAssembly ()?.FullName?.Split (',') [0]?.Trim ()!;
+    internal static FrozenDictionary<string, ConfigProperty>? GetHardCodedConfigPropertyCache ()
+    {
+        lock (_hardCodedConfigPropertyCacheLock)
+        {
+            if (_hardCodedConfigPropertyCache is null)
+            {
+                throw new InvalidOperationException ("_hardCodedConfigPropertyCache has not been set.");
+            }
 
-    /// <summary>Application-specific configuration settings scope.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
-    [JsonPropertyName ("AppSettings")]
-    public static AppScope? AppSettings { get; set; }
+            return _hardCodedConfigPropertyCache;
+        }
+    }
 
     /// <summary>
-    ///     Gets and sets the locations where <see cref="ConfigurationManager"/> will look for config files. The value is
-    ///     <see cref="ConfigLocations.All"/>.
+    ///     An immutable cache of all <see cref="ConfigProperty"/>s in module decorated with the
+    ///     <see cref="ConfigurationPropertyAttribute"/> attribute. Both the dictionary and the contained
+    ///     <see cref="ConfigProperty"/>s
+    ///     are immutable.
     /// </summary>
-    public static ConfigLocations Locations { get; set; } = ConfigLocations.All;
+    /// <remarks>Is <see langword="null"/> until <see cref="Initialize"/> is called.</remarks>
+    private static ImmutableSortedDictionary<string, ConfigProperty>? _uninitializedConfigPropertiesCache;
+
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly object __uninitializedConfigPropertiesCacheCacheLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
 
     /// <summary>
-    ///     The root object of Terminal.Gui configuration settings / JSON schema. Contains only properties with the
-    ///     <see cref="SettingsScope"/> attribute value.
+    ///     INTERNAL: Initializes the <see cref="ConfigurationManager"/>.
+    ///     This method is called when the module is loaded,
+    ///     via <see cref="ModuleInitializers.InitializeConfigurationManager"/>.
+    ///     For ConfigurationManager to access config resources, <see cref="IsEnabled"/> needs to be
+    ///     set to <see langword="true"/> after this method has been called.
     /// </summary>
-    public static SettingsScope? Settings
+    [RequiresDynamicCode (
+                             "Uses reflection to scan assemblies for configuration properties. "
+                             + "Only called during initialization and not needed during normal operation. "
+                             + "In AOT environments, ensure all types with ConfigurationPropertyAttribute are preserved.")]
+    [RequiresUnreferencedCode (
+                                  "Reflection requires all types with ConfigurationPropertyAttribute to be preserved in AOT. "
+                                  + "Use the SourceGenerationContext to register all configuration property types.")]
+    internal static void Initialize ()
     {
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-        get
+        lock (_initializedLock)
         {
-            if (_settings is null)
+            if (_initialized)
             {
-                // If Settings is null, we need to initialize it.
-                Reset ();
+                throw new InvalidOperationException ("ConfigurationManager is already initialized.");
             }
+        }
+
+        // Ensure ConfigProperty has cached the list of all the classes with config properties.
+        ConfigProperty.Initialize ();
+
+        // Cache all configuration properties
+        lock (__uninitializedConfigPropertiesCacheCacheLock)
+        {
+            // _allConfigProperties: for ordered, iterable access (LINQ-friendly)
+            // _frozenConfigPropertyCache: for high-speed key lookup (frozen)
 
-            return _settings;
+            // Note GetAllConfigProperties returns a new instance and all the properties !HasValue and Immutable.
+            _uninitializedConfigPropertiesCache = ConfigProperty.GetAllConfigProperties ();
+        }
+
+        // Create a COPY of the _allConfigPropertiesCache to ensure that the original is not modified.
+        lock (_hardCodedConfigPropertyCacheLock)
+        {
+            _hardCodedConfigPropertyCache = ConfigProperty.GetAllConfigProperties ().ToFrozenDictionary ();
+
+            foreach (KeyValuePair<string, ConfigProperty> hardCodedProperty in _hardCodedConfigPropertyCache)
+            {
+                // Set the PropertyValue to the hard coded value
+                hardCodedProperty.Value.Immutable = false;
+                hardCodedProperty.Value.UpdateToCurrentValue ();
+                hardCodedProperty.Value.Immutable = true;
+            }
         }
-        set => _settings = value!;
+
+        lock (_initializedLock)
+        {
+            _initialized = true;
+        }
+
+        LoadHardCodedDefaults ();
     }
 
+    #endregion Initialization
+
+    #region Enable/Disable
+
+    private static bool _enabled;
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly object _enabledLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
+
     /// <summary>
-    ///     The root object of Terminal.Gui themes manager. Contains only properties with the <see cref="ThemeScope"/>
-    ///     attribute value.
+    ///     Gets whether <see cref="ConfigurationManager"/> is enabled or not.
+    ///     If <see langword="false"/>, only the hard coded defaults will be loaded. See <see cref="Enable"/> and
+    ///     <see cref="Disable"/>
     /// </summary>
-    public static ThemeManager? Themes => ThemeManager.Instance;
+    public static bool IsEnabled
+    {
+        get
+        {
+            lock (_enabledLock)
+            {
+                return _enabled;
+            }
+        }
+    }
 
     /// <summary>
-    ///     Gets or sets whether the <see cref="ConfigurationManager"/> should throw an exception if it encounters an
-    ///     error on deserialization. If <see langword="false"/> (the default), the error is logged and printed to the console
-    ///     when <see cref="Application.Shutdown"/> is called.
+    ///     Enables <see cref="ConfigurationManager"/>. If <paramref name="locations"/> is <see cref="ConfigLocations.None"/>,
+    ///     ConfigurationManager will be enabled as-is; no configuration will be loaded or applied. If
+    ///     <paramref name="locations"/> is <see cref="ConfigLocations.HardCoded"/>,
+    ///     ConfigurationManager will be enabled and reset to hard-coded defaults.
+    ///     For any other value,
+    ///     ConfigurationManager will be enabled and the configuration will be loaded from the specified locations and applied.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
-    public static bool? ThrowOnJsonErrors { get; set; } = false;
-
-    /// <summary>Event fired when an updated configuration has been applied to the application.</summary>
-    public static event EventHandler<ConfigurationManagerEventArgs>? Applied;
-
-    /// <summary>Applies the configuration settings to the running <see cref="Application"/> instance.</summary>
+    /// <param name="locations"></param>
     [RequiresUnreferencedCode ("AOT")]
     [RequiresDynamicCode ("AOT")]
-    public static void Apply ()
+    public static void Enable (ConfigLocations locations)
     {
-        var settings = false;
-        var themes = false;
-        var appSettings = false;
+        if (IsEnabled)
+        {
+            return;
+        }
 
-        try
+        lock (_enabledLock)
         {
-            if (string.IsNullOrEmpty (ThemeManager.SelectedTheme))
-            {
-                // First start. Apply settings first. This ensures if a config sets Theme to something other than "Default", it gets used
-                settings = Settings?.Apply () ?? false;
+            _enabled = true;
+        }
 
-                themes = !string.IsNullOrEmpty (ThemeManager.SelectedTheme)
-                         && (ThemeManager.Themes? [ThemeManager.SelectedTheme]?.Apply () ?? false);
-            }
-            else
-            {
-                // Subsequently. Apply Themes first using whatever the SelectedTheme is
-                themes = ThemeManager.Themes? [ThemeManager.SelectedTheme]?.Apply () ?? false;
-                settings = Settings?.Apply () ?? false;
-            }
+        ClearJsonErrors ();
 
-            appSettings = AppSettings?.Apply () ?? false;
+        if (locations == ConfigLocations.None)
+        {
+            return;
         }
-        catch (JsonException e)
+
+        Load (locations);
+
+        // Works even if ConfigurationManager is not enabled.
+        InternalApply ();
+    }
+
+    /// <summary>
+    ///     Disables <see cref="ConfigurationManager"/>.
+    /// </summary>
+    /// <param name="resetToHardCodedDefaults">
+    ///     If <see langword="true"/> all static <see cref="ConfigurationPropertyAttribute"/> properties will be reset to their
+    ///     initial, hard-coded
+    ///     defaults.
+    /// </param>
+    [RequiresUnreferencedCode ("Calls ResetToHardCodedDefaults")]
+    [RequiresDynamicCode ("Calls ResetToHardCodedDefaults")]
+    public static void Disable (bool resetToHardCodedDefaults = false)
+    {
+        lock (_enabledLock)
         {
-            if (ThrowOnJsonErrors ?? false)
-            {
-                throw;
-            }
-            else
-            {
-                AddJsonError ($"Error applying Configuration Change: {e.Message}");
-            }
+            _enabled = false;
+        }
+
+        if (resetToHardCodedDefaults)
+        {
+            ResetToHardCodedDefaults ();
+        }
+    }
+
+    #endregion Enable/Disable
+
+    #region Reset
+
+    // `Reset` - Reset the configuration to either the current values or the hard-coded defaults.
+    // Resetting does not load the configuration; it only resets the configuration to the default values.
+
+    /// <summary>
+    ///     INTERNAL: Resets <see cref="ConfigurationManager"/>. Loads settings from the current
+    ///     values of the static <see cref="ConfigurationPropertyAttribute"/> properties.
+    /// </summary>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal static void ResetToCurrentValues ()
+    {
+        if (!IsInitialized ())
+        {
+            throw new InvalidOperationException ("Initialize must be called first.");
+        }
+
+        _settingsLockSlim.EnterWriteLock ();
+
+        try
+        {
+            _settings = new ();
+            _settings.LoadHardCodedDefaults ();
         }
         finally
         {
-            if (settings || themes || appSettings)
-            {
-                OnApplied ();
-            }
+            _settingsLockSlim.ExitWriteLock ();
         }
+
+        Settings!.LoadCurrentValues ();
+        ThemeManager.UpdateToCurrentValues ();
+        AppSettings!.LoadCurrentValues ();
     }
 
-    /// <summary>Returns an empty Json document with just the $schema tag.</summary>
-    /// <returns></returns>
-    public static string GetEmptyJson ()
+    /// <summary>
+    ///     INTERNAL: Resets <see cref="ConfigurationManager"/>. Loads the hard-coded values of the
+    ///     <see cref="ConfigurationPropertyAttribute"/> properties and applies them.
+    /// </summary>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal static void ResetToHardCodedDefaults ()
     {
-        var emptyScope = new SettingsScope ();
-        emptyScope.Clear ();
+        LoadHardCodedDefaults ();
+        Applied = null;
+        Updated = null;
 
-        return JsonSerializer.Serialize (emptyScope, typeof (SettingsScope), SerializerContext);
+        // Works even if ConfigurationManager is not enabled.
+        InternalApply ();
     }
 
+    #endregion Reset
+
+    #region Load
+
+    // `Load` - Load configuration from the given location(s), updating the configuration with any new values.
+    // Loading does not apply the settings to the application; that happens when the `Apply` method is called.
+
     /// <summary>
-    ///     Gets or sets the in-memory config.json. See <see cref="ConfigLocations.Runtime"/>.
+    ///     INTERNAL: Loads all hard-coded configuration properties. Use <see cref="Apply"/> to cause the loaded settings to be
+    ///     applied to the running application.
     /// </summary>
-    public static string? RuntimeConfig { get; set; } = """{  }""";
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal static void LoadHardCodedDefaults ()
+    {
+        if (!IsInitialized ())
+        {
+            throw new InvalidOperationException ("Initialize must be called first.");
+        }
+
+        RuntimeConfig = null;
+        SourcesManager!.Sources.Clear ();
+        SourcesManager.AddSource (ConfigLocations.HardCoded, "HardCoded");
+
+        Settings = new ();
+        Settings!.LoadHardCodedDefaults ();
+        ThemeManager.ResetToHardCodedDefaults ();
+        AppSettings!.LoadHardCodedDefaults ();
+    }
 
     /// <summary>
-    ///     Loads all settings found in the configuration storage locations (<see cref="ConfigLocations"/>). Optionally, resets
-    ///     all settings attributed with
-    ///     <see cref="SerializableConfigurationProperty"/> to the defaults.
+    ///     Loads all settings found in <paramref name="locations"/>. Use <see cref="Apply"/> to cause the loaded settings to
+    ///     be applied to the running application.
     /// </summary>
-    /// <remarks>
-    /// <para>
-    ///     Use <see cref="Apply"/> to cause the loaded settings to be applied to the running application.
-    /// </para>
-    /// </remarks>
-    /// <param name="reset">
-    ///     If <see langword="true"/> the state of <see cref="ConfigurationManager"/> will be reset to the
-    ///     defaults (<see cref="ConfigLocations.Default"/>).
-    /// </param>
+    /// <exception cref="ConfigurationManagerNotEnabledException">Configuration manager is not enabled.</exception>
     [RequiresUnreferencedCode ("AOT")]
     [RequiresDynamicCode ("AOT")]
-    public static void Load (bool reset = false)
+    public static void Load (ConfigLocations locations)
     {
-        Logging.Trace ($"reset = {reset}");
+        if (!IsEnabled)
+        {
+            throw new ConfigurationManagerNotEnabledException ();
+        }
+
+        // Only load the hard-coded defaults if the user has not specified any locations.
+        if (locations == ConfigLocations.HardCoded)
+        {
+            LoadHardCodedDefaults ();
+        }
 
-        if (reset)
+        if (locations.HasFlag (ConfigLocations.LibraryResources))
         {
-            Reset ();
+            SourcesManager?.Load (
+                                  Settings,
+                                  typeof (ConfigurationManager).Assembly,
+                                  $"Terminal.Gui.Resources.{_configFilename}",
+                                  ConfigLocations.LibraryResources);
         }
 
-        if (Locations.HasFlag (ConfigLocations.AppResources))
+        if (locations.HasFlag (ConfigLocations.AppResources))
         {
             string? embeddedStylesResourceName = Assembly.GetEntryAssembly ()
                                                          ?
@@ -255,54 +420,41 @@ public static void Load (bool reset = false)
                 embeddedStylesResourceName = _configFilename;
             }
 
-            Settings?.UpdateFromResource (Assembly.GetEntryAssembly ()!, embeddedStylesResourceName!, ConfigLocations.AppResources);
+            SourcesManager?.Load (Settings, Assembly.GetEntryAssembly ()!, embeddedStylesResourceName!, ConfigLocations.AppResources);
         }
 
         // TODO: Determine if Runtime should be applied last.
-        if (Locations.HasFlag (ConfigLocations.Runtime) && !string.IsNullOrEmpty (RuntimeConfig))
+        if (locations.HasFlag (ConfigLocations.Runtime) && !string.IsNullOrEmpty (RuntimeConfig))
         {
-            Settings?.Update (RuntimeConfig, "ConfigurationManager.RuntimeConfig", ConfigLocations.Runtime);
+            SourcesManager?.Load (Settings, RuntimeConfig, "ConfigurationManager.RuntimeConfig", ConfigLocations.Runtime);
         }
 
-        if (Locations.HasFlag (ConfigLocations.GlobalCurrent))
+        if (locations.HasFlag (ConfigLocations.GlobalCurrent))
         {
-            Settings?.Update ($"./.tui/{_configFilename}", ConfigLocations.GlobalCurrent);
+            SourcesManager?.Load (Settings, $"./.tui/{_configFilename}", ConfigLocations.GlobalCurrent);
         }
 
-        if (Locations.HasFlag (ConfigLocations.GlobalHome))
+        if (locations.HasFlag (ConfigLocations.GlobalHome))
         {
-            Settings?.Update ($"~/.tui/{_configFilename}", ConfigLocations.GlobalHome);
+            SourcesManager?.Load (Settings, $"~/.tui/{_configFilename}", ConfigLocations.GlobalHome);
         }
 
-
-        if (Locations.HasFlag (ConfigLocations.AppCurrent))
+        if (locations.HasFlag (ConfigLocations.AppCurrent))
         {
-            Settings?.Update ($"./.tui/{AppName}.{_configFilename}", ConfigLocations.AppCurrent);
+            SourcesManager?.Load (Settings, $"./.tui/{AppName}.{_configFilename}", ConfigLocations.AppCurrent);
         }
 
-        if (Locations.HasFlag (ConfigLocations.AppHome))
+        if (locations.HasFlag (ConfigLocations.AppHome))
         {
-            Settings?.Update ($"~/.tui/{AppName}.{_configFilename}", ConfigLocations.AppHome);
+            SourcesManager?.Load (Settings, $"~/.tui/{AppName}.{_configFilename}", ConfigLocations.AppHome);
         }
 
-        ThemeManager.SelectedTheme = Settings!["Theme"].PropertyValue as string ?? "Default";
-    }
-
-    /// <summary>
-    ///     Called when an updated configuration has been applied to the application. Fires the <see cref="Applied"/>
-    ///     event.
-    /// </summary>
-    public static void OnApplied ()
-    {
-        //Logging.Trace ("");
-
-        Applied?.Invoke (null, new ());
-
-        // TODO: Refactor ConfigurationManager to not use an event handler for this.
-        // Instead, have it call a method on any class appropriately attributed
-        // to update the cached values. See Issue #2871
+        Settings!.Validate ();
+        ThemeManager.Validate ();
+        AppSettings!.Validate ();
     }
 
+    // TODO: Rename to Loaded?
     /// <summary>
     ///     Called when the configuration has been updated from a configuration file or reset. Invokes the
     ///     <see cref="Updated"/>
@@ -311,340 +463,358 @@ public static void OnApplied ()
     public static void OnUpdated ()
     {
         //Logging.Trace (@"");
-        Updated?.Invoke (null, new ());
-    }
 
-    /// <summary>Prints any Json deserialization errors that occurred during deserialization to the console.</summary>
-    public static void PrintJsonErrors ()
-    {
-        if (_jsonErrors.Length > 0)
+        if (!IsEnabled)
         {
-            Console.WriteLine (
-                               @"Terminal.Gui ConfigurationManager encountered the following errors while deserializing configuration files:"
-                              );
-            Console.WriteLine (_jsonErrors.ToString ());
+            return;
         }
+
+        // Use a local copy of the event delegate when invoking it to avoid race conditions.
+        EventHandler<ConfigurationManagerEventArgs>? handler = Updated;
+        handler?.Invoke (null, new ());
     }
 
+    /// <summary>Event fired when the configuration has been updated from a configuration source or reset.</summary>
+    public static event EventHandler<ConfigurationManagerEventArgs>? Updated;
+
+    #endregion Load
+
+    #region Apply
+
+    // `Apply` - Apply the configuration to the application; this means the settings are copied from the
+    // configuration properties to the corresponding `static` `[ConfigurationProperty]` properties.
 
     /// <summary>
-    ///     Logs Json deserialization errors that occurred during deserialization.
+    ///     Applies the configuration settings to static <see cref="ConfigurationPropertyAttribute"/> properties.
+    ///     ConfigurationManager must be Enabled.
     /// </summary>
-    public static void LogJsonErrors ()
+    /// <exception cref="ConfigurationManagerNotEnabledException">Configuration Manager is not enabled.</exception>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    public static void Apply ()
     {
-        if (_jsonErrors.Length > 0)
+        if (!IsEnabled)
         {
-            Logging.Error (
-                               @"Encountered the following errors while deserializing configuration files:"
-                              );
-            Logging.Error (_jsonErrors.ToString ());
+            throw new ConfigurationManagerNotEnabledException ();
         }
+
+        InternalApply ();
     }
 
-    /// <summary>
-    ///     Resets the state of <see cref="ConfigurationManager"/>. Should be called whenever a new app session (e.g. in
-    ///     <see cref="Application.Init"/> starts. Called by <see cref="Load"/> if the <c>reset</c> parameter is
-    ///     <see langword="true"/>.
-    /// </summary>
-    /// <remarks></remarks>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    public static void Reset ()
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.Scope<T>.Apply()")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.Scope<T>.Apply()")]
+    private static void InternalApply ()
     {
-        Logging.Trace ($"_allConfigProperties = {_allConfigProperties}");
+        var settings = false;
+        var themes = false;
+        var appSettings = false;
 
-        if (_allConfigProperties is null)
+        try
         {
-            Initialize ();
+            settings = Settings?.Apply () ?? false;
+            themes = ThemeManager.Themes? [ThemeManager.Theme]?.Apply () ?? false;
+            appSettings = AppSettings?.Apply () ?? false;
         }
+        catch (JsonException e)
+        {
+            if (ThrowOnJsonErrors ?? false)
+            {
+                throw;
+            }
+            else
+            {
+                AddJsonError ($"Error applying Configuration Change: {e.Message}");
+            }
+        }
+        finally
+        {
+            if (settings || themes || appSettings)
+            {
+                OnApplied ();
+            }
+        }
+    }
 
-        ClearJsonErrors ();
-
-        Settings = new ();
-        ThemeManager.Reset ();
-        AppSettings = new ();
-
-        // To enable some unit tests, we only load from resources if the flag is set
-        if (Locations.HasFlag (ConfigLocations.Default))
+    /// <summary>
+    ///     Called when an updated configuration has been applied to the application. Fires the <see cref="Applied"/>
+    ///     event.
+    /// </summary>
+    /// <exception cref="ConfigurationManagerNotEnabledException">Configuration manager is not enabled.</exception>
+    private static void OnApplied ()
+    {
+        if (!IsEnabled)
         {
-            Settings.UpdateFromResource (
-                                         typeof (ConfigurationManager).Assembly,
-                                         $"Terminal.Gui.Resources.{_configFilename}",
-                                         ConfigLocations.Default
-                                        );
+            return;
         }
 
-        OnUpdated ();
+        // Use a local copy of the event delegate when invoking it to avoid race conditions.
+        EventHandler<ConfigurationManagerEventArgs>? handler = Applied;
+        handler?.Invoke (null, new ());
 
-        Apply ();
-        ThemeManager.Themes? [ThemeManager.SelectedTheme]?.Apply ();
-        AppSettings?.Apply ();
+        // TODO: Refactor ConfigurationManager to not use an event handler for this.
+        // Instead, have it call a method on any class appropriately attributed
+        // to update the cached values. See Issue #2871
     }
 
-    /// <summary>Event fired when the configuration has been updated from a configuration source or reset.</summary>
-    public static event EventHandler<ConfigurationManagerEventArgs>? Updated;
+    /// <summary>Event fired when an updated configuration has been applied to the application.</summary>
+    public static event EventHandler<ConfigurationManagerEventArgs>? Applied;
 
-    internal static void AddJsonError (string error)
-    {
-        Logging.Trace ($"error = {error}");
-        _jsonErrors.AppendLine (error);
-    }
+    #endregion Apply
+
+    #region Sources
+
+    // `Sources` - A source is a location where a configuration can be stored. Sources are defined in the `ConfigLocations` enum.
+
+    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
+    internal static readonly SourceGenerationContext SerializerContext = new (
+                                                                              new JsonSerializerOptions
+                                                                              {
+                                                                                  // Be relaxed
+                                                                                  ReadCommentHandling = JsonCommentHandling.Skip,
+                                                                                  PropertyNameCaseInsensitive = true,
+                                                                                  DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                                                                                  WriteIndented = true,
+                                                                                  AllowTrailingCommas = true,
+
+                                                                                  Converters =
+                                                                                  {
+                                                                                      // We override the standard Rune converter to support specifying Glyphs in
+                                                                                      // a flexible way
+                                                                                      new RuneJsonConverter (),
+
+                                                                                      // Override Key to support "Ctrl+Q" format.
+                                                                                      new KeyJsonConverter ()
+                                                                                  },
+
+                                                                                  // Enables Key to be "Ctrl+Q" vs "Ctrl\u002BQ"
+                                                                                  Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                                                                                  TypeInfoResolver = SourceGenerationContext.Default
+                                                                              });
 
     /// <summary>
-    ///     System.Text.Json does not support copying a deserialized object to an existing instance. To work around this,
-    ///     we implement a 'deep, member-wise copy' method.
+    ///     Gets the Sources Manager - manages the loading of configuration sources from files and resources.
     /// </summary>
-    /// <remarks>TOOD: When System.Text.Json implements `PopulateObject` revisit https://github.com/dotnet/corefx/issues/37627</remarks>
-    /// <param name="source"></param>
-    /// <param name="destination"></param>
-    /// <returns><paramref name="destination"/> updated from <paramref name="source"/></returns>
-    internal static object? DeepMemberWiseCopy (object? source, object? destination)
-    {
-        ArgumentNullException.ThrowIfNull (destination);
+    public static SourcesManager? SourcesManager { get; internal set; } = new ();
 
-        if (source is null)
-        {
-            return null!;
-        }
+    /// <summary>
+    ///     Gets or sets the in-memory config.json. See <see cref="ConfigLocations.Runtime"/>.
+    /// </summary>
+    public static string? RuntimeConfig { get; set; } = """{  }""";
 
-        if (source.GetType () == typeof (SettingsScope))
-        {
-            return ((SettingsScope)destination).Update ((SettingsScope)source);
-        }
+    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
+    private static readonly string _configFilename = "config.json";
 
-        if (source.GetType () == typeof (ThemeScope))
-        {
-            return ((ThemeScope)destination).Update ((ThemeScope)source);
-        }
+    #endregion Sources
 
-        if (source.GetType () == typeof (AppScope))
-        {
-            return ((AppScope)destination).Update ((AppScope)source);
-        }
+    #region AppSettings
 
-        // If value type, just use copy constructor.
-        if (source.GetType ().IsValueType || source is string)
+    /// <summary>
+    ///     Gets or sets the application-specific configuration settings (config properties with the
+    ///     <see cref="AppSettingsScope"/> scope.
+    /// </summary>
+    [ConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
+    [JsonPropertyName ("AppSettings")]
+    public static AppSettingsScope? AppSettings
+    {
+        [RequiresUnreferencedCode ("AOT")]
+        [RequiresDynamicCode ("AOT")]
+        get
         {
-            return source;
-        }
+            if (!IsInitialized ())
+            {
+                // We're being called from the module initializer.
+                // Hard coded default value is an empty AppSettingsScope
+                var appSettings = new AppSettingsScope ();
+                appSettings.LoadHardCodedDefaults ();
 
-        // HACK: Key is a class, but we want to treat it as a value type so just _keyCode gets copied.
-        if (source.GetType () == typeof (Key))
-        {
-            return source;
-        }
+                return appSettings;
+            }
 
-        // Dictionary
-        if (source.GetType ().IsGenericType
-            && source.GetType ().GetGenericTypeDefinition ().IsAssignableFrom (typeof (Dictionary<,>)))
-        {
-            foreach (object? srcKey in ((IDictionary)source).Keys)
+            if (Settings is null || !Settings.TryGetValue ("AppSettings", out ConfigProperty? appSettingsConfigProperty))
             {
-                if (((IDictionary)destination).Contains (srcKey))
-                {
-                    ((IDictionary)destination) [srcKey] =
-                        DeepMemberWiseCopy (((IDictionary)source) [srcKey], ((IDictionary)destination) [srcKey]);
-                }
-                else
-                {
-                    ((IDictionary)destination).Add (srcKey, ((IDictionary)source) [srcKey]);
-                }
+                throw new InvalidOperationException ("Settings is null.");
             }
 
-            return destination;
-        }
+            {
+                if (!appSettingsConfigProperty.HasValue)
+                {
+                    var appSettings = new AppSettingsScope ();
+                    appSettings.LoadCurrentValues ();
 
-        // ALl other object types
-        List<PropertyInfo>? sourceProps = source?.GetType ().GetProperties ().Where (x => x.CanRead).ToList ();
-        List<PropertyInfo>? destProps = destination?.GetType ().GetProperties ().Where (x => x.CanWrite).ToList ()!;
+                    return appSettings;
+                }
 
-        foreach ((PropertyInfo? sourceProp, PropertyInfo? destProp) in
-                 from sourceProp in sourceProps
-                 where destProps.Any (x => x.Name == sourceProp.Name)
-                 let destProp = destProps.First (x => x.Name == sourceProp.Name)
-                 where destProp.CanWrite
-                 select (sourceProp, destProp))
+                return (appSettingsConfigProperty.PropertyValue as AppSettingsScope)!;
+            }
+        }
+        [RequiresUnreferencedCode ("AOT")]
+        [RequiresDynamicCode ("AOT")]
+        set
         {
-            object? sourceVal = sourceProp.GetValue (source);
-            object? destVal = destProp.GetValue (destination);
+            if (!IsInitialized ())
+            {
+                throw new InvalidOperationException ("AppSettings cannot be set before ConfigurationManager is initialized.");
+            }
 
-            if (sourceVal is { })
+            // Check if the AppSettings is the same as the previous one
+            if (value != Settings! ["AppSettings"].PropertyValue)
             {
-                try
-                {
-                    if (destVal is { })
-                    {
-                        // Recurse
-                        destProp.SetValue (destination, DeepMemberWiseCopy (sourceVal, destVal));
-                    }
-                    else
-                    {
-                        destProp.SetValue (destination, sourceVal);
-                    }
-                }
-                catch (ArgumentException e)
-                {
-                    throw new JsonException ($"Error Applying Configuration Change: {e.Message}", e);
-                }
+                // Update the backing store
+                Settings! ["AppSettings"].PropertyValue = value;
+
+                //Instance.OnThemeChanged (previousThemeValue);
             }
         }
-
-        return destination;
     }
 
+    #endregion AppSettings
+
+    #region Error Logging
+
+    [SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
+    internal static StringBuilder _jsonErrors = new ();
 
     /// <summary>
-    ///     Retrieves the hard coded default settings (static properites) from the Terminal.Gui library implementation. Used in
-    ///     development of
-    ///     the library to generate the default configuration file.
+    ///     Gets or sets whether the <see cref="ConfigurationManager"/> should throw an exception if it encounters an
+    ///     error on deserialization. If <see langword="false"/> (the default), the error is logged and printed to the console
+    ///     when <see cref="Application.Shutdown"/> is called.
     /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         This method is only really useful when using ConfigurationManagerTests to generate the JSON doc that is
-    ///         embedded into Terminal.Gui (during development).
-    ///     </para>
-    ///     <para>
-    ///         WARNING: The <c>Terminal.Gui.Resources.config.json</c> resource has setting definitions (Themes) that are NOT
-    ///         generated by this function. If you use this function to regenerate <c>Terminal.Gui.Resources.config.json</c>,
-    ///         make sure you copy the Theme definitions from the existing <c>Terminal.Gui.Resources.config.json</c> file.
-    ///     </para>
-    /// </remarks>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    internal static void GetHardCodedDefaults ()
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
+    public static bool? ThrowOnJsonErrors { get; set; } = false;
+
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly object _jsonErrorsLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
+
+    internal static void AddJsonError (string error)
     {
-        if (_allConfigProperties is null)
+        Logging.Error ($"{error}");
+
+        lock (_jsonErrorsLock)
         {
-            throw new InvalidOperationException ("Initialize must be called first.");
+            _jsonErrors.AppendLine (@$"  {error}");
         }
+    }
 
-        Settings = new ();
-        ThemeManager.GetHardCodedDefaults ();
-        AppSettings?.RetrieveValues ();
-
-        foreach (KeyValuePair<string, ConfigProperty> p in Settings!.Where (cp => cp.Value.PropertyInfo is { }))
+    private static void ClearJsonErrors ()
+    {
+        lock (_jsonErrorsLock)
         {
-            Settings! [p.Key].PropertyValue = p.Value.PropertyInfo?.GetValue (null);
+            _jsonErrors.Clear ();
         }
     }
 
-    /// <summary>
-    ///     Initializes the internal state of ConfigurationManager. Nominally called once as part of application startup
-    ///     to initialize global state. Also called from some Unit Tests to ensure correctness (e.g. Reset()).
-    /// </summary>
-    [RequiresUnreferencedCode ("AOT")]
-    internal static void Initialize ()
+    /// <summary>Prints any Json deserialization errors that occurred during deserialization to the console.</summary>
+    public static void PrintJsonErrors ()
     {
-        _allConfigProperties = new ();
-        _settings = null;
-
-        Dictionary<string, Type> classesWithConfigProps = new (StringComparer.InvariantCultureIgnoreCase);
-
-        // Get Terminal.Gui.dll classes
-
-        IEnumerable<Type> types = from assembly in AppDomain.CurrentDomain.GetAssemblies ()
-                                  from type in assembly.GetTypes ()
-                                  where type.GetProperties ()
-                                            .Any (
-                                                  prop => prop.GetCustomAttribute (
-                                                                                   typeof (SerializableConfigurationProperty)
-                                                                                  )
-                                                          != null
-                                                 )
-                                  select type;
-
-        foreach (Type? classWithConfig in types)
-        {
-            classesWithConfigProps.Add (classWithConfig.Name, classWithConfig);
-        }
-
-        //Logging.Trace ($"ConfigManager.getConfigProperties found {classesWithConfigProps.Count} classes:");
-        classesWithConfigProps.ToList ().ForEach (x => Logging.Trace ($"  Class: {x.Key}"));
-
-        foreach (PropertyInfo? p in from c in classesWithConfigProps
-                                    let props = c.Value
-                                                 .GetProperties (
-                                                                 BindingFlags.Instance
-                                                                 |
-                                                                 BindingFlags.Static
-                                                                 |
-                                                                 BindingFlags.NonPublic
-                                                                 |
-                                                                 BindingFlags.Public
-                                                                )
-                                                 .Where (
-                                                         prop =>
-                                                             prop.GetCustomAttribute (
-                                                                                      typeof (SerializableConfigurationProperty)
-                                                                                     ) is
-                                                                 SerializableConfigurationProperty
-                                                        )
-                                    let enumerable = props
-                                    from p in enumerable
-                                    select p)
-        {
-            if (p.GetCustomAttribute (typeof (SerializableConfigurationProperty)) is SerializableConfigurationProperty
-                scp)
+        lock (_jsonErrorsLock)
+        {
+            if (_jsonErrors.Length > 0)
             {
-                if (p.GetGetMethod (true)!.IsStatic)
-                {
-                    // If the class name is omitted, JsonPropertyName is allowed. 
-                    _allConfigProperties!.Add (
-                                               scp.OmitClassName
-                                                   ? ConfigProperty.GetJsonPropertyName (p)
-                                                   : $"{p.DeclaringType?.Name}.{p.Name}",
-                                               new () { PropertyInfo = p, PropertyValue = null }
-                                              );
-                }
-                else
-                {
-                    throw new (
-                               $"Property {p.Name} in class {p.DeclaringType?.Name} is not static. All SerializableConfigurationProperty properties must be static."
-                              );
-                }
+                Console.WriteLine (@"Terminal.Gui ConfigurationManager encountered these errors while reading configuration files" +
+                                   @"(set ThrowOnJsonErrors to have these caught during execution):");
+                Console.WriteLine (_jsonErrors.ToString ());
             }
         }
+    }
 
-        _allConfigProperties = _allConfigProperties!.OrderBy (x => x.Key)
-                                                    .ToDictionary (
-                                                                   x => x.Key,
-                                                                   x => x.Value,
-                                                                   StringComparer.InvariantCultureIgnoreCase
-                                                                  );
-
-        //Logging.Trace ($"Found {_allConfigProperties.Count} properties:");
+    #endregion Error Logging
 
-        //_allConfigProperties.ToList ().ForEach (x => Logging.Trace ($"  Property: {x.Key}"));
+    /// <summary>Returns an empty Json document with just the $schema tag.</summary>
+    /// <returns></returns>
+    public static string GetEmptyConfig ()
+    {
+        var emptyScope = new SettingsScope ();
+        emptyScope.Clear ();
 
-        AppSettings = new ();
+        return JsonSerializer.Serialize (emptyScope, typeof (SettingsScope), SerializerContext!);
     }
 
-    /// <summary>Creates a JSON document with the configuration specified.</summary>
+    /// <summary>Returns a Json document containing the hard-coded config.</summary>
     /// <returns></returns>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    internal static string ToJson ()
+    public static string GetHardCodedConfig ()
     {
-        //Logging.Trace ("ConfigurationManager.ToJson()");
+        var emptyScope = new SettingsScope ();
+        emptyScope.LoadHardCodedDefaults ();
+        IEnumerable<KeyValuePair<string, ConfigProperty>>? settings = GetHardCodedConfigPropertiesByScope ("SettingsScope");
 
-        return JsonSerializer.Serialize (Settings!, typeof (SettingsScope), SerializerContext);
+        if (settings is null)
+        {
+            throw new InvalidOperationException ("GetHardCodedConfigPropertiesByScope returned null.");
+        }
+
+        Dictionary<string, ConfigProperty> settingsDict = settings.ToDictionary ();
+
+        foreach (KeyValuePair<string, ConfigProperty> p in Settings!.Where (cp => cp.Value.PropertyInfo is { }))
+        {
+            emptyScope [p.Key].PropertyValue = settingsDict [p.Key].PropertyValue;
+        }
+
+        return JsonSerializer.Serialize (emptyScope, typeof (SettingsScope), SerializerContext!);
     }
 
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    internal static Stream ToStream ()
+    /// <summary>Name of the running application. By default, this property is set to the application's assembly name.</summary>
+    public static string AppName { get; set; } = Assembly.GetEntryAssembly ()?.FullName?.Split (',') [0]?.Trim ()!;
+
+    /// <summary>
+    ///     INTERNAL: Retrieves all uninitialized configuration properties that belong to a specific scope from the cache.
+    ///     The items in the collection are references to the original <see cref="ConfigProperty"/> objects in the
+    ///     cache. They do not have values and have <see cref="ConfigProperty.Immutable"/> set.
+    /// </summary>
+    internal static IEnumerable<KeyValuePair<string, ConfigProperty>>? GetUninitializedConfigPropertiesByScope (string scopeType)
     {
-        string json = JsonSerializer.Serialize (Settings!, typeof (SettingsScope), SerializerContext);
+        // AOT Note: This method does NOT need the RequiresUnreferencedCode attribute as it is not using reflection
+        // and is not using any dynamic code. _allConfigProperties is a static property that is set in the module initializer
+        // and is not using any dynamic code. In addition, ScopeType are registered in SourceGenerationContext.
+
+        if (_uninitializedConfigPropertiesCache is null)
+        {
+            throw new InvalidOperationException ("_allConfigPropertiesCache has not been set.");
+        }
 
-        // turn it into a stream
-        var stream = new MemoryStream ();
-        var writer = new StreamWriter (stream);
-        writer.Write (json);
-        writer.Flush ();
-        stream.Position = 0;
+        if (string.IsNullOrEmpty (scopeType))
+        {
+            return _uninitializedConfigPropertiesCache;
+        }
+
+        // Filter properties by scope using the cached ScopeType property instead of reflection
+        IEnumerable<KeyValuePair<string, ConfigProperty>>? filtered = _uninitializedConfigPropertiesCache?.Where (cp => cp.Value.ScopeType == scopeType);
 
-        return stream;
+        Debug.Assert (filtered is { });
+
+        IEnumerable<KeyValuePair<string, ConfigProperty>> configPropertiesByScope = filtered as KeyValuePair<string, ConfigProperty> [] ?? filtered.ToArray ();
+        Debug.Assert (configPropertiesByScope.All (v => !v.Value.HasValue));
+
+        return configPropertiesByScope;
     }
 
-    private static void ClearJsonErrors () { _jsonErrors.Clear (); }
+    /// <summary>
+    ///     INTERNAL: Retrieves all configuration properties that belong to a specific scope from the hard coded value cache.
+    ///     The items in the collection are references to the original <see cref="ConfigProperty"/> objects in the
+    ///     cache. They contain the hard coded values and have <see cref="ConfigProperty.Immutable"/> set.
+    /// </summary>
+    internal static IEnumerable<KeyValuePair<string, ConfigProperty>>? GetHardCodedConfigPropertiesByScope (string scopeType)
+    {
+        // AOT Note: This method does NOT need the RequiresUnreferencedCode attribute as it is not using reflection
+        // and is not using any dynamic code. _allConfigProperties is a static property that is set in the module initializer
+        // and is not using any dynamic code. In addition, ScopeType are registered in SourceGenerationContext.
+
+        // Filter properties by scope
+        IEnumerable<KeyValuePair<string, ConfigProperty>>? cache = GetHardCodedConfigPropertyCache ();
+
+        if (cache is null)
+        {
+            throw new InvalidOperationException ("GetHardCodedConfigPropertyCache returned null");
+        }
+
+        if (string.IsNullOrEmpty (scopeType))
+        {
+            return cache;
+        }
+
+        // Use the cached ScopeType property instead of reflection
+        IEnumerable<KeyValuePair<string, ConfigProperty>>? scopedCache = cache?.Where (cp => cp.Value.ScopeType == scopeType);
+
+        return scopedCache!;
+    }
 }
diff --git a/Terminal.Gui/Configuration/ConfigurationManagerEventArgs.cs b/Terminal.Gui/Configuration/ConfigurationManagerEventArgs.cs
index 0cc42f6a1c..d8c341737f 100644
--- a/Terminal.Gui/Configuration/ConfigurationManagerEventArgs.cs
+++ b/Terminal.Gui/Configuration/ConfigurationManagerEventArgs.cs
@@ -9,12 +9,3 @@ public class ConfigurationManagerEventArgs : EventArgs
     public ConfigurationManagerEventArgs () { }
 }
 
-/// <summary>Event arguments for the <see cref="ThemeManager"/> events.</summary>
-public class ThemeManagerEventArgs : EventArgs
-{
-    /// <summary>Initializes a new instance of <see cref="ThemeManagerEventArgs"/></summary>
-    public ThemeManagerEventArgs (string newTheme) { NewTheme = newTheme; }
-
-    /// <summary>The name of the new active theme.</summary>
-    public string NewTheme { get; set; } = string.Empty;
-}
diff --git a/Terminal.Gui/Configuration/ConfigurationManagerNotEnabledException.cs b/Terminal.Gui/Configuration/ConfigurationManagerNotEnabledException.cs
new file mode 100644
index 0000000000..a8e976751e
--- /dev/null
+++ b/Terminal.Gui/Configuration/ConfigurationManagerNotEnabledException.cs
@@ -0,0 +1,8 @@
+#nullable enable
+namespace Terminal.Gui;
+
+/// <summary>
+///     The exception that is thrown when a <see cref="ConfigurationManager"/> API is called but the configuration manager is not enabled.
+/// </summary>
+public class ConfigurationManagerNotEnabledException : Exception
+{ }
diff --git a/Terminal.Gui/Configuration/ConfigurationPropertyAttribute.cs b/Terminal.Gui/Configuration/ConfigurationPropertyAttribute.cs
new file mode 100644
index 0000000000..793cc6fb20
--- /dev/null
+++ b/Terminal.Gui/Configuration/ConfigurationPropertyAttribute.cs
@@ -0,0 +1,41 @@
+#nullable enable
+
+namespace Terminal.Gui;
+
+/// <summary>An attribute indicating a property is managed by <see cref="ConfigurationManager"/>.</summary>
+/// <example>
+///     [ConfigurationProperty(Scope = typeof(AppSettingsScope))] public static string? MyProperty { get; set; } = "MyValue";
+/// </example>
+[AttributeUsage (AttributeTargets.Property)]
+public class ConfigurationPropertyAttribute : System.Attribute
+{
+    /// <summary>
+    ///     If <see langword="true"/>, the property will be serialized to the configuration file using only the property
+    ///     name as the key. If <see langword="false"/>, the property will be serialized to the configuration file using the
+    ///     property name pre-pended with the classname (e.g. <c>Application.UseSystemConsole</c>).
+    /// </summary>
+    public bool OmitClassName { get; set; }
+
+    private Type? _scope;
+
+    /// <summary>Specifies the scope of the property. If <see langword="null"/> then <see cref="AppSettingsScope"/> will be used.</summary>
+    public Type? Scope
+    {
+        get
+        {
+            if (_scope is { })
+            {
+                return _scope;
+            }
+            return typeof (AppSettingsScope);
+        }
+        set
+        {
+            if (value == typeof (AppSettingsScope) && OmitClassName)
+            {
+                throw new ArgumentException ("OmitClassName is not allowed when Scope is AppSettingsScope to ensure property names are globally unique.");
+            }
+            _scope = value;
+        }
+    }
+}
diff --git a/Terminal.Gui/Configuration/DeepCloner.cs b/Terminal.Gui/Configuration/DeepCloner.cs
new file mode 100644
index 0000000000..70e3a8d7f5
--- /dev/null
+++ b/Terminal.Gui/Configuration/DeepCloner.cs
@@ -0,0 +1,501 @@
+#nullable enable
+
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     Provides deep cloning functionality for Terminal.Gui configuration objects.
+///     Creates a deep copy of an object by recursively cloning public properties,
+///     handling collections, arrays, dictionaries, and circular references.
+/// </summary>
+/// <remarks>
+///     This class does not use <see cref="ICloneable"/> because it does not guarantee deep cloning,
+///     may not handle circular references, and is not widely implemented in modern .NET types.
+///     Instead, it uses reflection to ensure consistent deep cloning behavior across all types.
+///     <para>
+///         Limitations:
+///         - Types without a parameterless constructor (and not handled as simple types, arrays, dictionaries, or
+///         collections) may be instantiated using uninitialized objects, which could lead to runtime errors if not
+///         properly handled.
+///         - Immutable collections (e.g., <see cref="System.Collections.Immutable.ImmutableDictionary{TKey,TValue}"/>) are
+///         not supported and will throw a <see cref="NotSupportedException"/>.
+///         - Only public, writable properties are cloned; private fields, read-only properties, and non-public members are
+///         ignored.
+///     </para>
+/// </remarks>
+public static class DeepCloner
+{
+    /// <summary>
+    ///     Creates a deep copy of the specified object.
+    /// </summary>
+    /// <typeparam name="T">The type of the object to clone.</typeparam>
+    /// <param name="source">The object to clone.</param>
+    /// <returns>A deep copy of the source object, or default if source is null.</returns>
+    [RequiresUnreferencedCode ("Deep cloning may use reflection which might be incompatible with AOT compilation if types aren't registered in SourceGenerationContext")]
+    [RequiresDynamicCode ("Deep cloning may use reflection that requires runtime code generation if source generation fails")]
+
+    public static T? DeepClone<T> (T? source)
+    {
+        if (source is null)
+        {
+            return default (T?);
+        }
+        // For AOT environments, use source generation exclusively
+        if (IsAotEnvironment ())
+        {
+            if (TryUseSourceGeneratedCloner<T> (source, out T? result))
+            {
+                return result;
+            }
+
+            // If in AOT but source generation failed, throw an exception
+            // instead of silently falling back to reflection
+            throw new InvalidOperationException (
+                                                 $"Type {typeof (T).FullName} is not properly registered in SourceGenerationContext " +
+                                                 $"for AOT-compatible cloning.");
+        }
+
+        // Use reflection-based approach, which should have better performance in non-AOT environments
+        ConcurrentDictionary<object, object> visited = new (ReferenceEqualityComparer.Instance);
+
+        return (T?)DeepCloneInternal (source, visited);
+    }
+
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.CreateInstance(Type)")]
+    [UnconditionalSuppressMessage ("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
+    private static object? DeepCloneInternal (object? source, ConcurrentDictionary<object, object> visited)
+    {
+        if (source is null)
+        {
+            return null;
+        }
+
+        // Handle already visited objects to avoid circular references
+        if (visited.TryGetValue (source, out object? existingClone))
+        {
+            return existingClone;
+        }
+
+        Type type = source.GetType ();
+
+        // Handle immutable or simple types
+        if (IsSimpleType (type))
+        {
+            return source;
+        }
+
+        // Handle strings explicitly
+        if (type == typeof (string))
+        {
+            return source;
+        }
+
+        // Handle arrays
+        if (type.IsArray)
+        {
+            return CloneArray (source, visited);
+        }
+
+        // Handle dictionaries
+        if (source is IDictionary)
+        {
+            return CloneDictionary (source, visited);
+        }
+
+        // Handle collections
+        if (typeof (ICollection).IsAssignableFrom (type))
+        {
+            return CloneCollection (source, visited);
+        }
+
+        // Create new instance
+        object clone = CreateInstance (type);
+
+        // Add to visited before cloning properties
+        visited.TryAdd (source, clone);
+
+        // Clone writable public and internal properties
+        foreach (PropertyInfo prop in type.GetProperties (BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                                          .Where (p => !p.IsSpecialName) // exclude private backing fields or compiler-generated props
+                                          .Where (p => p is { CanRead: true, CanWrite: true } && p.GetIndexParameters ().Length == 0))
+        {
+            object? value = prop.GetValue (source);
+            object? clonedValue = DeepCloneInternal (value, visited);
+            prop.SetValue (clone, clonedValue);
+        }
+
+        return clone;
+    }
+
+    private static bool IsSimpleType ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicProperties)] Type type)
+    {
+        if (type.IsPrimitive
+            || type.IsEnum
+            || type == typeof (decimal)
+            || type == typeof (DateTime)
+            || type == typeof (DateTimeOffset)
+            || type == typeof (TimeSpan)
+            || type == typeof (Guid)
+            || type == typeof (Rune)
+            || type == typeof (string))
+        {
+            return true;
+        }
+
+        // Treat structs with no writable public properties as simple types (immutable structs)
+        if (type.IsValueType)
+        {
+            IEnumerable<PropertyInfo> writableProperties = type.GetProperties (BindingFlags.Instance | BindingFlags.Public)
+                                                               .Where (p => p is { CanRead: true, CanWrite: true } && p.GetIndexParameters ().Length == 0);
+
+            return !writableProperties.Any ();
+        }
+
+        // Treat PropertyInfo (e.g., RuntimePropertyInfo) as a simple type since it's metadata and shouldn't be cloned
+        if (typeof (PropertyInfo).IsAssignableFrom (type))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    [RequiresUnreferencedCode ("Calls System.Text.Json.JsonSerializer.Deserialize(String, Type, JsonSerializerOptions)")]
+    [RequiresDynamicCode ("Calls System.Text.Json.JsonSerializer.Deserialize(String, Type, JsonSerializerOptions)")]
+    private static object CreateInstance ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type type)
+    {
+        try
+        {
+            // Try parameterless constructor
+            if (type.GetConstructor (Type.EmptyTypes) != null)
+            {
+                return Activator.CreateInstance (type)!;
+            }
+
+            // Record support
+            if (type.GetMethod ("<Clone>$") != null)
+            {
+                return Activator.CreateInstance (type)!;
+            }
+
+            // In AOT, try using the JsonSerializer if available
+            if (IsAotEnvironment () && CanSerializeWithJson (type))
+            {
+                return JsonSerializer.Deserialize (JsonSerializer.Serialize (new object (), type), type, ConfigurationManager.SerializerContext.Options)!;
+            }
+
+            throw new InvalidOperationException ($"Cannot create instance of type {type.FullName}. No parameterless constructor or clone method found.");
+        }
+        catch (MissingMethodException)
+        {
+            throw new InvalidOperationException ($"Cannot create instance of type {type.FullName} in AOT context. Consider adding this type to your SourceGenerationContext.");
+        }
+    }
+
+    [RequiresDynamicCode ("Calls System.Array.CreateInstance(Type, Int32)")]
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.DeepCloneInternal(Object, ConcurrentDictionary<Object, Object>)")]
+    private static object CloneArray (object source, ConcurrentDictionary<object, object> visited)
+    {
+        var array = (Array)source;
+        Type elementType = array.GetType ().GetElementType ()!;
+        var newArray = Array.CreateInstance (elementType, array.Length);
+        visited.TryAdd (source, newArray);
+
+        for (var i = 0; i < array.Length; i++)
+        {
+            object? value = array.GetValue (i);
+            object? clonedValue = DeepCloneInternal (value, visited);
+            newArray.SetValue (clonedValue, i);
+        }
+
+        return newArray;
+    }
+
+    [RequiresDynamicCode ("Calls System.Type.MakeGenericType(params Type[])")]
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.DeepCloneInternal(Object, ConcurrentDictionary<Object, Object>)")]
+    private static object CloneCollection (object source, ConcurrentDictionary<object, object> visited)
+    {
+        Type type = source.GetType ();
+        Type elementType = type.GetGenericArguments ().FirstOrDefault () ?? typeof (object);
+
+        // Check for immutable collections and throw if found
+        if (type.IsGenericType)
+        {
+            Type genericTypeDef = type.GetGenericTypeDefinition ();
+
+            if (genericTypeDef.FullName != null && genericTypeDef.FullName.StartsWith ("System.Collections.Immutable"))
+            {
+                throw new NotSupportedException ($"Cloning of immutable collections like {type.Name} is not supported.");
+            }
+        }
+
+        Type listType = typeof (List<>).MakeGenericType (elementType);
+        var tempList = (IList)Activator.CreateInstance (listType)!;
+
+        // Add to visited before cloning contents to prevent circular reference issues
+        visited.TryAdd (source, tempList);
+
+        foreach (object? item in (IEnumerable)source)
+        {
+            object? clonedItem = DeepCloneInternal (item, visited);
+            tempList.Add (clonedItem);
+        }
+
+        // Try to create the original collection type if possible
+        if (type != listType && type.GetConstructor ([listType]) != null)
+        {
+            object result = Activator.CreateInstance (type, tempList)!;
+            visited [source] = result;
+
+            return result;
+        }
+
+        return tempList;
+    }
+
+    #region Dictionary Support
+
+    [RequiresDynamicCode ("Calls System.Type.MakeGenericType(params Type[])")]
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.DeepCloneInternal(Object, ConcurrentDictionary<Object, Object>)")]
+    private static object CloneDictionary (object source, ConcurrentDictionary<object, object> visited)
+    {
+        var sourceDict = (IDictionary)source;
+        Type type = source.GetType ();
+
+        // Check for frozen or immutable dictionaries and throw if found
+        if (type.IsGenericType)
+        {
+            CheckForUnsupportedDictionaryTypes (type);
+        }
+
+        // Determine dictionary type and comparer
+        Type [] genericArgs = type.GetGenericArguments ();
+        Type dictType = genericArgs.Length == 2
+            ? typeof (Dictionary<,>).MakeGenericType (genericArgs)
+            : typeof (Dictionary<object, object>);
+        object? comparer = type.GetProperty ("Comparer")?.GetValue (source);
+
+        // Create a temporary dictionary to hold cloned key-value pairs
+        IDictionary tempDict = CreateDictionaryInstance (dictType, comparer);
+        visited.TryAdd (source, tempDict);
+
+        // Clone all key-value pairs
+        foreach (object? key in sourceDict.Keys)
+        {
+            object? clonedKey = DeepCloneInternal (key, visited);
+            object? clonedValue = DeepCloneInternal (sourceDict [key], visited);
+
+            if (tempDict.Contains (clonedKey!))
+            {
+                tempDict [clonedKey!] = clonedValue;
+            }
+            else
+            {
+                tempDict.Add (clonedKey!, clonedValue);
+            }
+        }
+
+        // If the original dictionary type has a parameterless constructor, create a new instance
+        if (type.GetConstructor (Type.EmptyTypes) != null)
+        {
+            return CreateFinalDictionary (type, comparer, tempDict, source, visited);
+        }
+
+        return tempDict;
+    }
+
+    private static IDictionary CreateDictionaryInstance ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors)] Type dictType, object? comparer)
+    {
+        try
+        {
+            // Try to create the dictionary with the comparer
+            return comparer != null
+                ? (IDictionary)Activator.CreateInstance (dictType, comparer)!
+                : (IDictionary)Activator.CreateInstance (dictType)!;
+        }
+        catch (MissingMethodException)
+        {
+            // Fallback to parameterless constructor if comparer constructor is not available
+            return (IDictionary)Activator.CreateInstance (dictType)!;
+        }
+    }
+
+    private static void CheckForUnsupportedDictionaryTypes (Type type)
+    {
+        Type? currentType = type;
+
+        while (currentType != null && currentType != typeof (object))
+        {
+            if (currentType.IsGenericType)
+            {
+                string? genericTypeName = currentType.GetGenericTypeDefinition ().FullName;
+
+                if (genericTypeName != null &&
+                    (genericTypeName.StartsWith ("System.Collections.Frozen") ||
+                     genericTypeName.StartsWith ("System.Collections.Immutable")))
+                {
+                    throw new NotSupportedException ($"Cloning of frozen or immutable dictionaries like {type.Name} is not supported.");
+                }
+            }
+
+            currentType = currentType.BaseType;
+        }
+    }
+
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.DeepCloneInternal(Object, ConcurrentDictionary<Object, Object>)")]
+    private static object CreateFinalDictionary (
+        [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)] Type type,
+        object? comparer,
+        IDictionary tempDict,
+        object source,
+        ConcurrentDictionary<object, object> visited)
+    {
+        IDictionary newDict;
+
+        try
+        {
+            // Try to create the dictionary with the comparer
+            newDict = comparer != null
+                ? (IDictionary)Activator.CreateInstance (type, comparer)!
+                : (IDictionary)Activator.CreateInstance (type)!;
+        }
+        catch (MissingMethodException)
+        {
+            // Fallback to parameterless constructor if comparer constructor is not available
+            newDict = (IDictionary)Activator.CreateInstance (type)!;
+        }
+
+        newDict.Clear ();
+        visited [source] = newDict;
+
+        // Copy cloned key-value pairs to the new dictionary
+        foreach (object? key in tempDict.Keys)
+        {
+            if (newDict.Contains (key))
+            {
+                newDict [key] = tempDict [key];
+            }
+            else
+            {
+                newDict.Add (key, tempDict [key]);
+            }
+        }
+
+        // Clone additional properties of the derived dictionary type
+        foreach (PropertyInfo prop in type.GetProperties (BindingFlags.Instance | BindingFlags.Public)
+                                          .Where (p => p.CanRead && p.CanWrite && p.GetIndexParameters ().Length == 0))
+        {
+            object? value = prop.GetValue (source);
+            object? clonedValue = DeepCloneInternal (value, visited);
+            prop.SetValue (newDict, clonedValue);
+        }
+
+        return newDict;
+    }
+
+    #endregion Dictionary Support
+
+    #region AOT Support
+
+    /// <summary>
+    /// Determines if a type can be serialized using System.Text.Json based on the types 
+    /// registered in the SourceGenerationContext.
+    /// </summary>
+    /// <param name="type">The type to check</param>
+    /// <returns>True if the type can be serialized using System.Text.Json; otherwise, false.</returns>
+    private static bool CanSerializeWithJson (Type type)
+    {
+        // Check if the type or any of its base types is registered in SourceGenerationContext
+        return ConfigurationManager.SerializerContext.GetType ()
+                                   .GetProperties (BindingFlags.Public | BindingFlags.Static)
+                                   .Any (p => p.PropertyType.IsGenericType &&
+                                              p.PropertyType.GetGenericTypeDefinition () == typeof (JsonTypeInfo<>) &&
+                                              (p.PropertyType.GetGenericArguments () [0] == type ||
+                                               p.PropertyType.GetGenericArguments () [0].IsAssignableFrom (type)));
+    }
+
+    private static bool IsAotEnvironment () =>
+        // Check if running in an AOT environment
+        Type.GetType ("System.Runtime.CompilerServices.RuntimeFeature")?.GetProperty ("IsDynamicCodeSupported")?.GetValue (null) is bool isDynamicCodeSupported && !isDynamicCodeSupported;
+
+    /// <summary>
+    /// Attempts to clone an object using source-generated serialization from System.Text.Json.
+    /// This provides an AOT-compatible alternative to reflection-based deep cloning.
+    /// </summary>
+    /// <typeparam name="T">The type of the object to clone</typeparam>
+    /// <param name="source">The source object to clone</param>
+    /// <param name="result">The cloned result, if successful</param>
+    /// <returns>True if cloning succeeded using source generation; otherwise, false</returns>
+    private static bool TryUseSourceGeneratedCloner<T> (T source, [NotNullWhen (true)] out T? result)
+    {
+        result = default;
+
+        try
+        {
+            // Check if the type has a JsonTypeInfo in our SourceGenerationContext
+            JsonTypeInfo<T>? jsonTypeInfo = GetJsonTypeInfo<T> ();
+
+            if (jsonTypeInfo != null)
+            {
+                // Use JSON serialization for deep cloning
+                string json = JsonSerializer.Serialize (source, jsonTypeInfo);
+                result = JsonSerializer.Deserialize<T> (json, jsonTypeInfo);
+                return result != null;
+            }
+
+            return false;
+        }
+        catch
+        {
+            // If any exception occurs during serialization/deserialization,
+            // return false to fall back to reflection-based approach
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Gets JsonTypeInfo for a type from the SourceGenerationContext, if available.
+    /// </summary>
+    /// <typeparam name="T">The type to get JsonTypeInfo for</typeparam>
+    /// <returns>JsonTypeInfo if found; otherwise, null</returns>
+    private static JsonTypeInfo<T>? GetJsonTypeInfo<T> ()
+    {
+        // Try to find a matching JsonTypeInfo property in the SourceGenerationContext
+        var contextType = ConfigurationManager.SerializerContext.GetType ();
+
+        // First try for an exact type match
+        var exactProperty = contextType.GetProperty (typeof (T).Name);
+
+        if (exactProperty != null &&
+            exactProperty.PropertyType.IsGenericType &&
+            exactProperty.PropertyType.GetGenericTypeDefinition () == typeof (JsonTypeInfo<>) &&
+            exactProperty.PropertyType.GetGenericArguments () [0] == typeof (T))
+        {
+            return (JsonTypeInfo<T>?)exactProperty.GetValue (null);
+        }
+
+        // Then look for any compatible JsonTypeInfo
+        foreach (var prop in contextType.GetProperties (BindingFlags.Public | BindingFlags.Static))
+        {
+            if (prop.PropertyType.IsGenericType &&
+                prop.PropertyType.GetGenericTypeDefinition () == typeof (JsonTypeInfo<>) &&
+                prop.PropertyType.GetGenericArguments () [0].IsAssignableFrom (typeof (T)))
+            {
+                // This is a bit tricky - we've found a compatible type but need to cast it
+                // Warning: This might not work for all types and is a bit of a hack
+                return (JsonTypeInfo<T>?)prop.GetValue (null);
+            }
+        }
+
+        return null;
+    }
+
+
+    #endregion AOT Support
+}
diff --git a/Terminal.Gui/Configuration/DictionaryJsonConverter.cs b/Terminal.Gui/Configuration/DictionaryJsonConverter.cs
index f9385a89e6..ee1aebb4e6 100644
--- a/Terminal.Gui/Configuration/DictionaryJsonConverter.cs
+++ b/Terminal.Gui/Configuration/DictionaryJsonConverter.cs
@@ -1,8 +1,10 @@
-using System.Text.Json;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
+[RequiresUnreferencedCode ("AOT")]
 internal class DictionaryJsonConverter<T> : JsonConverter<Dictionary<string, T>>
 {
     public override Dictionary<string, T> Read (
@@ -16,7 +18,11 @@ JsonSerializerOptions options
             throw new JsonException ($"Expected a JSON array (\"[ {{ ... }} ]\"), but got \"{reader.TokenType}\".");
         }
 
-        Dictionary<string, T> dictionary = new ();
+        // If the Json options indicate ignoring case, use the invariant culture ignore case comparer.
+        Dictionary<string, T> dictionary = new (
+                                                options.PropertyNameCaseInsensitive
+                                                    ? StringComparer.InvariantCultureIgnoreCase
+                                                    : StringComparer.InvariantCulture);
 
         while (reader.Read ())
         {
@@ -28,7 +34,7 @@ JsonSerializerOptions options
                 {
                     string key = reader.GetString ();
                     reader.Read ();
-                    var value = JsonSerializer.Deserialize (ref reader, typeof (T), SerializerContext);
+                    object value = JsonSerializer.Deserialize (ref reader, typeof (T), ConfigurationManager.SerializerContext);
                     dictionary.Add (key, (T)value);
                 }
             }
@@ -51,7 +57,7 @@ public override void Write (Utf8JsonWriter writer, Dictionary<string, T> value,
 
             //writer.WriteString (item.Key, item.Key);
             writer.WritePropertyName (item.Key);
-            JsonSerializer.Serialize (writer, item.Value, typeof (T), SerializerContext);
+            JsonSerializer.Serialize (writer, item.Value, typeof (T), ConfigurationManager.SerializerContext);
             writer.WriteEndObject ();
         }
 
diff --git a/Terminal.Gui/Configuration/KeyCodeJsonConverter.cs b/Terminal.Gui/Configuration/KeyCodeJsonConverter.cs
index 9b24c7d0a6..7bec8f91f6 100644
--- a/Terminal.Gui/Configuration/KeyCodeJsonConverter.cs
+++ b/Terminal.Gui/Configuration/KeyCodeJsonConverter.cs
@@ -7,6 +7,8 @@ internal class KeyCodeJsonConverter : JsonConverter<KeyCode>
 {
     public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
+        string propertyName = string.Empty;
+
         if (reader.TokenType == JsonTokenType.StartObject)
         {
             var key = KeyCode.Null;
@@ -28,10 +30,10 @@ public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, Jso
 
                 if (reader.TokenType == JsonTokenType.PropertyName)
                 {
-                    string propertyName = reader.GetString ();
+                    propertyName = reader.GetString ();
                     reader.Read ();
 
-                    switch (propertyName.ToLowerInvariant ())
+                    switch (propertyName!.ToLowerInvariant ())
                     {
                         case "key":
                             if (reader.TokenType == JsonTokenType.String)
@@ -50,7 +52,7 @@ public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, Jso
                                 if (key == KeyCode.Null)
                                 {
                                     throw new JsonException (
-                                                             $"The value \"{reader.GetString ()}\" is not a valid Key."
+                                                             $"{propertyName}: \"{reader.GetString ()}\" is not a valid Key."
                                                             );
                                 }
                             }
@@ -62,11 +64,11 @@ public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, Jso
                                 }
                                 catch (InvalidOperationException ioe)
                                 {
-                                    throw new JsonException ($"Error parsing Key value: {ioe.Message}", ioe);
+                                    throw new JsonException ($"{propertyName}: Error parsing Key value: {ioe.Message}", ioe);
                                 }
                                 catch (FormatException ioe)
                                 {
-                                    throw new JsonException ($"Error parsing Key value: {ioe.Message}", ioe);
+                                    throw new JsonException ($"{propertyName}: Error parsing Key value: {ioe.Message}", ioe);
                                 }
                             }
 
@@ -90,21 +92,21 @@ public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, Jso
                                     }
                                     catch (KeyNotFoundException e)
                                     {
-                                        throw new JsonException ($"The value \"{mod}\" is not a valid modifier.", e);
+                                        throw new JsonException ($"{propertyName}: \"{mod}\" is not a valid modifier.", e);
                                     }
                                 }
                             }
                             else
                             {
                                 throw new JsonException (
-                                                         $"Expected an array of modifiers, but got \"{reader.TokenType}\"."
+                                                         $"{propertyName}: Expected an array of modifiers, but got \"{reader.TokenType}\"."
                                                         );
                             }
 
                             break;
 
                         default:
-                            throw new JsonException ($"Unexpected Key property \"{propertyName}\".");
+                            throw new JsonException ($"{propertyName}: Unexpected Key property.");
                     }
                 }
             }
@@ -117,7 +119,7 @@ public override KeyCode Read (ref Utf8JsonReader reader, Type typeToConvert, Jso
             return key;
         }
 
-        throw new JsonException ($"Unexpected StartObject token when parsing Key: {reader.TokenType}.");
+        throw new JsonException ($"{propertyName}: Unexpected StartObject token when parsing Key: {reader.TokenType}.");
     }
 
     public override void Write (Utf8JsonWriter writer, KeyCode value, JsonSerializerOptions options)
@@ -126,14 +128,7 @@ public override void Write (Utf8JsonWriter writer, KeyCode value, JsonSerializer
 
         var keyName = (value & ~KeyCode.CtrlMask & ~KeyCode.ShiftMask & ~KeyCode.AltMask).ToString ();
 
-        if (keyName is { })
-        {
-            writer.WriteString ("Key", keyName);
-        }
-        else
-        {
-            writer.WriteNumber ("Key", (uint)(value & ~KeyCode.CtrlMask & ~KeyCode.ShiftMask & ~KeyCode.AltMask));
-        }
+        writer.WriteString ("Key", keyName);
 
         Dictionary<string, KeyCode> modifierDict = new ()
         {
diff --git a/Terminal.Gui/Configuration/RuneJsonConverter.cs b/Terminal.Gui/Configuration/RuneJsonConverter.cs
index 33cbce6688..118780d056 100644
--- a/Terminal.Gui/Configuration/RuneJsonConverter.cs
+++ b/Terminal.Gui/Configuration/RuneJsonConverter.cs
@@ -25,110 +25,110 @@ public override Rune Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSe
         switch (reader.TokenType)
         {
             case JsonTokenType.String:
-            {
-                string value = reader.GetString ();
-                int first = RuneExtensions.MaxUnicodeCodePoint + 1;
-                int second = RuneExtensions.MaxUnicodeCodePoint + 1;
-
-                if (value.StartsWith ("U+", StringComparison.OrdinalIgnoreCase)
-                    || value.StartsWith ("\\U", StringComparison.OrdinalIgnoreCase))
                 {
-                    // Handle encoded single char, surrogate pair, or combining mark + char
-                    uint [] codePoints = Regex.Matches (value, @"(?:\\[uU]\+?|U\+)([0-9A-Fa-f]{1,8})")
-                                              .Select (
-                                                       match => uint.Parse (
-                                                                            match.Groups [1].Value,
-                                                                            NumberStyles.HexNumber
-                                                                           )
-                                                      )
-                                              .ToArray ();
-
-                    if (codePoints.Length == 0 || codePoints.Length > 2)
-                    {
-                        throw new JsonException ($"Invalid Rune: {value}.");
-                    }
+                    string value = reader.GetString ();
+                    int first = RuneExtensions.MaxUnicodeCodePoint + 1;
+                    int second = RuneExtensions.MaxUnicodeCodePoint + 1;
 
-                    if (codePoints.Length > 0)
+                    if (value is { } && (value.StartsWith ("U+", StringComparison.OrdinalIgnoreCase)
+                                         || value.StartsWith ("\\U", StringComparison.OrdinalIgnoreCase)))
                     {
-                        first = (int)codePoints [0];
+                        // Handle encoded single char, surrogate pair, or combining mark + char
+                        uint [] codePoints = Regex.Matches (value, @"(?:\\[uU]\+?|U\+)([0-9A-Fa-f]{1,8})")
+                                                  .Select (
+                                                           match => uint.Parse (
+                                                                                match.Groups [1].Value,
+                                                                                NumberStyles.HexNumber
+                                                                               )
+                                                          )
+                                                  .ToArray ();
+
+                        if (codePoints.Length is 0 or > 2)
+                        {
+                            throw new JsonException ($"{value}: Invalid Rune.");
+                        }
+
+                        if (codePoints.Length > 0)
+                        {
+                            first = (int)codePoints [0];
+                        }
+
+                        if (codePoints.Length == 2)
+                        {
+                            second = (int)codePoints [1];
+                        }
                     }
-
-                    if (codePoints.Length == 2)
+                    else
                     {
-                        second = (int)codePoints [1];
+                        // Handle single character, surrogate pair, or combining mark + char
+                        if (value is { Length: 0 or > 2 })
+                        {
+                            throw new JsonException ($"{value}: Invalid Rune");
+                        }
+
+                        if (value is { Length: > 0 })
+                        {
+                            first = value [0];
+                        }
+
+                        if (value is { Length: 2 })
+                        {
+                            second = value [1];
+                        }
                     }
-                }
-                else
-                {
-                    // Handle single character, surrogate pair, or combining mark + char
-                    if (value.Length == 0 || value.Length > 2)
+
+                    Rune result;
+
+                    if (second == RuneExtensions.MaxUnicodeCodePoint + 1)
                     {
-                        throw new JsonException ($"Invalid Rune: {value}.");
+                        // Single codepoint
+                        if (!Rune.TryCreate (first, out result))
+                        {
+                            throw new JsonException ($"{value}: Invalid Rune");
+                        }
+
+                        return result;
                     }
 
-                    if (value.Length > 0)
+                    // Surrogate pair?
+                    if (Rune.TryCreate ((char)first, (char)second, out result))
                     {
-                        first = value [0];
+                        return result;
                     }
 
-                    if (value.Length == 2)
+                    if (!Rune.IsValid (second))
                     {
-                        second = value [1];
+                        throw new JsonException ($"{value}: Invalid Rune. The second codepoint is not valid: {second}.");
                     }
-                }
 
-                Rune result;
+                    var cm = new Rune (second);
 
-                if (second == RuneExtensions.MaxUnicodeCodePoint + 1)
-                {
-                    // Single codepoint
-                    if (!Rune.TryCreate (first, out result))
+                    if (!cm.IsCombiningMark ())
                     {
-                        throw new JsonException ($"Invalid Rune: {value}.");
+                        throw new JsonException ($"{value}: Invalid Rune. The second codepoint is not a combining mark: {cm}.");
                     }
 
-                    return result;
-                }
-
-                // Surrogate pair?
-                if (Rune.TryCreate ((char)first, (char)second, out result))
-                {
-                    return result;
-                }
-
-                if (!Rune.IsValid (second))
-                {
-                    throw new JsonException ($"The second codepoint is not valid: {second} in ({value})");
-                }
+                    // not a surrogate pair, so a combining mark + char?
+                    string combined = string.Concat ((char)first, (char)second).Normalize ();
 
-                var cm = new Rune (second);
+                    if (!Rune.IsValid (combined [0]))
+                    {
+                        throw new JsonException ($"{value}: Invalid combined Rune.");
+                    }
 
-                if (!cm.IsCombiningMark ())
-                {
-                    throw new JsonException ($"The second codepoint is not a combining mark: {cm} in ({value})");
+                    return new (combined [0]);
                 }
-
-                // not a surrogate pair, so a combining mark + char?
-                string combined = string.Concat ((char)first, (char)second).Normalize ();
-
-                if (!Rune.IsValid (combined [0]))
+            case JsonTokenType.Number:
                 {
-                    throw new JsonException ($"Invalid combined Rune ({value})");
-                }
+                    uint num = reader.GetUInt32 ();
 
-                return new (combined [0]);
-            }
-            case JsonTokenType.Number:
-            {
-                uint num = reader.GetUInt32 ();
+                    if (Rune.IsValid (num))
+                    {
+                        return new (num);
+                    }
 
-                if (Rune.IsValid (num))
-                {
-                    return new (num);
+                    throw new JsonException ($"{num}: Invalid Rune (not a scalar Unicode value).");
                 }
-
-                throw new JsonException ($"Invalid Rune (not a scalar Unicode value): {num}.");
-            }
             default:
                 throw new JsonException ($"Unexpected token when parsing Rune: {reader.TokenType}.");
         }
diff --git a/Terminal.Gui/Configuration/SchemeJsonConverter.cs b/Terminal.Gui/Configuration/SchemeJsonConverter.cs
new file mode 100644
index 0000000000..58bba896b0
--- /dev/null
+++ b/Terminal.Gui/Configuration/SchemeJsonConverter.cs
@@ -0,0 +1,93 @@
+#nullable enable
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Terminal.Gui;
+
+// ReSharper disable StringLiteralTypo
+/// <summary>Implements a JSON converter for <see cref="Scheme"/>.</summary>
+[RequiresUnreferencedCode ("AOT")]
+internal class SchemeJsonConverter : JsonConverter<Scheme>
+{
+    /// <inheritdoc/>
+    public override Scheme Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartObject)
+        {
+            throw new JsonException ($"Unexpected StartObject token when parsing Scheme: {reader.TokenType}.");
+        }
+
+        var scheme = new Scheme ();
+        var propertyName = string.Empty;
+
+        while (reader.Read ())
+        {
+            if (reader.TokenType == JsonTokenType.EndObject)
+            {
+                return scheme;
+            }
+
+            if (reader.TokenType != JsonTokenType.PropertyName)
+            {
+                throw new JsonException ($"After {propertyName}: Expected PropertyName but got another token when parsing Attribute: {reader.TokenType}.");
+            }
+
+            propertyName = reader.GetString ();
+            reader.Read ();
+
+            // Make sure attributes are marked as explicitly set when deserialized
+            object? attrObj = JsonSerializer.Deserialize (ref reader, ConfigurationManager.SerializerContext.Attribute);
+
+            if (attrObj is not Attribute attribute)
+            {
+                throw new JsonException ($"After {propertyName}: Expected Attribute but got {attrObj?.GetType ().Name ?? "null"} when parsing Scheme.");
+            }
+            if (propertyName is { })
+            {
+                scheme = propertyName.ToLowerInvariant () switch
+                         {
+                             "normal" => scheme with { Normal = attribute },
+                             "hotnormal" => scheme with { HotNormal = attribute },
+                             "focus" => scheme with { Focus = attribute },
+                             "hotfocus" => scheme with { HotFocus = attribute },
+                             "active" => scheme with { Active = attribute },
+                             "hotactive" => scheme with { HotActive = attribute },
+                             "highlight" => scheme with { Highlight = attribute },
+                             "editable" => scheme with { Editable = attribute },
+                             "readonly" => scheme with { ReadOnly = attribute },
+                             "disabled" => scheme with { Disabled = attribute },
+                             _ => throw new JsonException ($"{propertyName}: Unrecognized Scheme Attribute name.")
+                         };
+            }
+            else
+            {
+                throw new JsonException ("null property name.");
+            }
+        }
+
+        throw new JsonException ($"After {propertyName}: Invalid Json.");
+    }
+
+    /// <inheritdoc/>
+    public override void Write (Utf8JsonWriter writer, Scheme value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject ();
+
+        foreach (VisualRole role in Enum.GetValues<VisualRole>())
+        {
+            // Get the attribute for the role
+
+            if (!value.TryGetExplicitlySetAttributeForRole (role, out Attribute? attribute))
+            {
+                // Skip attributes that are not explicitly set
+                continue;
+            }
+            writer.WritePropertyName (role.ToString ());
+            // Write the attribute using the AttributeJsonConverter
+            AttributeJsonConverter.Instance.Write (writer, attribute!.Value, options);
+        }
+
+        writer.WriteEndObject ();
+    }
+}
diff --git a/Terminal.Gui/Configuration/SchemeManager.cs b/Terminal.Gui/Configuration/SchemeManager.cs
new file mode 100644
index 0000000000..eb9a3f119f
--- /dev/null
+++ b/Terminal.Gui/Configuration/SchemeManager.cs
@@ -0,0 +1,201 @@
+#nullable enable
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     Holds the <see cref="Scheme"/>s that define the <see cref="Attribute"/>s that are used by views to render
+///     themselves. A Scheme is a mapping from <see cref="VisualRole"/>s (such as <see cref="VisualRole.Focus"/>) to <see cref="Attribute"/>s.
+///     A Scheme defines how a `View` should look based on its purpose (e.g. Menu or Dialog).
+/// </summary>
+public sealed class SchemeManager// : INotifyCollectionChanged, IDictionary<string, Scheme?>
+{
+#pragma warning disable IDE1006 // Naming Styles
+    private static readonly object _schemesLock = new ();
+#pragma warning restore IDE1006 // Naming Styles
+
+    /// <summary>
+    ///     INTERNAL: Gets the hard-coded schemes defined by <see cref="View"/>. These are not loaded from the configuration files,
+    ///     but are hard-coded in the source code. Used for unit testing when ConfigurationManager is not initialized.
+    /// </summary>
+    /// <returns></returns>
+    internal static ImmutableSortedDictionary<string, Scheme?>? GetHardCodedSchemes () { return Scheme.GetHardCodedSchemes ()!; }
+
+    /// <summary>
+    ///     Use <see cref="AddScheme"/>, <see cref="GetScheme(Terminal.Gui.Schemes)"/>, <see cref="GetSchemeNames"/>, <see cref="GetSchemesForCurrentTheme"/>, etc... instead.
+    /// </summary>
+    [ConfigurationProperty (Scope = typeof (ThemeScope), OmitClassName = true)]
+    [JsonConverter (typeof (DictionaryJsonConverter<Scheme?>))]
+    [UsedImplicitly]
+    public static Dictionary<string, Scheme?>? Schemes
+    {
+        get => GetSchemes ();
+        [RequiresUnreferencedCode ("Calls Terminal.Gui.SchemeManager.SetSchemes(Dictionary<String, Scheme>)")]
+        [RequiresDynamicCode ("Calls Terminal.Gui.SchemeManager.SetSchemes(Dictionary<String, Scheme>)")]
+        private set => SetSchemes (value);
+    }
+
+    /// <summary>INTERNAL: Gets the dictionary of defined <see cref="Scheme"/>s. The get method for <see cref="Schemes"/>.</summary>
+    internal static Dictionary<string, Scheme?> GetSchemes ()
+    {
+        if (!ConfigurationManager.IsInitialized ())
+        {
+            // We're being called from the module initializer.
+            // Hard coded default value
+            return GetHardCodedSchemes ()!.ToDictionary (StringComparer.InvariantCultureIgnoreCase);
+        }
+
+        return GetSchemesForCurrentTheme ();
+    }
+
+    /// <summary>INTERNAL: The set method for <see cref="Schemes"/>.</summary>
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    private static void SetSchemes (Dictionary<string, Scheme?>? value)
+    {
+        lock (_schemesLock)
+        {
+            if (!ConfigurationManager.IsInitialized ())
+            {
+                throw new InvalidOperationException ("Schemes cannot be set before ConfigurationManager is initialized.");
+            }
+
+            Debug.Assert (value is { });
+
+            // Update the backing store
+            ThemeManager.GetCurrentTheme () ["Schemes"].UpdateFrom (value);
+        }
+
+        //Instance.OnThemeChanged (prevousValue);
+    }
+
+    /// <summary>
+    ///     Adds a new <see cref="Scheme"/> to <see cref="SchemeManager"/>. If the Scheme has already been added,
+    ///     it will be updated to <paramref name="scheme"/>.
+    /// </summary>
+    /// <param name="schemeName">The name of the Scheme. This must be unique.</param>
+    /// <param name="scheme"></param>
+    /// <returns></returns>
+    public static void AddScheme (string schemeName, Scheme scheme)
+    {
+        if (!GetSchemes ()!.TryAdd (schemeName, scheme))
+        {
+            GetSchemes () [schemeName] = scheme;
+        }
+    }
+
+    /// <summary>
+    ///     Removes a Scheme from <see cref="SchemeManager"/>.
+    /// </summary>
+    /// <param name="schemeName"></param>
+    /// <exception cref="InvalidOperationException">If the scheme is a built-in Scheme or was not previously added.</exception>
+    public static void RemoveScheme (string schemeName)
+    {
+        if (SchemeNameToSchemes (schemeName) is { })
+        {
+            throw new InvalidOperationException ($@"{schemeName}: Cannot remove a built-in Scheme.");
+        }
+
+        if (!GetSchemes ().TryGetValue (schemeName, out _))
+        {
+            throw new InvalidOperationException ($@"{schemeName}: Does not exist in Schemes.");
+        }
+
+        GetSchemes ().Remove (schemeName);
+    }
+
+    /// <summary>
+    ///     Gets the <see cref="Scheme"/> for the specified <see cref="Gui.Schemes"/>.
+    /// </summary>
+    /// <param name="schemeName"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentException"></exception>
+    public static Scheme GetScheme (Schemes schemeName)
+    {
+        // Convert schemeName to string via Enum api
+        string? schemeNameString = SchemesToSchemeName (schemeName);
+        if (schemeNameString is null)
+        {
+            throw new ArgumentException ($"Invalid scheme name: {schemeName}");
+        }
+
+        return GetSchemesForCurrentTheme ()! [schemeNameString]!;
+    }
+
+    /// <summary>
+    ///     Gets the <see cref="Scheme"/> for the specified string.
+    /// </summary>
+    /// <param name="schemeName"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentException"></exception>
+    public static Scheme GetScheme (string schemeName)
+    {
+        return GetSchemesForCurrentTheme ()! [schemeName]!;
+    }
+
+    /// <summary>
+    ///     Gets the name of the specified <see cref="Schemes"/>. Will throw an exception if <paramref name="schemeName"/>
+    ///     is not a built-in Scheme.
+    /// </summary>
+    /// <param name="schemeName"></param>
+    /// <returns>The name of scheme.</returns>
+    public static string? SchemesToSchemeName (Schemes schemeName)
+    {
+        return Enum.GetName (typeof (Schemes), schemeName);
+    }
+
+    /// <summary>
+    ///     Converts a string to a <see cref="Schemes"/> enum value.
+    /// </summary>
+    /// <param name="schemeName"><see langword="null"/> if the schemeName is not a built-in Scheme name.</param>
+    /// <returns><see langword="null"/> if <paramref name="schemeName"/> is not the name of a built-in Scheme.</returns>
+    public static string? SchemeNameToSchemes (string schemeName)
+    {
+        if (Enum.TryParse (typeof (Schemes), schemeName, out object? value))
+        {
+            return value?.ToString ();
+        }
+        return null;
+    }
+
+    /// <summary>
+    ///     Get the dictionary schemes from the selected theme loaded from configuration.
+    /// </summary>
+    /// <returns></returns>
+    public static Dictionary<string, Scheme?> GetSchemesForCurrentTheme ()
+    {
+        lock (_schemesLock)
+        {
+            if (!ConfigurationManager.IsInitialized ())
+            {
+                throw new InvalidOperationException ("CM Must be Initialized");
+            }
+
+            if (ThemeManager.GetCurrentTheme () ["Schemes"].PropertyValue is not Dictionary<string, Scheme?> schemes)
+            {
+                // Most likely because "Schemes": was left out of the config
+                throw new InvalidOperationException ("Current Theme does not have a Scheme.");
+            }
+
+            return schemes!;
+        }
+    }
+
+    /// <summary>
+    ///     Convenience method to get the names of the schemes.
+    /// </summary>
+    /// <returns></returns>
+    public static ImmutableList<string> GetSchemeNames ()
+    {
+        lock (_schemesLock)
+        {
+            return GetSchemes ()!.Keys.ToImmutableList ();
+        }
+    }
+}
diff --git a/Terminal.Gui/Configuration/Scope.cs b/Terminal.Gui/Configuration/Scope.cs
index 5b28a1b8f8..a525353c79 100644
--- a/Terminal.Gui/Configuration/Scope.cs
+++ b/Terminal.Gui/Configuration/Scope.cs
@@ -1,66 +1,179 @@
 #nullable enable
-using System.Diagnostics;
-using System.Reflection;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
 
 namespace Terminal.Gui;
 
 /// <summary>
 ///     Defines a configuration settings scope. Classes that inherit from this abstract class can be used to define
 ///     scopes for configuration settings. Each scope is a JSON object that contains a set of configuration settings.
+///     <para>
+///         When constructed, the dictionary will be populated with uninitialized configuration properties for the
+///         scope (<see cref="ConfigProperty.HasValue"/> will be <see langword="false"/>).
+///     </para>
 /// </summary>
-public class Scope<T> : Dictionary<string, ConfigProperty>
-{ //, IScope<Scope<T>> {
-    /// <summary>Crates a new instance.</summary>
+public class Scope<T> : ConcurrentDictionary<string, ConfigProperty>
+{
+    /// <summary>
+    ///     Creates a new instance. The dictionary will be populated with uninitialized (<see cref="ConfigProperty.HasValue"/>
+    ///     will be <see langword="false"/>).
+    /// </summary>
+    [RequiresUnreferencedCode (
+        "Uses cached configuration properties filtered by type T. This is AOT-safe as long as T is one of the known scope types (SettingsScope, ThemeScope, AppSettingsScope).")]
     public Scope () : base (StringComparer.InvariantCultureIgnoreCase)
     {
-        foreach (KeyValuePair<string, ConfigProperty> p in GetScopeProperties ())
+    }
+
+    /// <summary>
+    ///     INTERNAL: Adds a new ConfigProperty given a <paramref name="value"/>. Determines the correct PropertyInfo etc... by retrieving the
+    ///     hard coded value for <paramref name="name"/>.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <param name="value"></param>
+    internal void AddValue (string name, object? value)
+    {
+        ConfigProperty? configProperty = GetHardCodedProperty (name);
+
+        if (configProperty is null)
+        {
+            throw new InvalidOperationException ($@"{name} is not a hard coded property.");
+        }
+
+        TryAdd (name, ConfigProperty.CreateCopy (configProperty));
+        this [name].PropertyValue = configProperty.PropertyValue;
+
+    }
+
+    internal ConfigProperty? GetHardCodedProperty (string name)
+    {
+        ConfigProperty? configProperty = ConfigurationManager.GetHardCodedConfigPropertiesByScope (typeof (T).Name)!
+                                                             .FirstOrDefault (hardCodedKeyValuePair => hardCodedKeyValuePair.Key == name).Value;
+
+        if (configProperty is null)
+        {
+            return null;
+        }
+
+        ConfigProperty copy = ConfigProperty.CreateCopy (configProperty);
+        copy.PropertyValue = configProperty.PropertyValue;
+
+        return copy;
+    }
+
+    internal ConfigProperty GetUninitializedProperty (string name)
+    {
+        ConfigProperty? configProperty = ConfigurationManager.GetUninitializedConfigPropertiesByScope (typeof (T).Name)!
+                                                             .FirstOrDefault (hardCodedKeyValuePair => hardCodedKeyValuePair.Key == name).Value;
+
+        if (configProperty is null)
+        {
+            throw new InvalidOperationException ($@"{name} is not a ConfigProperty.");
+        }
+        ConfigProperty  copy = ConfigProperty.CreateCopy (configProperty);
+        copy.PropertyValue = configProperty.PropertyValue;
+
+        return copy;
+
+    }
+
+    /// <summary>
+    ///     INTERNAL: Updates the values of the properties of this scope to their corresponding static
+    ///     <see cref="ConfigurationPropertyAttribute"/> properties.
+    /// </summary>
+    [RequiresDynamicCode ("Uses reflection to retrieve property values")]
+    internal void LoadCurrentValues ()
+    {
+        foreach (KeyValuePair<string, ConfigProperty> validProperties in this.Where (cp => cp.Value.PropertyInfo is { }))
         {
-            Add (p.Key, new ConfigProperty { PropertyInfo = p.Value.PropertyInfo, PropertyValue = null });
+            validProperties.Value.UpdateToCurrentValue ();
         }
     }
 
-    /// <summary>Retrieves the values of the properties of this scope from their corresponding static properties.</summary>
-    public void RetrieveValues ()
+    /// <summary>
+    ///     INTERNAL: Updates the values of all properties of this scope to their corresponding hard-coded original values.
+    /// </summary>
+    internal void LoadHardCodedDefaults ()
     {
-        foreach (KeyValuePair<string, ConfigProperty> p in this.Where (cp => cp.Value.PropertyInfo is { }))
+        foreach (KeyValuePair<string, ConfigProperty> hardCodedKeyValuePair in ConfigurationManager.GetHardCodedConfigPropertiesByScope (typeof (T).Name)!)
         {
-            p.Value.RetrieveValue ();
+            ConfigProperty copy = ConfigProperty.CreateCopy (hardCodedKeyValuePair.Value);
+            TryAdd (hardCodedKeyValuePair.Key, copy);
+            this [hardCodedKeyValuePair.Key].PropertyValue = hardCodedKeyValuePair.Value.PropertyValue;
         }
     }
 
-    /// <summary>Updates this instance from the specified source scope.</summary>
-    /// <param name="source"></param>
+    /// <summary>
+    ///     INTERNAL: Updates this scope with the values in <paramref name="scope"/> using a deep clone.
+    /// </summary>
+    /// <param name="scope"></param>
     /// <returns>The updated scope (this).</returns>
-    public Scope<T>? Update (Scope<T> source)
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    [RequiresDynamicCode ("Calls Terminal.Gui.ConfigProperty.UpdateFrom(Object)")]
+    internal Scope<T>? UpdateFrom (Scope<T> scope)
     {
-        foreach (KeyValuePair<string, ConfigProperty> prop in source)
+        foreach (KeyValuePair<string, ConfigProperty> prop in scope)
         {
-            if (ContainsKey (prop.Key))
+            if (!prop.Value.HasValue)
             {
-                this [prop.Key].PropertyValue = this [prop.Key].UpdateValueFrom (prop.Value.PropertyValue!);
+                continue;
             }
-            else
+
+            if (!ContainsKey (prop.Key))
             {
-                this [prop.Key].PropertyValue = prop.Value.PropertyValue;
+                if (!prop.Value.HasValue)
+                {
+                    continue;
+                }
+
+                // Add an empty (HasValue = false) property to this scope
+                ConfigProperty copy = ConfigProperty.CreateCopy (prop.Value);
+                copy.PropertyValue = prop.Value.PropertyValue;
+                TryAdd (prop.Key, copy);
             }
+
+            // Update the property value
+            this [prop.Key].UpdateFrom (prop.Value.PropertyValue);
         }
 
         return this;
     }
 
-    /// <summary>Applies the values of the properties of this scope to their corresponding static properties.</summary>
-    /// <returns></returns>
-    internal virtual bool Apply ()
+    /// <summary>
+    ///     INTERNAL: Applies the values of the properties of this scope to their corresponding
+    ///     <see cref="ConfigurationPropertyAttribute"/> properties.
+    /// </summary>
+    /// <returns><see langword="true"/> if one or more property value was applied; <see langword="false"/> otherwise.</returns>
+    [RequiresDynamicCode ("Uses reflection to get and set property values")]
+    [RequiresUnreferencedCode ("Calls Terminal.Gui.DeepCloner.DeepClone<T>(T)")]
+    internal bool Apply ()
     {
+        if (!ConfigurationManager.IsEnabled)
+        {
+            Logging.Warning ("Apply called when CM is not Enabled. This should only be done from unit tests where side-effects are managed.");
+        }
+
         var set = false;
 
-        foreach (KeyValuePair<string, ConfigProperty> p in this.Where (
-                                                                       t => t.Value != null
-                                                                            && t.Value.PropertyValue != null
-                                                                      ))
+        foreach (KeyValuePair<string, ConfigProperty> propWithValue in this.Where (t => t.Value.HasValue))
         {
-            if (p.Value.Apply ())
+            if (propWithValue.Value.PropertyInfo != null)
             {
+                object? currentValue = propWithValue.Value.PropertyInfo.GetValue (null);
+
+                // QUESTION: Should we avoid setting if currentValue == newValue?
+
+                if (propWithValue.Value.PropertyValue is Scope<T> scopeSource && currentValue is Scope<T> scopeDest)
+                {
+                    propWithValue.Value.PropertyInfo.SetValue (null, scopeDest.UpdateFrom (scopeSource));
+                }
+                else
+                {
+                    // Use DeepCloner to create a deep copy of the property value
+                    object? val = DeepCloner.DeepClone (propWithValue.Value.PropertyValue);
+                    propWithValue.Value.PropertyInfo.SetValue (null, val);
+                }
+
                 set = true;
             }
         }
@@ -68,15 +181,11 @@ internal virtual bool Apply ()
         return set;
     }
 
-    private IEnumerable<KeyValuePair<string, ConfigProperty>> GetScopeProperties ()
+    internal virtual void Validate ()
     {
-        return _allConfigProperties!.Where (
-                                            cp =>
-                                                (cp.Value.PropertyInfo?.GetCustomAttribute (
-                                                                                            typeof (SerializableConfigurationProperty)
-                                                                                           )
-                                                     as SerializableConfigurationProperty)?.Scope
-                                                == GetType ()
-                                           );
+        if (IsEmpty)
+        {
+            throw new JsonException ($@"Empty!");
+        }
     }
 }
diff --git a/Terminal.Gui/Configuration/ScopeJsonConverter.cs b/Terminal.Gui/Configuration/ScopeJsonConverter.cs
index 3c5a2c856b..4f3152be1d 100644
--- a/Terminal.Gui/Configuration/ScopeJsonConverter.cs
+++ b/Terminal.Gui/Configuration/ScopeJsonConverter.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
@@ -11,22 +10,25 @@ namespace Terminal.Gui;
 ///     Converts <see cref="Scope{T}"/> instances to/from JSON. Does all the heavy lifting of reading/writing config
 ///     data to/from <see cref="ConfigurationManager"/> JSON documents.
 /// </summary>
-/// <typeparam name="scopeT"></typeparam>
-internal class ScopeJsonConverter<[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] scopeT> : JsonConverter<scopeT> where scopeT : Scope<scopeT>
+/// <typeparam name="TScopeT"></typeparam>
+[RequiresUnreferencedCode ("AOT")]
+internal class ScopeJsonConverter<[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TScopeT> : JsonConverter<TScopeT>
+    where TScopeT : Scope<TScopeT>
 {
     [RequiresDynamicCode ("Calls System.Type.MakeGenericType(params Type[])")]
 #pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override TScopeT Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 #pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
     {
         if (reader.TokenType != JsonTokenType.StartObject)
         {
             throw new JsonException (
-                                     $"Expected a JSON object (\"{{ \"propName\" : ... }}\"), but got \"{reader.TokenType}\"."
+                                     $$"""Expected a JSON object ("{ "propName" : ... }"), but got "{{reader.TokenType}}"."""
                                     );
         }
 
-        var scope = (scopeT)Activator.CreateInstance (typeof (scopeT))!;
+        var scope = (TScopeT)Activator.CreateInstance (typeof (TScopeT))!;
+        var propertyName = string.Empty;
 
         while (reader.Read ())
         {
@@ -37,19 +39,28 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
 
             if (reader.TokenType != JsonTokenType.PropertyName)
             {
-                throw new JsonException ($"Expected a JSON property name, but got \"{reader.TokenType}\".");
+                throw new JsonException ($"After {propertyName}: Expected a JSON property name, but got \"{reader.TokenType}\"");
             }
 
-            string? propertyName = reader.GetString ();
+            propertyName = reader.GetString ();
             reader.Read ();
 
-            if (propertyName is { } && scope!.TryGetValue (propertyName, out ConfigProperty? configProp))
+            // Get the hardcoded property from the TscopeT (e.g. ThemeScope.GetHardCodedProperty)
+            ConfigProperty? configProperty = scope.GetHardCodedProperty (propertyName!);
+
+            if (propertyName is { } && configProperty is { })
             {
-                // This property name was found in the Scope's ScopeProperties dictionary
+                // This property name was found in the cached hard-coded scope dict.
+
+                // Add it, with no value
+                configProperty.HasValue = false;
+                configProperty.PropertyValue = null;
+                scope.TryAdd (propertyName, configProperty);
+
                 // Figure out if it needs a JsonConverter and if so, create one
-                Type? propertyType = configProp?.PropertyInfo?.PropertyType!;
+                Type? propertyType = configProperty?.PropertyInfo?.PropertyType!;
 
-                if (configProp?.PropertyInfo?.GetCustomAttribute (typeof (JsonConverterAttribute)) is
+                if (configProperty?.PropertyInfo?.GetCustomAttribute (typeof (JsonConverterAttribute)) is
                     JsonConverterAttribute jca)
                 {
                     object? converter = Activator.CreateInstance (jca.ConverterType!)!;
@@ -58,69 +69,61 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
                     {
                         var factory = (JsonConverterFactory)converter;
 
-                        if (propertyType is { } && factory.CanConvert (propertyType))
+                        if (factory.CanConvert (propertyType))
                         {
                             converter = factory.CreateConverter (propertyType, options);
                         }
                     }
 
-                    var readHelper = Activator.CreateInstance (
-                                                               (Type?)typeof (ReadHelper<>).MakeGenericType (
-                                                                    typeof (scopeT),
-                                                                    propertyType!
-                                                                   )!,
-                                                               converter
-                                                              ) as ReadHelper;
-
                     try
                     {
+                        var type = (Type?)typeof (ReadHelper<>).MakeGenericType (typeof (TScopeT), propertyType!);
+                        var readHelper = Activator.CreateInstance (type!, converter) as ReadHelper;
+
                         scope! [propertyName].PropertyValue = readHelper?.Read (ref reader, propertyType!, options);
                     }
                     catch (NotSupportedException e)
                     {
                         throw new JsonException (
-                                                 $"Error reading property \"{propertyName}\" of type \"{propertyType?.Name}\".",
+                                                 $"{propertyName}: Error reading property of type \"{propertyType?.Name}\".",
                                                  e
                                                 );
                     }
+                    catch (TargetInvocationException)
+                    {
+                        // QUESTION: Should we try/catch here?
+                        scope! [propertyName].PropertyValue = JsonSerializer.Deserialize (ref reader, propertyType!, options);
+                    }
                 }
                 else
                 {
-                    try
-                    {
-                        scope! [propertyName].PropertyValue =
-                            JsonSerializer.Deserialize (ref reader, propertyType!, SerializerContext);
-                    }
-                    catch (Exception)
-                    {
-                       // Logging.Trace ($"scopeT Read: {ex}");
-                    }
+                    // QUESTION: Should we try/catch here?
+                    scope! [propertyName].PropertyValue = JsonSerializer.Deserialize (ref reader, propertyType!, ConfigurationManager.SerializerContext);
                 }
-                //Logging.Warning ($"{propertyName} = {scope! [propertyName].PropertyValue}");
 
+                //Logging.Warning ($"{propertyName} = {scope! [propertyName].PropertyValue}");
             }
             else
             {
                 // It is not a config property. Maybe it's just a property on the Scope with [JsonInclude]
-                // like ScopeSettings.$schema...
+                // like ScopeSettings.$schema.
+                // If so, don't add it to the dictionary but apply it to the underlying property on 
+                // the scopeT. 
+                // BUGBUG: This is a really bad design. The only time it's used is for $schema though.
                 PropertyInfo? property = scope!.GetType ()
                                                .GetProperties ()
                                                .Where (
                                                        p =>
                                                        {
-                                                           var jia =
-                                                               p.GetCustomAttribute (typeof (JsonIncludeAttribute)) as
-                                                                   JsonIncludeAttribute;
-
-                                                           if (jia is { })
+                                                           if (p.GetCustomAttribute (typeof (JsonIncludeAttribute)) is JsonIncludeAttribute { } jia)
                                                            {
-                                                               var jpna =
+                                                               var jsonPropertyNameAttribute =
                                                                    p.GetCustomAttribute (
                                                                                          typeof (JsonPropertyNameAttribute)
                                                                                         ) as
                                                                        JsonPropertyNameAttribute;
 
-                                                               if (jpna?.Name == propertyName)
+                                                               if (jsonPropertyNameAttribute?.Name == propertyName)
                                                                {
                                                                    // Bit of a hack, modifying propertyName in an enumerator...
                                                                    propertyName = p.Name;
@@ -138,21 +141,28 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
 
                 if (property is { })
                 {
+                    // Set the value of propertyName on the scopeT.
                     PropertyInfo prop = scope.GetType ().GetProperty (propertyName!)!;
-                    prop.SetValue (scope, JsonSerializer.Deserialize (ref reader, prop.PropertyType, SerializerContext));
+                    prop.SetValue (scope, JsonSerializer.Deserialize (ref reader, prop.PropertyType, ConfigurationManager.SerializerContext));
                 }
                 else
                 {
                     // Unknown property
-                    throw new JsonException ($"Unknown property name \"{propertyName}\".");
+                    // TODO: To support forward compatibility, we should just ignore unknown properties?
+                    // TODO: Eg if we read an unknown property, it's possible that the property was added in a later version
+                    throw new JsonException ($"{propertyName}: Unknown property name.");
                 }
             }
         }
 
-        throw new JsonException ("ScopeJsonConverter");
+        throw new JsonException ($"{propertyName}: Json error in ScopeJsonConverter");
     }
 
-    public override void Write (Utf8JsonWriter writer, scopeT scope, JsonSerializerOptions options)
+    [UnconditionalSuppressMessage (
+                                      "AOT",
+                                      "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.",
+                                      Justification = "<Pending>")]
+    public override void Write (Utf8JsonWriter writer, TScopeT scope, JsonSerializerOptions options)
     {
         writer.WriteStartObject ();
 
@@ -167,7 +177,7 @@ public override void Write (Utf8JsonWriter writer, scopeT scope, JsonSerializerO
         {
             writer.WritePropertyName (ConfigProperty.GetJsonPropertyName (p));
             object? prop = scope.GetType ().GetProperty (p.Name)?.GetValue (scope);
-            JsonSerializer.Serialize (writer, prop, prop!.GetType (), SerializerContext);
+            JsonSerializer.Serialize (writer, prop, prop!.GetType (), ConfigurationManager.SerializerContext);
         }
 
         foreach (KeyValuePair<string, ConfigProperty> p in from p in scope
@@ -175,13 +185,13 @@ public override void Write (Utf8JsonWriter writer, scopeT scope, JsonSerializerO
                                                                        cp =>
                                                                            cp.Value.PropertyInfo?.GetCustomAttribute (
                                                                                     typeof (
-                                                                                        SerializableConfigurationProperty)
+                                                                                        ConfigurationPropertyAttribute)
                                                                                    )
                                                                                is
-                                                                               SerializableConfigurationProperty scp
-                                                                           && scp?.Scope == typeof (scopeT)
+                                                                               ConfigurationPropertyAttribute scp
+                                                                           && scp?.Scope == typeof (TScopeT)
                                                                       )
-                                                           where p.Value.PropertyValue != null
+                                                           where p.Value.HasValue
                                                            select p)
         {
             writer.WritePropertyName (p.Key);
@@ -207,13 +217,20 @@ SerializableConfigurationProperty scp
                 {
                     converter.GetType ()
                              .GetMethod ("Write")
-                             ?.Invoke (converter, new [] { writer, p.Value.PropertyValue, options });
+                             ?.Invoke (converter, [writer, p.Value.PropertyValue, options]);
                 }
             }
             else
             {
                 object? prop = p.Value.PropertyValue;
-                JsonSerializer.Serialize (writer, prop, prop!.GetType (), SerializerContext);
+                if (prop == null)
+                {
+                    writer.WriteNullValue ();
+                }
+                else
+                {
+                    JsonSerializer.Serialize (writer, prop, prop.GetType (), ConfigurationManager.SerializerContext);
+                }
             }
         }
 
@@ -226,18 +243,16 @@ internal abstract class ReadHelper
         public abstract object? Read (ref Utf8JsonReader reader, Type type, JsonSerializerOptions options);
     }
 
-    internal class ReadHelper<converterT> : ReadHelper
+    [method: RequiresUnreferencedCode ("Calls System.Delegate.CreateDelegate(Type, Object, String)")]
+    internal class ReadHelper<TConverter> (object converter) : ReadHelper
     {
-        private readonly ReadDelegate _readDelegate;
-
-        [RequiresUnreferencedCode ("Calls System.Delegate.CreateDelegate(Type, Object, String)")]
-        public ReadHelper (object converter) { _readDelegate = (ReadDelegate)Delegate.CreateDelegate (typeof (ReadDelegate), converter, "Read"); }
+        private readonly ReadDelegate _readDelegate = (ReadDelegate)Delegate.CreateDelegate (typeof (ReadDelegate), converter, "Read");
 
         public override object? Read (ref Utf8JsonReader reader, Type type, JsonSerializerOptions options)
         {
             return _readDelegate.Invoke (ref reader, type, options);
         }
 
-        private delegate converterT ReadDelegate (ref Utf8JsonReader reader, Type type, JsonSerializerOptions options);
+        private delegate TConverter ReadDelegate (ref Utf8JsonReader reader, Type type, JsonSerializerOptions options);
     }
 }
diff --git a/Terminal.Gui/Configuration/SerializableConfigurationProperty.cs b/Terminal.Gui/Configuration/SerializableConfigurationProperty.cs
deleted file mode 100644
index 1e0e2545e2..0000000000
--- a/Terminal.Gui/Configuration/SerializableConfigurationProperty.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-#nullable enable
-
-namespace Terminal.Gui;
-
-/// <summary>An attribute that can be applied to a property to indicate that it should be included in the configuration file.</summary>
-/// <example>
-///     [SerializableConfigurationProperty(Scope = typeof(Configuration.ThemeManager.ThemeScope)), JsonConverter
-///     (typeof (JsonStringEnumConverter))] public static LineStyle DefaultBorderStyle { ...
-/// </example>
-[AttributeUsage (AttributeTargets.Property)]
-public class SerializableConfigurationProperty : System.Attribute
-{
-    /// <summary>
-    ///     If <see langword="true"/>, the property will be serialized to the configuration file using only the property
-    ///     name as the key. If <see langword="false"/>, the property will be serialized to the configuration file using the
-    ///     property name pre-pended with the classname (e.g. <c>Application.UseSystemConsole</c>).
-    /// </summary>
-    public bool OmitClassName { get; set; }
-
-    /// <summary>Specifies the scope of the property.</summary>
-    public Type? Scope { get; set; }
-}
diff --git a/Terminal.Gui/Configuration/SettingsScope.cs b/Terminal.Gui/Configuration/SettingsScope.cs
index 1afe60399d..804215cdb7 100644
--- a/Terminal.Gui/Configuration/SettingsScope.cs
+++ b/Terminal.Gui/Configuration/SettingsScope.cs
@@ -1,14 +1,12 @@
 #nullable enable
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
+// TODO: Change to internal to prevent app usage
 /// <summary>
-///     The root object of Terminal.Gui configuration settings / JSON schema. Contains only properties attributed with
+///     INTERNAL: The root object of Terminal.Gui configuration settings / JSON schema. Contains only properties attributed
+///     with
 ///     <see cref="SettingsScope"/>.
 /// </summary>
 /// <example>
@@ -26,139 +24,23 @@ namespace Terminal.Gui;
 [JsonConverter (typeof (ScopeJsonConverter<SettingsScope>))]
 public class SettingsScope : Scope<SettingsScope>
 {
-    /// <summary>The list of paths to the configuration files.</summary>
-    public Dictionary<ConfigLocations, string> Sources { get; } = new ();
-
-    /// <summary>Points to our JSON schema.</summary>
-    [JsonInclude]
-    [JsonPropertyName ("$schema")]
-    public string Schema { get; set; } = "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json";
-
-    /// <summary>Updates the <see cref="SettingsScope"/> with the settings in a JSON string.</summary>
-    /// <param name="stream">Json document to update the settings with.</param>
-    /// <param name="source">The source (filename/resource name) the Json document was read from.</param>
-    /// <param name="location">Location</param>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    public SettingsScope? Update (Stream stream, string source, ConfigLocations location)
+    /// <summary>
+    ///     Initializes a new instance. The dictionary will be populated with uninitialized (
+    ///     <see cref="ConfigProperty.HasValue"/>
+    /// </summary>
+    public SettingsScope ()
     {
-        // Update the existing settings with the new settings.
-        try
-        {
-            Update ((SettingsScope)JsonSerializer.Deserialize (stream, typeof (SettingsScope), SerializerOptions)!);
-            OnUpdated ();
-            Logging.Trace ($"Read from \"{source}\"");
-            if (!Sources.ContainsValue (source))
-            {
-                Sources.Add (location, source);
-            }
-
-            return this;
-        }
-        catch (JsonException e)
-        {
-            if (ThrowOnJsonErrors ?? false)
-            {
-                throw;
-            }
-
-            AddJsonError ($"Error deserializing {source}: {e.Message}");
-        }
-
-        return this;
-    }
-
-    /// <summary>Updates the <see cref="SettingsScope"/> with the settings in a JSON file.</summary>
-    /// <param name="filePath">Path to the file.</param>
-    /// <param name="location">The location</param>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    public SettingsScope? Update (string filePath, ConfigLocations location)
-    {
-        string realPath = filePath.Replace ("~", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
-
-        if (!File.Exists (realPath))
-        {
-            Logging.Warning ($"\"{realPath}\" does not exist.");
-            if (!Sources.ContainsValue (filePath))
-            {
-                Sources.Add (location, filePath);
-            }
-
-            return this;
-        }
-
-        int retryCount = 0;
+        ConfigProperty? configProperty = GetUninitializedProperty ("Theme");
 
-        // Sometimes when the config file is written by an external agent, the change notification comes
-        // before the file is closed. This works around that.
-        while (retryCount < 2)
-        {
-            try
-            {
-                FileStream? stream = File.OpenRead (realPath);
-                SettingsScope? s = Update (stream, filePath, location);
-                stream.Close ();
-                stream.Dispose ();
+        TryAdd ("Theme", configProperty);
 
-                return s;
-            }
-            catch (IOException ioe)
-            {
-                Logging.Warning ($"Couldn't open {filePath}. Retrying...: {ioe}");
-                Task.Delay (100);
-                retryCount++;
-            }
-        }
+        configProperty = GetUninitializedProperty ("Themes");
 
-        return null;
+        TryAdd ("Themes", configProperty);
     }
 
-    /// <summary>Updates the <see cref="SettingsScope"/> with the settings in a JSON string.</summary>
-    /// <param name="json">Json document to update the settings with.</param>
-    /// <param name="source">The source (filename/resource name) the Json document was read from.</param>
-    /// <param name="location">The location.</param>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    public SettingsScope? Update (string? json, string source, ConfigLocations location)
-    {
-        if (string.IsNullOrEmpty (json))
-        {
-            return null;
-        }
-        var stream = new MemoryStream ();
-        var writer = new StreamWriter (stream);
-        writer.Write (json);
-        writer.Flush ();
-        stream.Position = 0;
-
-        return Update (stream, source, location);
-    }
-
-    /// <summary>Updates the <see cref="SettingsScope"/> with the settings from a Json resource.</summary>
-    /// <param name="assembly"></param>
-    /// <param name="resourceName"></param>
-    /// <param name="location"></param>
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-    public SettingsScope? UpdateFromResource (Assembly assembly, string resourceName, ConfigLocations location)
-    {
-        if (string.IsNullOrEmpty (resourceName))
-        {
-            Debug.WriteLine (
-                             $"ConfigurationManager: Resource \"{resourceName}\" does not exist in \"{assembly.GetName ().Name}\"."
-                            );
-
-            return this;
-        }
-
-        using Stream? stream = assembly.GetManifestResourceStream (resourceName);
-
-        if (stream is null)
-        {
-            return null;
-        }
-
-        return Update (stream, $"resource://[{assembly.GetName ().Name}]/{resourceName}", location);
-    }
+    /// <summary>Points to our JSON schema.</summary>
+    [JsonInclude]
+    [JsonPropertyName ("$schema")]
+    public string Schema { get; set; } = "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json";
 }
diff --git a/Terminal.Gui/Configuration/SourceGenerationContext.cs b/Terminal.Gui/Configuration/SourceGenerationContext.cs
index c624cf839f..300b850562 100644
--- a/Terminal.Gui/Configuration/SourceGenerationContext.cs
+++ b/Terminal.Gui/Configuration/SourceGenerationContext.cs
@@ -1,14 +1,23 @@
-using System.Text.Json.Serialization;
+using System.Collections.Concurrent;
+using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
 /// <summary>
-///     Allow AOT and self-contained single file applications with the <see cref="System.Text.Json.Serialization"/>
+///     Allow AOT and self-contained single file applications with the <see cref="System.Text.Json.Serialization"/>.
+///     <para>
+///         The SourceGenerationContext class leverages the System.Text.Json source generation feature to pre-generate
+///         serialization metadata for specific types. This approach avoids runtime reflection, which is problematic in AOT
+///         scenarios where metadata might be stripped, and improves performance by generating serialization code at
+///         compile time.
+///     </para>
 /// </summary>
+[JsonSerializable (typeof (bool?))]
+[JsonSerializable (typeof (Dictionary<string, object>))]
+[JsonSerializable (typeof (List<string>))]
+
 [JsonSerializable (typeof (Attribute))]
 [JsonSerializable (typeof (Color))]
-[JsonSerializable (typeof (AppScope))]
-[JsonSerializable (typeof (SettingsScope))]
 [JsonSerializable (typeof (Key))]
 [JsonSerializable (typeof (Glyphs))]
 [JsonSerializable (typeof (Alignment))]
@@ -16,10 +25,19 @@ namespace Terminal.Gui;
 [JsonSerializable (typeof (LineStyle))]
 [JsonSerializable (typeof (ShadowStyle))]
 [JsonSerializable (typeof (HighlightStyle))]
-[JsonSerializable (typeof (bool?))]
+[JsonSerializable (typeof (TextStyle))]
 [JsonSerializable (typeof (Dictionary<ColorName16, string>))]
-[JsonSerializable (typeof (Dictionary<string, ThemeScope>))]
-[JsonSerializable (typeof (Dictionary<string, ColorScheme>))]
 [JsonSerializable (typeof (Dictionary<string, Color>))]
+
+[JsonSerializable (typeof (Dictionary<string, ConfigProperty>))]
+[JsonSerializable (typeof (ConcurrentDictionary<string, ConfigProperty>))]
+[JsonSerializable (typeof (ConfigProperty))]
+
+[JsonSerializable (typeof (Scope<string>))]
+[JsonSerializable (typeof (AppSettingsScope))]
+[JsonSerializable (typeof (SettingsScope))]
+[JsonSerializable (typeof (ConcurrentDictionary<string, ThemeScope>))]
+[JsonSerializable (typeof (Dictionary<string, Scheme>))]
+
 internal partial class SourceGenerationContext : JsonSerializerContext
 { }
diff --git a/Terminal.Gui/Configuration/SourcesManager.cs b/Terminal.Gui/Configuration/SourcesManager.cs
new file mode 100644
index 0000000000..7290865419
--- /dev/null
+++ b/Terminal.Gui/Configuration/SourcesManager.cs
@@ -0,0 +1,206 @@
+#nullable enable
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Text.Json;
+
+namespace Terminal.Gui.Configuration;
+
+/// <summary>
+///    Manages the <see cref="ConfigurationManager"/> Sources and provides the API for loading them. Source is a location where a configuration can be stored. Sources are defined in <see cref="ConfigLocations"/>.
+/// </summary>
+public class SourcesManager
+{
+    /// <summary>
+    ///     Provides a map from each of the <see cref="ConfigLocations"/> to file system and resource paths that have been loaded by <see cref="ConfigurationManager"/>.
+    /// </summary>
+    public Dictionary<ConfigLocations, string> Sources { get; } = new ();
+
+    /// <summary>INTERNAL: Loads <paramref name="stream"/> into the specified <see cref="SettingsScope"/>.</summary>
+    /// <param name="settingsScope">The Settings Scope object that <paramref name="stream"/> will be loaded into.</param>
+    /// <param name="stream">Json document to update the settings with.</param>
+    /// <param name="source">The source (filename/resource name) the Json document was read from.</param>
+    /// <param name="location">The Config Location corresponding to <paramref name="source"/></param>
+    /// <returns><see langword="true"/> if the settingsScope was updated.</returns>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal bool Load (SettingsScope? settingsScope, Stream stream, string source, ConfigLocations location)
+    {
+        if (settingsScope is null)
+        {
+            return false;
+        }
+
+        // Update the existing settings with the new settings.
+        try
+        {
+#if DEBUG
+            string? json = new StreamReader (stream).ReadToEnd ();
+            stream.Position = 0;
+            Debug.Assert (json != null, "json != null");
+#endif
+            SettingsScope? scope = JsonSerializer.Deserialize (stream, typeof (SettingsScope), ConfigurationManager.SerializerContext.Options) as SettingsScope;
+            settingsScope.UpdateFrom (scope!);
+            ConfigurationManager.OnUpdated ();
+
+            AddSource (location, source);
+
+            Logging.Trace ($"Read configuration from \"{source}\" - ConfigLocation: {location}");
+            return true;
+        }
+        catch (JsonException e)
+        {
+            if (ConfigurationManager.ThrowOnJsonErrors ?? false)
+            {
+                throw;
+            }
+
+            ConfigurationManager.AddJsonError ($"Error reading {source}: {e.Message}");
+        }
+
+        return false;
+    }
+
+    internal void AddSource (ConfigLocations location, string source)
+    {
+        if (!Sources.TryAdd (location, source))
+        {
+            //Logging.Warning ($"{location} has already been added to Sources.");
+            Sources [location] = source;
+        }
+    }
+
+
+    /// <summary>INTERNAL: Loads the `config.json` file a <paramref name="filePath"/> into the specified <see cref="SettingsScope"/>.</summary>
+    /// <param name="settingsScope">The Settings Scope object that <paramref name="filePath"/> will be loaded into.</param>
+    /// <param name="filePath">Json document to update the settings with.</param>
+    /// <param name="location">The Config Location corresponding to <paramref name="filePath"/></param>
+    /// <returns><see langword="true"/> if the settingsScope was updated.</returns>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal bool Load (SettingsScope? settingsScope, string filePath, ConfigLocations location)
+    {
+        string realPath = filePath.Replace ("~", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
+
+        if (!File.Exists (realPath))
+        {
+            //Logging.Warning ($"\"{realPath}\" does not exist.");
+
+            // Always add the source even if it doesn't exist.
+            AddSource (location, filePath);
+            return true;
+        }
+
+        int retryCount = 0;
+
+        // Sometimes when the config file is written by an external agent, the change notification comes
+        // before the file is closed. This works around that.
+        while (retryCount < 2)
+        {
+            try
+            {
+                FileStream? stream = File.OpenRead (realPath);
+
+                bool ret = Load (settingsScope, stream, filePath, location);
+                stream.Close ();
+                stream.Dispose ();
+
+                return ret;
+            }
+            catch (IOException ioe)
+            {
+                Logging.Warning ($"{ioe.Message}. Retrying...");
+                Task.Delay (100);
+                retryCount++;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>INTERNAL: Loads the Json document in <paramref name="json"/> into the specified <see cref="SettingsScope"/>.</summary>
+    /// <param name="settingsScope">The Settings Scope object that <paramref name="json"/> will be loaded into.</param>
+    /// <param name="json">Json document to update the settings with.</param>
+    /// <param name="source">The source (filename/resource name) the Json document was read from.</param>
+    /// <param name="location">The Config Location corresponding to <paramref name="json"/></param>
+    /// <returns><see langword="true"/> if the settingsScope was updated.</returns>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal bool Load (SettingsScope? settingsScope, string? json, string source, ConfigLocations location)
+    {
+        Debug.Assert (location != ConfigLocations.All);
+
+        if (string.IsNullOrEmpty (json))
+        {
+            return false;
+        }
+        var stream = new MemoryStream ();
+        var writer = new StreamWriter (stream);
+        writer.Write (json);
+        writer.Flush ();
+        stream.Position = 0;
+
+        return Load (settingsScope, stream, source, location);
+    }
+
+    /// <summary>INTERNAL: Loads the Json document from the resource named <paramref name="resourceName"/> from <paramref name="assembly"/> into the specified <see cref="SettingsScope"/>.</summary>
+    /// <param name="settingsScope">The Settings Scope object that <paramref name="resourceName"/> will be loaded into.</param>
+    /// <param name="assembly">The assembly containing the resource.</param>
+    /// <param name="resourceName">The name of the resource containing the Json document was read from.</param>
+    /// <param name="location">The Config Location corresponding to <paramref name="resourceName"/></param>
+    /// <returns><see langword="true"/> if the settingsScope was updated.</returns>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal bool Load (SettingsScope? settingsScope, Assembly assembly, string resourceName, ConfigLocations location)
+    {
+        if (string.IsNullOrEmpty (resourceName))
+        {
+            Logging.Warning ($"{resourceName} must not be null or empty.");
+            return false;
+        }
+
+        using Stream? stream = assembly.GetManifestResourceStream (resourceName);
+
+        if (stream is null)
+        {
+            Logging.Warning ($"Resource \"{resourceName}\" does not exist in \"{assembly.GetName ().Name}\".");
+            return false;
+        }
+
+        return Load (settingsScope, stream, $"resource://[{assembly.GetName ().Name}]/{resourceName}", location);
+    }
+
+
+    /// <summary>
+    ///     INTERNAL: Returns a JSON document with the configuration specified.
+    /// </summary>
+    /// <param name="scope"></param>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal string ToJson (SettingsScope? scope)
+    {
+        //Logging.Debug  ("ConfigurationManager.ToJson()");
+        return JsonSerializer.Serialize (scope, typeof (SettingsScope), ConfigurationManager.SerializerContext);
+    }
+
+    /// <summary>
+    ///     INTERNAL: Returns a stream with the configuration specified.
+    /// </summary>
+    /// <param name="scope"></param>
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
+    internal Stream ToStream (SettingsScope? scope)
+    {
+        string json = JsonSerializer.Serialize (scope, typeof (SettingsScope), ConfigurationManager.SerializerContext);
+
+        // turn it into a stream
+        var stream = new MemoryStream ();
+        var writer = new StreamWriter (stream);
+        writer.Write (json);
+        writer.Flush ();
+        stream.Position = 0;
+
+        return stream;
+    }
+}
+
diff --git a/Terminal.Gui/Configuration/ThemeManager.cs b/Terminal.Gui/Configuration/ThemeManager.cs
index e786ed7980..599b86519f 100644
--- a/Terminal.Gui/Configuration/ThemeManager.cs
+++ b/Terminal.Gui/Configuration/ThemeManager.cs
@@ -1,288 +1,312 @@
 #nullable enable
-using System.Collections;
-using System.Diagnostics;
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
-/// <summary>Contains a dictionary of the <see cref="ThemeManager.Theme"/>s for a Terminal.Gui application.</summary>
+/// <summary>Manages Themes.</summary>
 /// <remarks>
 ///     <para>A Theme is a collection of settings that are named. The default theme is named "Default".</para>
-///     <para>The <see cref="ThemeManager.Theme"/> property is used to determine the currently active theme.</para>
+///     <para>The <see cref="Theme"/> property is used to determine the currently active theme.</para>
+///     <para>The <see cref="Themes"/> property is a dictionary of themes.</para>
 /// </remarks>
-/// <para>
-///     <see cref="ThemeManager"/> is a singleton class. It is created when the first <see cref="ThemeManager"/> property
-///     is accessed. Accessing <see cref="ThemeManager.Instance"/> is the same as accessing
-///     <see cref="ConfigurationManager.Themes"/>.
-/// </para>
-/// <example>
-///     <code>
-/// 	"Themes": [
-/// 	{
-/// 		"Default": {
-/// 			"ColorSchemes": [
-/// 			{
-/// 			"TopLevel": {
-/// 			"Normal": {
-/// 				"Foreground": "BrightGreen",
-/// 				"Background": "Black"
-/// 			},
-/// 			"Focus": {
-/// 			"Foreground": "White",
-/// 				"Background": "Cyan"
-/// 
-/// 			},
-/// 			"HotNormal": {
-/// 				"Foreground": "Yellow",
-/// 				"Background": "Black"
-/// 
-/// 			},
-/// 			"HotFocus": {
-/// 				"Foreground": "Blue",
-/// 				"Background": "Cyan"
-/// 			},
-/// 			"Disabled": {
-/// 				"Foreground": "DarkGray",
-/// 				"Background": "Black"
-/// 
-/// 			}
-/// 		}
-/// 	}
-/// </code>
-/// </example>
-public class ThemeManager : IDictionary<string, ThemeScope>
+public static class ThemeManager
 {
-    private static string _theme = string.Empty;
-    static ThemeManager () { } // Make sure it's truly lazy
-    private ThemeManager () { } // Prevent instantiation outside
+    /// <summary>
+    ///     Convenience method to get the current theme. The current theme is the item in the <see cref="Themes"/> dictionary,
+    ///     with the key of <see cref="Theme"/>.
+    /// </summary>
+    /// <returns></returns>
+    public static ThemeScope GetCurrentTheme () { return Themes! [Theme]; }
+
+    /// <summary>
+    ///     Convenience method to get the themes dictionary. The themes dictionary is a dictionary of <see cref="ThemeScope"/>
+    ///     objects, with the key being the name of the theme.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public static ConcurrentDictionary<string, ThemeScope> GetThemes ()
+    {
+        if (!ConfigurationManager.IsInitialized ())
+        {
+            // We're being called from the module initializer.
+            // We need to provide a dictionary of themes containing the hard-coded theme.
+            return HardCodedThemes ()!;
+        }
+
+        if (ConfigurationManager.Settings is null)
+        {
+            throw new InvalidOperationException ("Settings is null.");
+        }
+
+        if (ConfigurationManager.Settings.TryGetValue ("Themes", out ConfigProperty? themes))
+        {
+            if (themes.HasValue)
+            {
+                return (themes.PropertyValue as ConcurrentDictionary<string, ThemeScope>)!;
+            }
 
-    /// <summary>Class is a singleton...</summary>
-    public static ThemeManager Instance { get; } = new ();
+            return HardCodedThemes ()!;
+        }
 
-    /// <summary>Gets or sets the currently selected theme. The value is persisted to the "Theme" property.</summary>
-    [JsonIgnore]
-    public string Theme
+        throw new InvalidOperationException ("Settings has no Themes property.");
+    }
+
+    /// <summary>
+    ///     Convenience method to get a list of theme names.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public static ImmutableList<string> GetThemeNames ()
     {
-        get => SelectedTheme;
+        if (!ConfigurationManager.IsInitialized ())
+        {
+            // We're being called from the module initializer.
+            // We need to provide a dictionary of themes containing the hard-coded theme.
+            return HardCodedThemes ()!.Keys.ToImmutableList ();
+        }
+
+        if (ConfigurationManager.Settings is null)
+        {
+            throw new InvalidOperationException ("Settings is null.");
+        }
+
+        if (!ConfigurationManager.Settings.TryGetValue ("Themes", out ConfigProperty? themes))
+        {
+            throw new InvalidOperationException ("Settings has no Themes property.");
+        }
+
+        ConcurrentDictionary<string, ThemeScope>? returnConcurrentDictionary;
+
+        if (themes.HasValue)
+        {
+            returnConcurrentDictionary = themes.PropertyValue as ConcurrentDictionary<string, ThemeScope>;
+        }
+        else
+        {
+            returnConcurrentDictionary = HardCodedThemes ();
+        }
+
+        return returnConcurrentDictionary!.Keys
+                                          .OrderBy (key => key == DEFAULT_THEME_NAME ? string.Empty : key) // Ensure DEFAULT_THEME_NAME is first
+                                          .ToImmutableList ();
 
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-        set => SelectedTheme = value;
     }
 
-    /// <summary>Holds the <see cref="ThemeScope"/> definitions.</summary>
-    [JsonInclude]
-    [JsonConverter (typeof (DictionaryJsonConverter<ThemeScope>))]
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
-    public static Dictionary<string, ThemeScope>? Themes
+    /// <summary>
+    ///     Convenience method to get the current theme name. The current theme name is the value of <see cref="Theme"/>.
+    /// </summary>
+    /// <returns></returns>
+    public static string GetCurrentThemeName () { return Theme!; }
+
+    /// <summary>
+    ///     Gets the Themes dictionary. <see cref="GetThemes"/> is preferred.
+    ///     The backing store is <c><see cref="ConfigurationManager.Settings"/> ["Themes"]</c>.
+    ///     However, if <see cref="ConfigurationManager.IsInitialized"/> is <c>false</c>, this property will return the
+    ///     hard-coded themes.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"></exception>
+    [JsonConverter (typeof (ConcurrentDictionaryJsonConverter<ThemeScope>))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
+    public static ConcurrentDictionary<string, ThemeScope>? Themes
+    {
+        // Note: This property getter must be public; DeepClone depends on it.
+        get => GetThemes ();
+        internal set => SetThemes (value);
+    }
+
+    private static void SetThemes (ConcurrentDictionary<string, ThemeScope>? dictionary)
+    {
+        if (dictionary is { } && !dictionary.ContainsKey (DEFAULT_THEME_NAME))
+        {
+            throw new InvalidOperationException ($"Themes must include an item named {DEFAULT_THEME_NAME}");
+        }
+
+        if (ConfigurationManager.Settings is { } && ConfigurationManager.Settings.TryGetValue ("Themes", out ConfigProperty? themes))
+        {
+            ConfigurationManager.Settings ["Themes"].PropertyValue = dictionary;
+
+            return;
+        }
+
+        throw new InvalidOperationException ("Settings is null.");
+    }
+
+    private static ConcurrentDictionary<string, ThemeScope>? HardCodedThemes ()
     {
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-        get => Settings? ["Themes"]
-                       ?.PropertyValue as
-                   Dictionary<string, ThemeScope>; // themes ?? new Dictionary<string, ThemeScope> ();
-
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-        set =>
-
-            //if (themes is null || value is null) {
-            //	themes = value;
-            //} else {
-            //	themes = (Dictionary<string, ThemeScope>)DeepMemberwiseCopy (value!, themes!)!;
-            //}
-            Settings! ["Themes"].PropertyValue = value;
+        ThemeScope? hardCodedThemeScope = GetHardCodedThemeScope ();
+
+        if (hardCodedThemeScope is null)
+        {
+            throw new InvalidOperationException ("Hard coded theme scope is null.");
+        }
+
+        return new (new Dictionary<string, ThemeScope> { { DEFAULT_THEME_NAME, hardCodedThemeScope } }, StringComparer.InvariantCultureIgnoreCase);
+    }
+
+    /// <summary>
+    ///     Returns a dictionary of hard-coded ThemeScope properties.
+    /// </summary>
+    /// <returns></returns>
+    private static ThemeScope? GetHardCodedThemeScope ()
+    {
+        IEnumerable<KeyValuePair<string, ConfigProperty>>? hardCodedThemeProperties = ConfigurationManager.GetHardCodedConfigPropertiesByScope ("ThemeScope");
+
+        if (hardCodedThemeProperties is null)
+        {
+            throw new InvalidOperationException ("Hard coded theme properties are null.");
+        }
+
+        var hardCodedThemeScope = new ThemeScope ();
+        foreach (KeyValuePair<string, ConfigProperty> p in hardCodedThemeProperties)
+        {
+            hardCodedThemeScope.AddValue (p.Key, p.Value.PropertyValue);
+        }
+
+        return hardCodedThemeScope;
     }
 
-    /// <summary>The currently selected theme. This is the internal version; see <see cref="Theme"/>.</summary>
+    /// <summary>
+    ///     Since Theme is a dynamic property, we need to cache the value of the selected theme for when CM is not enabled.
+    /// </summary>
+    internal const string DEFAULT_THEME_NAME = "Default";
+
+    /// <summary>
+    ///     The currently selected theme. The backing store is <c><see cref="ConfigurationManager.Settings"/> ["Theme"]</c>.
+    /// </summary>
     [JsonInclude]
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
+    [ConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
     [JsonPropertyName ("Theme")]
-    internal static string SelectedTheme
+    public static string Theme
     {
-        get => _theme;
+        get
+        {
+            if (!ConfigurationManager.IsInitialized ())
+            {
+                // We're being called from the module initializer.
+                // Hard coded default value
+                return DEFAULT_THEME_NAME;
+            }
+
+            if (ConfigurationManager.Settings is { } && ConfigurationManager.Settings.TryGetValue ("Theme", out ConfigProperty? themeCp))
+            {
+                if (themeCp.HasValue)
+                {
+                    return (themeCp.PropertyValue as string)!;
+                }
+
+                return DEFAULT_THEME_NAME;
+            }
+
+            throw new InvalidOperationException ("Settings is null.");
+        }
 
         [RequiresUnreferencedCode ("Calls Terminal.Gui.ConfigurationManager.Settings")]
         [RequiresDynamicCode ("Calls Terminal.Gui.ConfigurationManager.Settings")]
         set
         {
-            string oldTheme = _theme;
-            _theme = value;
+            if (!ConfigurationManager.IsInitialized ())
+            {
+                throw new InvalidOperationException ("Theme cannot be set before ConfigurationManager is initialized.");
+            }
 
-            if ((oldTheme != _theme
-                 || oldTheme != Settings! ["Theme"].PropertyValue as string)
-                 && Settings! ["Themes"]?.PropertyValue is Dictionary<string, ThemeScope> themes && themes.ContainsKey (_theme))
+            if (ConfigurationManager.Settings is null || !ConfigurationManager.Settings.TryGetValue ("Theme", out ConfigProperty? themeCp))
             {
-                Settings! ["Theme"].PropertyValue = _theme;
-                Instance.OnThemeChanged (oldTheme);
+                throw new InvalidOperationException ("Settings is null.");
             }
-        }
-    }
 
-    /// <summary>Event fired he selected theme has changed. application.</summary>
-    public event EventHandler<ThemeManagerEventArgs>? ThemeChanged;
+            if (themeCp is null || !themeCp.HasValue)
+            {
+                throw new InvalidOperationException ("Theme has no value.");
+            }
 
-    [RequiresUnreferencedCode ("Calls Terminal.Gui.ThemeManager.Themes")]
-    [RequiresDynamicCode ("Calls Terminal.Gui.ThemeManager.Themes")]
-    internal static void GetHardCodedDefaults ()
-    {
-        //Logging.Trace ("Themes.GetHardCodedDefaults()");
-        var theme = new ThemeScope ();
-        theme.RetrieveValues ();
+            if (!ConfigurationManager.Settings.TryGetValue ("Themes", out ConfigProperty? themesCp))
+            {
+                throw new InvalidOperationException ("Settings has no Themes property.");
+            }
 
-        Themes = new Dictionary<string, ThemeScope> (StringComparer.InvariantCultureIgnoreCase)
-        {
-            { "Default", theme }
-        };
-        SelectedTheme = "Default";
-    }
+            string previousThemeValue = GetCurrentThemeName ();
 
-    /// <summary>Called when the selected theme has changed. Fires the <see cref="ThemeChanged"/> event.</summary>
-    internal void OnThemeChanged (string theme)
-    {
-        //Logging.Trace ($"Themes.OnThemeChanged({theme}) -> {Theme}");
-        ThemeChanged?.Invoke (this, new ThemeManagerEventArgs (theme));
+            if (value == previousThemeValue)
+            {
+                return;
+            }
+
+            if (!Themes!.ContainsKey (value))
+            {
+                Logging.Warning ($"{value} is not a valid theme name.");
+            }
+
+            // Update the backing store
+            ConfigurationManager.Settings! ["Theme"].PropertyValue = value;
+
+            OnThemeChanged (previousThemeValue, value);
+        }
     }
 
+    /// <summary>
+    ///     INTERNAL: Updates <see cref="Themes"/> to the current values of the static
+    ///     <see cref="ConfigurationPropertyAttribute"/> properties.
+    /// </summary>
     [RequiresUnreferencedCode ("Calls Terminal.Gui.ThemeManager.Themes")]
     [RequiresDynamicCode ("Calls Terminal.Gui.ThemeManager.Themes")]
-    internal static void Reset ()
-    {
-        //Logging.Trace ("Themes.Reset()");
-        Colors.Reset ();
-        Themes?.Clear ();
-        SelectedTheme = string.Empty;
-    }
+    internal static void UpdateToCurrentValues () { Themes! [Theme].LoadCurrentValues (); }
 
-    #region IDictionary
+    /// <summary>
+    ///     INTERNAL: Resets all themes to the values the <see cref="ConfigurationPropertyAttribute"/> properties contained
+    ///     when the module was initialized.
+    /// </summary>
+    internal static void ResetToHardCodedDefaults ()
+    {
+        if (!ConfigurationManager.IsInitialized ())
+        {
+            throw new InvalidOperationException ("ThemeManager is not initialized.");
+        }
 
-#pragma warning disable 1591
-    [UnconditionalSuppressMessage ("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    [UnconditionalSuppressMessage ("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
-    public ICollection<string> Keys => ((IDictionary<string, ThemeScope>)Themes!).Keys;
+        if (ConfigurationManager.Settings is null)
+        {
+            return;
+        }
 
-    [UnconditionalSuppressMessage ("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    [UnconditionalSuppressMessage ("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
-    public ICollection<ThemeScope> Values => ((IDictionary<string, ThemeScope>)Themes!).Values;
+        ThemeScope? hardCodedThemeScope = GetHardCodedThemeScope ();
 
-    [UnconditionalSuppressMessage ("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    [UnconditionalSuppressMessage ("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
-    public int Count => ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).Count;
+        if (hardCodedThemeScope is null)
+        {
+            throw new InvalidOperationException ("Hard coded theme scope is null.");
+        }
 
-    [UnconditionalSuppressMessage ("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    [UnconditionalSuppressMessage ("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
-    public bool IsReadOnly => ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).IsReadOnly;
+        ConcurrentDictionary<string, ThemeScope> hardCodedThemes = new (
+                                                                        new Dictionary<string, ThemeScope>
+                                                                        {
+                                                                            { Theme, hardCodedThemeScope }
+                                                                        },
+                                                                        StringComparer.InvariantCultureIgnoreCase);
 
-    public ThemeScope this [string key]
-    {
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-        get => ((IDictionary<string, ThemeScope>)Themes!) [key];
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-        [RequiresUnreferencedCode ("AOT")]
-        [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-        set => ((IDictionary<string, ThemeScope>)Themes!) [key] = value;
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
+        ConfigurationManager.Settings ["Themes"].PropertyValue = hardCodedThemes;
+        ConfigurationManager.Settings ["Theme"].PropertyValue = DEFAULT_THEME_NAME;
     }
 
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public void Add (string key, ThemeScope value) { ((IDictionary<string, ThemeScope>)Themes!).Add (key, value); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public bool ContainsKey (string key) { return ((IDictionary<string, ThemeScope>)Themes!).ContainsKey (key); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public bool Remove (string key) { return ((IDictionary<string, ThemeScope>)Themes!).Remove (key); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public bool TryGetValue (string key, out ThemeScope value) { return ((IDictionary<string, ThemeScope>)Themes!).TryGetValue (key, out value!); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public void Add (KeyValuePair<string, ThemeScope> item) { ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).Add (item); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public void Clear () { ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).Clear (); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public bool Contains (KeyValuePair<string, ThemeScope> item) { return ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).Contains (item); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public void CopyTo (KeyValuePair<string, ThemeScope> [] array, int arrayIndex)
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
+    /// <summary>Called when the selected theme has changed. Fires the <see cref="ThemeChanged"/> event.</summary>
+    internal static void OnThemeChanged (string previousThemeName, string newThemeName)
     {
-        ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).CopyTo (array, arrayIndex);
+        Logging.Debug ($"Themes.OnThemeChanged({previousThemeName}) -> {Theme}");
+        StringPropertyEventArgs args = new StringPropertyEventArgs (in previousThemeName, ref newThemeName!);
+        ThemeChanged?.Invoke (null, args);
     }
 
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public bool Remove (KeyValuePair<string, ThemeScope> item) { return ((ICollection<KeyValuePair<string, ThemeScope>>)Themes!).Remove (item); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-
-    [RequiresUnreferencedCode ("AOT")]
-    [RequiresDynamicCode ("AOT")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    public IEnumerator<KeyValuePair<string, ThemeScope>> GetEnumerator () { return ((IEnumerable<KeyValuePair<string, ThemeScope>>)Themes!).GetEnumerator (); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
+    /// <summary>Raised when the selected theme has changed.</summary>
+    public static event EventHandler<StringPropertyEventArgs>? ThemeChanged;
 
-    [RequiresUnreferencedCode ("Calls Terminal.Gui.ThemeManager.Themes")]
-    [RequiresDynamicCode ("Calls Terminal.Gui.ThemeManager.Themes")]
-#pragma warning disable IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning disable IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-    IEnumerator IEnumerable.GetEnumerator () { return ((IEnumerable)Themes!).GetEnumerator (); }
-#pragma warning restore IL3051 // 'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore IL2046 // 'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.
-#pragma warning restore 1591
-
-    #endregion
+    /// <summary>
+    ///     Validates all themes in the <see cref="Themes"/> dictionary.
+    /// </summary>
+    public static void Validate ()
+    {
+        foreach (ThemeScope theme in Themes!.Values)
+        {
+            theme.Validate ();
+        }
+    }
 }
diff --git a/Terminal.Gui/Configuration/ThemeScope.cs b/Terminal.Gui/Configuration/ThemeScope.cs
index 03f9971bf4..f379cd888a 100644
--- a/Terminal.Gui/Configuration/ThemeScope.cs
+++ b/Terminal.Gui/Configuration/ThemeScope.cs
@@ -3,6 +3,7 @@
 
 namespace Terminal.Gui;
 
+// TODO: Change to internal to prevent app usage
 /// <summary>
 ///     The root object for a Theme. A Theme is a set of settings that are applied to the running
 ///     <see cref="Application"/> as a group.
@@ -13,7 +14,7 @@ namespace Terminal.Gui;
 /// <example>
 ///     <code>
 /// 	"Default": {
-/// 		"ColorSchemes": [
+/// 		"Schemes": [
 /// 		{
 /// 		"TopLevel": {
 /// 		"Normal": {
@@ -44,4 +45,7 @@ namespace Terminal.Gui;
 /// </example>
 [JsonConverter (typeof (ScopeJsonConverter<ThemeScope>))]
 public class ThemeScope : Scope<ThemeScope>
-{ }
+{
+}
+
+
diff --git a/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs b/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs
index fb5136316d..5f17707ffe 100644
--- a/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs
+++ b/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs
@@ -595,7 +595,7 @@ public Attribute CurrentAttribute
             // TODO: This makes IConsoleDriver dependent on Application, which is not ideal. Once Attribute.PlatformColor is removed, this can be fixed.
             if (Application.Driver is { })
             {
-                _currentAttribute = new (value.Foreground, value.Background);
+                _currentAttribute = new (value.Foreground, value.Background, value.Style);
 
                 return;
             }
@@ -629,7 +629,7 @@ public virtual Attribute MakeColor (in Color foreground, in Color background)
     {
         // Encode the colors into the int value.
         return new (
-                    -1, // only used by cursesdriver!
+                    0xFF, // only used by cursesdriver!
                     foreground,
                     background
                    );
diff --git a/Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs b/Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs
index e0b2e2aed8..a6ffe79496 100644
--- a/Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs
+++ b/Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs
@@ -1847,6 +1847,8 @@ public static void CSI_AppendBackgroundColorRGB (StringBuilder builder, int r, i
         builder.Append ($"{CSI}48;2;{r};{g};{b}m");
     }
 
+
+
     #endregion
 
     #region Text Styles
diff --git a/Terminal.Gui/ConsoleDrivers/V2/ApplicationV2.cs b/Terminal.Gui/ConsoleDrivers/V2/ApplicationV2.cs
index af5e912c29..ba72a16db7 100644
--- a/Terminal.Gui/ConsoleDrivers/V2/ApplicationV2.cs
+++ b/Terminal.Gui/ConsoleDrivers/V2/ApplicationV2.cs
@@ -76,8 +76,6 @@ public override void Init (IConsoleDriver? driver = null, string? driverName = n
         // making it use custom driver in future shutdown/init calls where no driver is specified
         CreateDriver (driverName ?? _driverName);
 
-        Application.InitializeConfigurationManagement ();
-
         Application.Initialized = true;
 
         Application.OnInitializedChanged (this, new (true));
diff --git a/Terminal.Gui/ConsoleDrivers/V2/ConsoleDriverFacade.cs b/Terminal.Gui/ConsoleDrivers/V2/ConsoleDriverFacade.cs
index 2cabb1e56a..e3c88aeabe 100644
--- a/Terminal.Gui/ConsoleDrivers/V2/ConsoleDriverFacade.cs
+++ b/Terminal.Gui/ConsoleDrivers/V2/ConsoleDriverFacade.cs
@@ -344,7 +344,7 @@ public Attribute MakeColor (in Color foreground, in Color background)
     {
         // TODO: what even is this? why Attribute constructor wants to call Driver method which must return an instance of Attribute? ?!?!?!
         return new (
-                    -1, // only used by cursesdriver!
+                    0xFF, // only used by cursesdriver!
                     foreground,
                     background
                    );
diff --git a/Terminal.Gui/ConsoleDrivers/V2/NetOutput.cs b/Terminal.Gui/ConsoleDrivers/V2/NetOutput.cs
index fb93f6405d..7299c0262f 100644
--- a/Terminal.Gui/ConsoleDrivers/V2/NetOutput.cs
+++ b/Terminal.Gui/ConsoleDrivers/V2/NetOutput.cs
@@ -138,9 +138,9 @@ public void Write (IOutputBuffer buffer)
                             attr.Background.B
                         );
 
-                        EscSeqUtils.CSI_AppendTextStyleChange (output, _redrawTextStyle, attr.TextStyle);
+                        EscSeqUtils.CSI_AppendTextStyleChange (output, _redrawTextStyle, attr.Style);
 
-                        _redrawTextStyle = attr.TextStyle;
+                        _redrawTextStyle = attr.Style;
                     }
 
                     outputWidth++;
diff --git a/Terminal.Gui/ConsoleDrivers/V2/OutputBuffer.cs b/Terminal.Gui/ConsoleDrivers/V2/OutputBuffer.cs
index 1b62959858..24137100d9 100644
--- a/Terminal.Gui/ConsoleDrivers/V2/OutputBuffer.cs
+++ b/Terminal.Gui/ConsoleDrivers/V2/OutputBuffer.cs
@@ -34,7 +34,7 @@ public Attribute CurrentAttribute
             if (Application.Driver is { })
             {
                 // TODO: Update this when attributes can include TextStyle in the constructor
-                _currentAttribute = new (value.Foreground, value.Background) { TextStyle = value.TextStyle };
+                _currentAttribute = new (value.Foreground, value.Background, value.Style);
 
                 return;
             }
diff --git a/Terminal.Gui/ConsoleDrivers/V2/WindowsOutput.cs b/Terminal.Gui/ConsoleDrivers/V2/WindowsOutput.cs
index 4ec6166162..16ae599132 100644
--- a/Terminal.Gui/ConsoleDrivers/V2/WindowsOutput.cs
+++ b/Terminal.Gui/ConsoleDrivers/V2/WindowsOutput.cs
@@ -236,8 +236,8 @@ public bool WriteToConsole (Size size, ExtendedCharInfo [] charInfoBuffer, Coord
                     prev = attr;
                     EscSeqUtils.CSI_AppendForegroundColorRGB (stringBuilder, attr.Foreground.R, attr.Foreground.G, attr.Foreground.B);
                     EscSeqUtils.CSI_AppendBackgroundColorRGB (stringBuilder, attr.Background.R, attr.Background.G, attr.Background.B);
-                    EscSeqUtils.CSI_AppendTextStyleChange (stringBuilder, _redrawTextStyle, attr.TextStyle);
-                    _redrawTextStyle = attr.TextStyle;
+                    EscSeqUtils.CSI_AppendTextStyleChange (stringBuilder, _redrawTextStyle, attr.Style);
+                    _redrawTextStyle = attr.Style;
                 }
 
                 if (info.Char != '\x1b')
diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsConsole.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsConsole.cs
index 0a6d12e967..3dfd993aad 100644
--- a/Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsConsole.cs
+++ b/Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsConsole.cs
@@ -141,6 +141,10 @@ private void ProcessInputQueue ()
         }
     }
 
+
+    // Last text style used, for updating style with EscSeqUtils.CSI_AppendTextStyleChange().
+    private TextStyle _redrawTextStyle = TextStyle.None;
+
     private CharInfo []? _originalStdOutChars;
 
     public bool WriteToConsole (Size size, ExtendedCharInfo [] charInfoBuffer, Coord bufferSize, SmallRect window, bool force16Colors)
@@ -191,6 +195,8 @@ public bool WriteToConsole (Size size, ExtendedCharInfo [] charInfoBuffer, Coord
                     prev = attr;
                     EscSeqUtils.CSI_AppendForegroundColorRGB (_stringBuilder, attr.Foreground.R, attr.Foreground.G, attr.Foreground.B);
                     EscSeqUtils.CSI_AppendBackgroundColorRGB (_stringBuilder, attr.Background.R, attr.Background.G, attr.Background.B);
+                    EscSeqUtils.CSI_AppendTextStyleChange (_stringBuilder, _redrawTextStyle, attr.Style);
+                    _redrawTextStyle = attr.Style;
                 }
 
                 if (info.Char != '\x1b')
diff --git a/Terminal.Gui/Drawing/Attribute.cs b/Terminal.Gui/Drawing/Attribute.cs
index cba89e682b..8f8c218cae 100644
--- a/Terminal.Gui/Drawing/Attribute.cs
+++ b/Terminal.Gui/Drawing/Attribute.cs
@@ -1,20 +1,23 @@
-#nullable enable
+#nullable enable
 using System.Numerics;
 using System.Text.Json.Serialization;
 
 namespace Terminal.Gui;
 
-
-// TODO: Add support for other attributes (bold, underline, etc.) once the platform drivers support them.
-// TODO: See https://github.com/gui-cs/Terminal.Gui/issues/457
-
-
-/// <summary>Attributes represent how text is styled when displayed in the terminal.</summary>
+/// <summary>
+///     Represents the visual styling for a UI element, including foreground and background color and text style.
+/// </summary>
 /// <remarks>
-///     <see cref="Attribute"/> provides a platform independent representation of colors (and someday other forms of
-///     text styling). They encode both the foreground and the background color and are used in the
-///     <see cref="ColorScheme"/> class to define color schemes that can be used in an application.
+///     <para>
+///         <see cref="Attribute"/> is a lightweight, immutable struct used to define how visual elements are rendered
+///         in a terminal UI. It wraps color and style information in a platform-independent way and is used
+///         extensively in <see cref="Scheme"/>, <see cref="VisualRole"/>, and theming infrastructure.
+///     </para>
 /// </remarks>
+/// <seealso cref="Color"/>
+/// <seealso cref="TextStyle"/>
+/// <seealso cref="VisualRole"/>
+/// <seealso cref="Scheme"/>
 [JsonConverter (typeof (AttributeJsonConverter))]
 public readonly record struct Attribute : IEqualityOperators<Attribute, Attribute, bool>
 {
@@ -22,96 +25,186 @@ namespace Terminal.Gui;
     [JsonIgnore]
     public static Attribute Default => new (Color.White, Color.Black);
 
-    /// <summary>The <see cref="IConsoleDriver"/>-specific color value.</summary>
+    // TODO: Once CursesDriver is dead, remove this property
+    /// <summary>INTERNAL: The <see cref="IConsoleDriver"/>-specific color value.</summary>
     [JsonIgnore (Condition = JsonIgnoreCondition.Always)]
     internal int PlatformColor { get; init; }
 
-    /// <summary>The foreground color.</summary>
+    /// <summary>
+    ///     Gets the foreground <see cref="Color"/> used to render text.
+    /// </summary>
     [JsonConverter (typeof (ColorJsonConverter))]
-    public Color Foreground { get; }
+    public Color Foreground { get; init; }
 
-    /// <summary>The background color.</summary>
+    /// <summary>
+    ///     Gets the background <see cref="Color"/> used behind text.
+    /// </summary>
     [JsonConverter (typeof (ColorJsonConverter))]
-    public Color Background { get; }
+    public Color Background { get; init; }
 
-    // TODO: Add constructors which permit including a TextStyle.
-    /// <summary>The text style (bold, italic, underlined, etc.).</summary>
-    public TextStyle TextStyle { get; init; } = TextStyle.None;
+    // TODO: Add constructors which permit including a Style.
+    /// <summary>
+    ///     Gets the <see cref="TextStyle"/> (e.g., bold, underline, italic) applied to text.
+    /// </summary>
+    public TextStyle Style { get; init; } = TextStyle.None;
 
-    /// <summary>Initializes a new instance with default values.</summary>
-    public Attribute ()
-    {
-        this = Default with { PlatformColor = -1 };
-    }
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="Attribute"/> struct with default values.
+    /// </summary>
+    public Attribute () { this = Default with { PlatformColor = -1 }; }
 
-    /// <summary>Initializes a new instance from an existing instance.</summary>
-    public Attribute (in Attribute attr)
-    {
-        this = attr with { PlatformColor = -1 };
-    }
+    /// <summary>
+    ///     Initializes a new <see cref="Attribute"/> from an existing instance, preserving explicit state.
+    /// </summary>
+    public Attribute (in Attribute attr) { this = attr with { PlatformColor = -1 }; }
 
-    /// <summary>Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
+    /// <summary>INTERNAL: Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
     /// <param name="platformColor">platform-dependent color value.</param>
     /// <param name="foreground">Foreground</param>
     /// <param name="background">Background</param>
-    internal Attribute (int platformColor, Color foreground, Color background)
+    internal Attribute (in int platformColor, in Color foreground, in Color background)
     {
         Foreground = foreground;
         Background = background;
         PlatformColor = platformColor;
+        Style = TextStyle.None;
     }
 
-    /// <summary>Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
-    /// <param name="foreground">Foreground</param>
-    /// <param name="background">Background</param>
+    /// <summary>
+    ///     Initializes an instance using two named colors.
+    /// </summary>
     public Attribute (in Color foreground, in Color background)
     {
         Foreground = foreground;
         Background = background;
 
         // TODO: Once CursesDriver supports true color all the PlatformColor stuff goes away
-        PlatformColor = Application.Driver?.MakeColor(in foreground, in background).PlatformColor ?? -1;
+        PlatformColor = Application.Driver?.MakeColor (in foreground, in background).PlatformColor ?? -1;
+        Style = TextStyle.None;
+    }
+
+    /// <summary>
+    ///     Initializes a new instance with foreground, background, and <see cref="TextStyle"/>.
+    /// </summary>
+    public Attribute (in Color foreground, in Color background, in TextStyle style)
+    {
+        Foreground = foreground;
+        Background = background;
+        Style = style;
+
+        // TODO: Once CursesDriver supports true color all the PlatformColor stuff goes away
+        PlatformColor = Application.Driver?.MakeColor (in foreground, in background).PlatformColor ?? -1;
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="Attribute"/> struct from string representations of colors and style.
+    /// </summary>
+    /// <param name="foreground">Foreground color as a string (name, hex, or rgb).</param>
+    /// <param name="background">Background color as a string (name, hex, or rgb).</param>
+    /// <param name="style">Optional style as a string (e.g., "Bold,Underline").</param>
+    /// <exception cref="ArgumentException">Thrown if color parsing fails.</exception>
+    public Attribute (in string foreground, in string background, in string? style = null)
+    {
+        Foreground = Color.Parse (foreground);
+        Background = Color.Parse (background);
+
+        Style = style is { } && Enum.TryParse (style, true, out TextStyle parsedStyle)
+                    ? parsedStyle
+                    : TextStyle.None;
+        PlatformColor = Application.Driver?.MakeColor (Foreground, Background).PlatformColor ?? -1;
     }
 
     /// <summary>
-    ///     Initializes a new instance with a <see cref="ColorName16"/> value. Both <see cref="Foreground"/> and
+    ///     Initializes a new instance of the <see cref="Attribute"/> struct from string representations of colors and style.
+    /// </summary>
+    /// <param name="foreground">Foreground color as a string (name, hex, or rgb).</param>
+    /// <param name="background">Background color as a string (name, hex, or rgb).</param>
+    /// <param name="style">Optional style as a string (e.g., "Bold,Underline").</param>
+    /// <exception cref="ArgumentException">Thrown if color parsing fails.</exception>
+    public Attribute (in string foreground, in string background, in TextStyle style)
+    {
+        Foreground = Color.Parse (foreground);
+        Background = Color.Parse (background);
+
+        Style = style;
+        PlatformColor = Application.Driver?.MakeColor (Foreground, Background).PlatformColor ?? -1;
+    }
+
+    /// <summary>
+    ///     INTERNAL: Initializes a new instance with a <see cref="ColorName16"/> value. Both <see cref="Foreground"/> and
     ///     <see cref="Background"/> will be set to the specified color.
     /// </summary>
-    /// <param name="colorName">Value.</param>
-    internal Attribute (in ColorName16 colorName) : this (in colorName, in colorName) { }
+    /// <param name="color16Name">Value.</param>
+    internal Attribute (in ColorName16 color16Name) : this (in color16Name, in color16Name) { }
 
-    /// <summary>Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
-    /// <param name="foregroundName">Foreground</param>
-    /// <param name="backgroundName">Background</param>
-    public Attribute (in ColorName16 foregroundName, in ColorName16 backgroundName)
-        : this (new Color (in foregroundName), new Color (in backgroundName))
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in ColorName16 foreground16Name, in ColorName16 background16Name)
+        : this (new Color (in foreground16Name), new Color (in background16Name))
     { }
 
-    /// <summary>Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
-    /// <param name="foregroundName">Foreground</param>
-    /// <param name="background">Background</param>
-    public Attribute (in ColorName16 foregroundName, in Color background) : this (new Color (in foregroundName), in background) { }
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in ColorName16 foreground16Name, in Color background) : this (new Color (in foreground16Name), in background) { }
 
-    /// <summary>Initializes a new instance of the <see cref="Attribute"/> struct.</summary>
-    /// <param name="foreground">Foreground</param>
-    /// <param name="backgroundName">Background</param>
-    public Attribute (in Color foreground, in ColorName16 backgroundName) : this (in foreground, new Color (in backgroundName)) { }
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in Color foreground, in ColorName16 background16Name) : this (in foreground, new Color (in background16Name)) { }
+
+    /// <summary>
+    ///     INTERNAL: Initializes a new instance with a <see cref="StandardColors"/> value. Both <see cref="Foreground"/> and
+    ///     <see cref="Background"/> will be set to the specified color.
+    /// </summary>
+    /// <param name="standardColor">Value.</param>
+    internal Attribute (in StandardColor standardColor) : this (in standardColor, in standardColor) { }
 
     /// <summary>
-    ///     Initializes a new instance of the <see cref="Attribute"/> struct with the same colors for the foreground and
-    ///     background.
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in StandardColor foreground, in StandardColor background)
+        : this (new Color (in foreground), new Color (in background))
+    { }
+
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in StandardColor foreground, in Color background) : this (new Color (in foreground), in background) { }
+
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors.
+    /// </summary>
+    public Attribute (in Color foreground, in StandardColor background) : this (in foreground, new Color (in background)) { }
+
+    /// <summary>
+    ///     Initializes an instance using a single color for both foreground and background.
     /// </summary>
-    /// <param name="color">The color.</param>
     public Attribute (in Color color) : this (color, color) { }
 
+    /// <summary>
+    ///     Initializes a new instance with foreground and background colors and a <see cref="TextStyle"/>.
+    /// </summary>
+    public Attribute (in StandardColor foreground, in StandardColor background, in TextStyle style) : this (new (in foreground), new Color (in background), style) { }
+
+
+    /// <inheritdoc/>
+    public bool Equals (Attribute other)
+    {
+        return PlatformColor == other.PlatformColor
+               && Foreground.Equals (other.Foreground)
+               && Background.Equals (other.Background)
+               && Style == other.Style;
+    }
+
     /// <inheritdoc/>
-    public override int GetHashCode () { return HashCode.Combine (PlatformColor, Foreground, Background); }
+    public override int GetHashCode () { return HashCode.Combine (PlatformColor, Foreground, Background, Style); }
 
-    // TODO: Add TextStyle to Attribute.ToString(), modify unit tests to account
     /// <inheritdoc/>
     public override string ToString ()
     {
         // Note: Unit tests are dependent on this format
-        return $"[{Foreground},{Background}]";
+        return $"[{Foreground},{Background},{Style}]";
     }
 }
diff --git a/Terminal.Gui/Drawing/Cell.cs b/Terminal.Gui/Drawing/Cell.cs
index fc7ef2b0b8..001fe5054b 100644
--- a/Terminal.Gui/Drawing/Cell.cs
+++ b/Terminal.Gui/Drawing/Cell.cs
@@ -74,11 +74,11 @@ internal void ClearCombiningMarks ()
     }
 
     /// <inheritdoc/>
-    public override string ToString () { return $"[{Rune}, {Attribute}]"; }
+    public override string ToString () { return $"['{Rune}':{Attribute}]"; }
 
     /// <summary>Converts the string into a <see cref="List{Cell}"/>.</summary>
     /// <param name="str">The string to convert.</param>
-    /// <param name="attribute">The <see cref="Gui.ColorScheme"/> to use.</param>
+    /// <param name="attribute">The <see cref="Gui.Scheme"/> to use.</param>
     /// <returns></returns>
     public static List<Cell> ToCellList (string str, Attribute? attribute = null)
     {
@@ -96,7 +96,7 @@ public static List<Cell> ToCellList (string str, Attribute? attribute = null)
     ///     Splits a string into a List that will contain a <see cref="List{Cell}"/> for each line.
     /// </summary>
     /// <param name="content">The string content.</param>
-    /// <param name="attribute">The color scheme.</param>
+    /// <param name="attribute">The scheme.</param>
     /// <returns>A <see cref="List{Cell}"/> for each line.</returns>
     public static List<List<Cell>> StringToLinesOfCells (string content, Attribute? attribute = null)
     {
diff --git a/Terminal.Gui/Drawing/Color/AnsiColorNameResolver.cs b/Terminal.Gui/Drawing/Color/AnsiColorNameResolver.cs
index 1b61ed0ddb..403a0d35a1 100644
--- a/Terminal.Gui/Drawing/Color/AnsiColorNameResolver.cs
+++ b/Terminal.Gui/Drawing/Color/AnsiColorNameResolver.cs
@@ -10,12 +10,12 @@ namespace Terminal.Gui;
 /// </summary>
 public class AnsiColorNameResolver : IColorNameResolver
 {
-    private static readonly ImmutableArray<string> AnsiColorNames = ImmutableArray.Create(Enum.GetNames<ColorName16>());
+    private static readonly ImmutableArray<string> _ansiColorNames = ImmutableArray.Create (Enum.GetNames<ColorName16> ());
 
     /// <inheritdoc/>
     public IEnumerable<string> GetColorNames ()
     {
-        return AnsiColorNames;
+        return _ansiColorNames;
     }
 
     /// <inheritdoc/>
diff --git a/Terminal.Gui/Drawing/Color/Color.ColorExtensions.cs b/Terminal.Gui/Drawing/Color/Color.ColorExtensions.cs
index fd71da3592..0e8e9b84f3 100644
--- a/Terminal.Gui/Drawing/Color/Color.ColorExtensions.cs
+++ b/Terminal.Gui/Drawing/Color/Color.ColorExtensions.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Frozen;
 using ColorHelper;
 
@@ -8,7 +9,7 @@ internal static class ColorExtensions
     // TODO: This should be refactored to support all W3CColors (`ColorStrings` and this should be merged).
     // TODO: ColorName and AnsiColorCode are only needed when a driver is in Force16Color mode and we
     // TODO: should be able to remove these from any non-Driver-specific usages.
-    private static FrozenDictionary<Color, ColorName16> colorToNameMap;
+    private static FrozenDictionary<Color, ColorName16>? _colorToNameMap;
 
     static ColorExtensions ()
     {
@@ -59,7 +60,7 @@ static ColorExtensions ()
     internal static FrozenDictionary<ColorName16, AnsiColorCode> ColorName16ToAnsiColorMap { get; }
 
     /// <summary>Reverse mapping for <see cref="ColorToName16Map"/>.</summary>
-    internal static FrozenDictionary<ColorName16, Color> ColorName16ToColorMap { get; private set; }
+    internal static FrozenDictionary<ColorName16, Color>? ColorName16ToColorMap { get; private set; }
 
     /// <summary>
     ///     Gets or sets a <see cref="FrozenDictionary{TKey,TValue}"/> that maps legacy 16-color values to the
@@ -69,15 +70,18 @@ static ColorExtensions ()
     ///     Setter should be called as infrequently as possible, as <see cref="FrozenDictionary{TKey,TValue}"/> is
     ///     expensive to create.
     /// </remarks>
-    internal static FrozenDictionary<Color, ColorName16> ColorToName16Map
+    internal static FrozenDictionary<Color, ColorName16>? ColorToName16Map
     {
-        get => colorToNameMap;
+        get => _colorToNameMap;
         set
         {
-            colorToNameMap = value;
+            _colorToNameMap = value;
 
             //Also be sure to set the reverse mapping
-            ColorName16ToColorMap = value.ToFrozenDictionary (static kvp => kvp.Value, static kvp => kvp.Key);
+            if (value is { })
+            {
+                ColorName16ToColorMap = value.ToFrozenDictionary (static kvp => kvp.Value, static kvp => kvp.Key);
+            }
         }
     }
 }
diff --git a/Terminal.Gui/Drawing/Color/Color.Operators.cs b/Terminal.Gui/Drawing/Color/Color.Operators.cs
index 832c535432..8807f8caea 100644
--- a/Terminal.Gui/Drawing/Color/Color.Operators.cs
+++ b/Terminal.Gui/Drawing/Color/Color.Operators.cs
@@ -57,7 +57,7 @@ public readonly partial record struct Color
     ///     <see cref="ColorExtensions.ColorName16ToColorMap"/>.
     /// </summary>
     [Pure]
-    public static implicit operator Color (ColorName16 colorName) { return ColorExtensions.ColorName16ToColorMap [colorName]; }
+    public static implicit operator Color (ColorName16 colorName) { return ColorExtensions.ColorName16ToColorMap! [colorName]; }
 
     /// <summary>
     ///     Implicit conversion from <see cref="Vector4"/> to <see cref="Color"/>, where (<see cref="Vector4.X"/>,
diff --git a/Terminal.Gui/Drawing/Color/Color.cs b/Terminal.Gui/Drawing/Color/Color.cs
index 23c74c8779..28eba7076f 100644
--- a/Terminal.Gui/Drawing/Color/Color.cs
+++ b/Terminal.Gui/Drawing/Color/Color.cs
@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
 using ColorHelper;
+using ColorConverter = ColorHelper.ColorConverter;
 
 namespace Terminal.Gui;
 
@@ -107,7 +108,12 @@ public Color (int red = 0, int green = 0, int blue = 0, int alpha = byte.MaxValu
 
     /// <summary>Initializes a new instance of the <see cref="Color"/> color from a legacy 16-color named value.</summary>
     /// <param name="colorName">The 16-color value.</param>
-    public Color (in ColorName16 colorName) { this = ColorExtensions.ColorName16ToColorMap [colorName]; }
+    public Color (in ColorName16 colorName) { this = ColorExtensions.ColorName16ToColorMap! [colorName]; }
+
+
+    /// <summary>Initializes a new instance of the <see cref="Color"/> color from a value in the <see cref="StandardColor"/> enum.</summary>
+    /// <param name="colorName">The 16-color value.</param>
+    public Color (in StandardColor colorName) : this ((int)colorName) { }
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="Color"/> color from string. See
@@ -132,13 +138,13 @@ public Color (string colorString)
     // TODO: ColorName and AnsiColorCode are only needed when a driver is in Force16Color mode and we
     // TODO: should be able to remove these from any non-Driver-specific usages.
     /// <summary>Gets or sets the 3-byte/6-character hexadecimal value for each of the legacy 16-color values.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
+    [ConfigurationProperty (Scope = typeof (SettingsScope), OmitClassName = true)]
     public static Dictionary<ColorName16, string> Colors16
     {
         get =>
 
             // Transform _colorToNameMap into a Dictionary<ColorNames,string>
-            ColorExtensions.ColorToName16Map.ToDictionary (static kvp => kvp.Value, static kvp => kvp.Key.ToString ("g"));
+            ColorExtensions.ColorToName16Map!.ToDictionary (static kvp => kvp.Value, static kvp => kvp.Key.ToString ("g"));
         set
         {
             // Transform Dictionary<ColorNames,string> into _colorToNameMap
@@ -146,7 +152,7 @@ public static Dictionary<ColorName16, string> Colors16
 
             return;
 
-            static Color GetColorToNameMapKey (KeyValuePair<ColorName16, string> kvp) { return new Color (kvp.Value); }
+            static Color GetColorToNameMapKey (KeyValuePair<ColorName16, string> kvp) { return new (kvp.Value); }
 
             static ColorName16 GetColorToNameMapValue (KeyValuePair<ColorName16, string> kvp)
             {
@@ -172,7 +178,8 @@ static ColorName16 GetColorToNameMapValue (KeyValuePair<ColorName16, string> kvp
     ///     will return the closest 16 color match to the true color when no exact value is found.
     /// </summary>
     /// <remarks>
-    ///     Get returns the <see cref="GetClosestNamedColor16(Terminal.Gui.Color)"/> of the closest 24-bit color value. Set sets the RGB
+    ///     Get returns the <see cref="GetClosestNamedColor16(Terminal.Gui.Color)"/> of the closest 24-bit color value. Set
+    ///     sets the RGB
     ///     value using a hard-coded map.
     /// </remarks>
     public ColorName16 GetClosestNamedColor16 () { return GetClosestNamedColor16 (this); }
@@ -231,7 +238,7 @@ static ColorName16 GetColorToNameMapValue (KeyValuePair<ColorName16, string> kvp
     [SkipLocalsInit]
     internal static ColorName16 GetClosestNamedColor16 (Color inputColor)
     {
-        return ColorExtensions.ColorToName16Map.MinBy (pair => CalculateColorDistance (inputColor, pair.Key)).Value;
+        return ColorExtensions.ColorToName16Map!.MinBy (pair => CalculateColorDistance (inputColor, pair.Key)).Value;
     }
 
     /// <summary>Converts the given color value to exact named color represented by <see cref="ColorName16"/>.</summary>
@@ -240,56 +247,136 @@ internal static ColorName16 GetClosestNamedColor16 (Color inputColor)
     /// <returns>True if conversion succeeded; otherwise false.</returns>
     internal static bool TryGetExactNamedColor16 (Color inputColor, out ColorName16 colorName16)
     {
-        return ColorExtensions.ColorToName16Map.TryGetValue (inputColor, out colorName16);
+        return ColorExtensions.ColorToName16Map!.TryGetValue (inputColor, out colorName16);
     }
 
     [SkipLocalsInit]
     private static float CalculateColorDistance (in Vector4 color1, in Vector4 color2) { return Vector4.Distance (color1, color2); }
 
     /// <summary>
-    /// Gets a color that is the same hue as the current color, but with a different lightness.
+    ///     Returns a color with the same hue and saturation as this color, but with a significantly different lightness,
+    ///     making it suitable for use as a highlight or contrast color in UI elements.
     /// </summary>
-    /// <returns></returns>
-    public Color GetHighlightColor ()
+    /// <remarks>
+    ///     <para>
+    ///         This method brightens the color if it is dark, or darkens it if it is light, ensuring the result is visually
+    ///         distinct
+    ///         from the original. The algorithm works in HSL color space and adjusts the lightness channel:
+    ///         <list type="bullet">
+    ///             <item>
+    ///                 <description>If the color is dark (lightness &lt; 0.5), the lightness is increased (brightened).</description>
+    ///             </item>
+    ///             <item>
+    ///                 <description>If the color is light (lightness &gt;= 0.5), the lightness is decreased (darkened).</description>
+    ///             </item>
+    ///             <item>
+    ///                 <description>
+    ///                     If the adjustment resulted in a color too close to the original, a larger adjustment is
+    ///                     made.
+    ///                 </description>
+    ///             </item>
+    ///         </list>
+    ///         This ensures the returned color is always visually distinct and suitable for highlighting or selection states.
+    ///     </para>
+    ///     <para>
+    ///         The returned color will always have the same hue and saturation as the original, but a different lightness.
+    ///     </para>
+    /// </remarks>
+    /// <param name="brightenAmount">The percent amount to brighten the color by. The default is <c>20%</c>.</param>
+    /// <returns>
+    ///     A <see cref="Color"/> instance with the same hue and saturation as this color, but with a contrasting lightness.
+    /// </returns>
+    /// <example>
+    ///     <code>
+    /// var baseColor = new Color(100, 100, 100);
+    /// var highlight = baseColor.GetHighlightColor();
+    /// // highlight will be a lighter or darker version of baseColor, depending on its original lightness.
+    /// </code>
+    /// </example>
+    public Color GetBrighterColor (double brightenAmount = 0.2)
     {
-        // TODO: This is a temporary implementation; just enough to show how it could work. 
-        var hsl = ColorHelper.ColorConverter.RgbToHsl (new RGB (R, G, B));
+        HSL? hsl = ColorConverter.RgbToHsl (new (R, G, B));
+
+        double lNorm = hsl.L / 255.0;
+        double newL;
 
-        var amount = .7;
-        if (hsl.L <= 5)
+        if (lNorm < 0.5)
+        {
+            newL = Math.Min (1.0, lNorm + brightenAmount);
+        }
+        else
         {
-            return DarkGray;
+            newL = Math.Max (0.0, lNorm - brightenAmount);
         }
-        hsl.L = (byte)(hsl.L * amount);
 
-        var rgb = ColorHelper.ColorConverter.HslToRgb (hsl);
-        return new (rgb.R, rgb.G, rgb.B);
+        if (Math.Abs (newL - lNorm) < 0.1)
+        {
+            newL = lNorm < 0.5 ? Math.Min (1.0, lNorm + 2 * brightenAmount) : Math.Max (0.0, lNorm - 2 * brightenAmount);
+        }
 
+        var newHsl = new HSL (hsl.H, hsl.S, (byte)(newL * 255));
+        RGB? rgb = ColorConverter.HslToRgb (newHsl);
+
+        return new (rgb.R, rgb.G, rgb.B);
     }
 
     /// <summary>
-    /// Gets a color that is the same hue as the current color, but with a different lightness.
+    ///     Returns a color with the same hue and saturation as this color, but with a significantly lower lightness,
+    ///     making it suitable for use as a shadow or background contrast color in UI elements.
     /// </summary>
-    /// <returns></returns>
-    public Color GetDarkerColor ()
+    /// <remarks>
+    ///     <para>
+    ///         This method darkens the color by reducing its lightness in HSL color space:
+    ///         <list type="bullet">
+    ///             <item>
+    ///                 <description>If the color is already very dark, returns <see cref="ColorName16.DarkGray"/>.</description>
+    ///             </item>
+    ///             <item>
+    ///                 <description>Otherwise, reduces the lightness by a fixed amount (default 30%).</description>
+    ///             </item>
+    ///             <item>
+    ///                 <description>
+    ///                     If the adjustment resulted in a color too close to the original, a larger adjustment is
+    ///                     made.
+    ///                 </description>
+    ///             </item>
+    ///         </list>
+    ///         This ensures the returned color is always visually distinct and suitable for shadowing or de-emphasis.
+    ///     </para>
+    /// </remarks>
+    /// <param name="dimAmount">The percent amount to dim the color by. The default is <c>20%</c>.</param>
+    /// <returns>
+    ///     A <see cref="Color"/> instance with the same hue and saturation as this color, but with a much lower lightness.
+    /// </returns>
+    public Color GetDimColor (double dimAmount = 0.2)
     {
-        // TODO: This is a temporary implementation; just enough to show how it could work. 
-        var hsl = ColorHelper.ColorConverter.RgbToHsl (new RGB (R, G, B));
+        HSL hsl = ColorConverter.RgbToHsl (new (R, G, B));
 
-        var amount = .3;
-        if (hsl.L <= 5)
+        double lNorm = hsl.L / 255.0;
+        double newL = Math.Max (0.0, lNorm - dimAmount);
+
+        // If the color is already very dark, return a standard dark gray for visibility
+        if (lNorm <= 0.1)
         {
-            return DarkGray;
+            return new (ColorName16.DarkGray);
         }
-        hsl.L = (byte)(hsl.L * amount);
 
-        var rgb = ColorHelper.ColorConverter.HslToRgb (hsl);
-        return new (rgb.R, rgb.G, rgb.B);
+        // If the new lightness is too close to the original, force a bigger change
+        if (Math.Abs (newL - lNorm) < 0.1)
+        {
+            newL = Math.Max (0.0, lNorm - 2 * dimAmount);
+        }
 
+        var newHsl = new HSL (hsl.H, hsl.S, (byte)(newL * 255));
+        RGB rgb = ColorConverter.HslToRgb (newHsl);
+
+        return new (rgb.R, rgb.G, rgb.B);
     }
 
     #region Legacy Color Names
 
+    // ReSharper disable InconsistentNaming
+
     /// <summary>The black color.</summary>
     public const ColorName16 Black = ColorName16.Black;
 
@@ -339,4 +426,4 @@ public Color GetDarkerColor ()
     public const ColorName16 White = ColorName16.White;
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/Terminal.Gui/Drawing/Color/ColorScheme.Colors.cs b/Terminal.Gui/Drawing/Color/ColorScheme.Colors.cs
deleted file mode 100644
index a311032de1..0000000000
--- a/Terminal.Gui/Drawing/Color/ColorScheme.Colors.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-#nullable enable
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text.Json.Serialization;
-
-namespace Terminal.Gui;
-
-/// <summary>
-///     Holds the <see cref="ColorScheme"/>s that define the <see cref="Attribute"/>s that are used by views to render
-///     themselves.
-/// </summary>
-public sealed class Colors : INotifyCollectionChanged, IDictionary<string, ColorScheme?>
-{
-    private static readonly object _lock = new object ();
-
-    static Colors ()
-    {
-        ColorSchemes = new Dictionary<string, ColorScheme?> (5, StringComparer.InvariantCultureIgnoreCase);
-        Reset ();
-    }
-
-    /// <summary>Gets a dictionary of defined <see cref="ColorScheme"/> objects.</summary>
-    /// <remarks>
-    ///     <para>
-    ///         The <see cref="ColorSchemes"/> dictionary includes the following keys, by default:
-    ///         <list type="table">
-    ///             <listheader>
-    ///                 <term>Built-in Color Scheme</term> <description>Description</description>
-    ///             </listheader>
-    ///             <item>
-    ///                 <term>Base</term> <description>The base color scheme used for most Views.</description>
-    ///             </item>
-    ///             <item>
-    ///                 <term>TopLevel</term>
-    ///                 <description>The application Toplevel color scheme; used for the <see cref="Toplevel"/> View.</description>
-    ///             </item>
-    ///             <item>
-    ///                 <term>Dialog</term>
-    ///                 <description>
-    ///                     The dialog color scheme; used for <see cref="Dialog"/>, <see cref="MessageBox"/>, and
-    ///                     other views dialog-like views.
-    ///                 </description>
-    ///             </item>
-    ///             <item>
-    ///                 <term>Menu</term>
-    ///                 <description>
-    ///                     The menu color scheme; used for <see cref="Menu"/>, <see cref="MenuBar"/>, and
-    ///                     <see cref="StatusBar"/>.
-    ///                 </description>
-    ///             </item>
-    ///             <item>
-    ///                 <term>Error</term>
-    ///                 <description>
-    ///                     The color scheme for showing errors, such as in
-    ///                     <see cref="MessageBox.ErrorQuery(string, string, string[])"/>.
-    ///                 </description>
-    ///             </item>
-    ///         </list>
-    ///     </para>
-    ///     <para>Changing the values of an entry in this dictionary will affect all views that use the scheme.</para>
-    ///     <para>
-    ///         <see cref="ConfigurationManager"/> can be used to override the default values for these schemes and add
-    ///         additional schemes. See <see cref="ConfigurationManager.Themes"/>.
-    ///     </para>
-    /// </remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope), OmitClassName = true)]
-    [JsonConverter (typeof (DictionaryJsonConverter<ColorScheme?>))]
-    [UsedImplicitly]
-    public static Dictionary<string, ColorScheme?> ColorSchemes { get; private set; }
-
-    /// <summary>
-    ///     Raised when the collection changes.
-    /// </summary>
-    public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
-    /// <inheritdoc />
-    public ColorScheme? this [string key]
-    {
-        get
-        {
-            lock (_lock)
-            {
-                return ColorSchemes [key];
-            }
-        }
-        set
-        {
-            lock (_lock)
-            {
-                if (ColorSchemes.ContainsKey (key))
-                {
-                    ColorScheme? oldValue = ColorSchemes [key];
-                    ColorSchemes [key] = value;
-                    CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Replace, value, oldValue));
-                }
-                else
-                {
-                    ColorSchemes.Add (key, value);
-                    CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Add, new KeyValuePair<string, ColorScheme?> (key, value)));
-                }
-            }
-        }
-    }
-
-    /// <inheritdoc />
-    public int Count
-    {
-        get
-        {
-            lock (_lock)
-            {
-                return ColorSchemes.Count;
-            }
-        }
-    }
-
-    /// <inheritdoc />
-    public bool IsReadOnly => false;
-
-    /// <inheritdoc />
-    public ICollection<string> Keys
-    {
-        get
-        {
-            lock (_lock)
-            {
-                return new List<string> (ColorSchemes.Keys);
-            }
-        }
-    }
-
-    /// <inheritdoc />
-    public ICollection<ColorScheme?> Values
-    {
-        get
-        {
-            lock (_lock)
-            {
-                return new List<ColorScheme?> (ColorSchemes.Values);
-            }
-        }
-    }
-
-    /// <inheritdoc />
-    public void Add (KeyValuePair<string, ColorScheme?> item)
-    {
-        lock (_lock)
-        {
-            ColorSchemes.Add (item.Key, item.Value);
-            CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Add, item));
-        }
-    }
-
-    /// <inheritdoc />
-    public void Add (string key, ColorScheme? value)
-    {
-        Add (new KeyValuePair<string, ColorScheme?> (key, value));
-    }
-
-    /// <inheritdoc />
-    public void Clear ()
-    {
-        lock (_lock)
-        {
-            ColorSchemes.Clear ();
-            CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Reset));
-        }
-    }
-
-    /// <inheritdoc />
-    public bool Contains (KeyValuePair<string, ColorScheme?> item)
-    {
-        lock (_lock)
-        {
-            return ColorSchemes.Contains (item);
-        }
-    }
-
-    /// <inheritdoc />
-    public bool ContainsKey (string key)
-    {
-        lock (_lock)
-        {
-            return ColorSchemes.ContainsKey (key);
-        }
-    }
-
-    /// <inheritdoc />
-    public void CopyTo (KeyValuePair<string, ColorScheme?> [] array, int arrayIndex)
-    {
-        lock (_lock)
-        {
-            ((ICollection)ColorSchemes).CopyTo (array, arrayIndex);
-        }
-    }
-
-    /// <inheritdoc />
-    public IEnumerator<KeyValuePair<string, ColorScheme?>> GetEnumerator ()
-    {
-        lock (_lock)
-        {
-            return new List<KeyValuePair<string, ColorScheme?>> (ColorSchemes).GetEnumerator ();
-        }
-    }
-
-    IEnumerator IEnumerable.GetEnumerator ()
-    {
-        return GetEnumerator ();
-    }
-
-    /// <inheritdoc />
-    public bool Remove (KeyValuePair<string, ColorScheme?> item)
-    {
-        lock (_lock)
-        {
-            if (ColorSchemes.Remove (item.Key))
-            {
-                CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Remove, item));
-                return true;
-            }
-            return false;
-        }
-    }
-
-    /// <inheritdoc />
-    public bool Remove (string key)
-    {
-        lock (_lock)
-        {
-            if (ColorSchemes.Remove (key))
-            {
-                CollectionChanged?.Invoke (this, new NotifyCollectionChangedEventArgs (NotifyCollectionChangedAction.Remove, key));
-                return true;
-            }
-            return false;
-        }
-    }
-
-    /// <inheritdoc />
-    public bool TryGetValue (string key, out ColorScheme? value)
-    {
-        lock (_lock)
-        {
-            return ColorSchemes.TryGetValue (key, out value);
-        }
-    }
-
-
-    /// <summary>
-    ///     Resets the <see cref="ColorSchemes"/> dictionary to its default values.
-    /// </summary>
-    /// <returns>The reset <see cref="ColorSchemes"/> dictionary.</returns>
-    public static Dictionary<string, ColorScheme?> Reset ()
-    {
-        lock (_lock)
-        {
-            ColorSchemes.Clear ();
-            ColorSchemes.Add ("TopLevel", new ColorScheme ());
-            ColorSchemes.Add ("Base", new ColorScheme ());
-            ColorSchemes.Add ("Dialog", new ColorScheme ());
-            ColorSchemes.Add ("Menu", new ColorScheme ());
-            ColorSchemes.Add ("Error", new ColorScheme ());
-            return ColorSchemes;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Terminal.Gui/Drawing/Color/ColorScheme.cs b/Terminal.Gui/Drawing/Color/ColorScheme.cs
deleted file mode 100644
index adb47f1432..0000000000
--- a/Terminal.Gui/Drawing/Color/ColorScheme.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-#nullable enable
-using System.Numerics;
-using System.Text.Json.Serialization;
-
-namespace Terminal.Gui;
-
-// TODO: Rename "ColorScheme"->"AttributeScheme" given we'll soon have non-color information in Attributes?
-// TODO: See https://github.com/gui-cs/Terminal.Gui/issues/457
-
-/// <summary>Defines a standard set of <see cref="Attribute"/>s for common visible elements in a <see cref="View"/>.</summary>
-/// <remarks>
-///     <para>
-///         ColorScheme objects are immutable. Once constructed, the properties cannot be changed. To change a
-///         ColorScheme, create a new one with the desired values, using the <see cref="ColorScheme(ColorScheme)"/>
-///         constructor.
-///     </para>
-/// </remarks>
-[JsonConverter (typeof (ColorSchemeJsonConverter))]
-public record ColorScheme : IEqualityOperators<ColorScheme, ColorScheme, bool>
-{
-    /// <summary>Creates a new instance set to the default colors (see <see cref="Attribute.Default"/>).</summary>
-    public ColorScheme () : this (Attribute.Default) { }
-
-    /// <summary>Creates a new instance, initialized with the values from <paramref name="scheme"/>.</summary>
-    /// <param name="scheme">The scheme to initialize the new instance with.</param>
-    public ColorScheme (ColorScheme? scheme)
-    {
-        ArgumentNullException.ThrowIfNull (scheme);
-
-        Normal = scheme.Normal;
-        Focus = scheme.Focus;
-        HotNormal = scheme.HotNormal;
-        Disabled = scheme.Disabled;
-        HotFocus = scheme.HotFocus;
-    }
-
-    /// <summary>Creates a new instance, initialized with the values from <paramref name="attribute"/>.</summary>
-    /// <param name="attribute">The attribute to initialize the new instance with.</param>
-    public ColorScheme (Attribute attribute)
-    {
-        Normal = attribute;
-        Focus = attribute;
-        HotNormal = attribute;
-        Disabled = attribute;
-        HotFocus = attribute;
-    }
-
-    /// <summary>Creates a new instance, initialized with the values provided.</summary>
-    public ColorScheme (
-        Attribute normal,
-        Attribute focus,
-        Attribute hotNormal,
-        Attribute disabled,
-        Attribute hotFocus
-    )
-    {
-        Normal = normal;
-        Focus = focus;
-        HotNormal = hotNormal;
-        Disabled = disabled;
-        HotFocus = hotFocus;
-    }
-
-    /// <summary>The default foreground and background color for text when the view is disabled.</summary>
-    public Attribute Disabled { get; init; }
-
-    /// <summary>The foreground and background color for text when the view has the focus.</summary>
-    public Attribute Focus { get; init; }
-
-    /// <summary>The foreground and background color for text in a focused view that indicates a <see cref="View.HotKey"/>.</summary>
-    public Attribute HotFocus { get; init; }
-
-    /// <summary>The foreground and background color for text in a non-focused view that indicates a <see cref="View.HotKey"/>.</summary>
-    public Attribute HotNormal { get; init; }
-
-    /// <summary>The foreground and background color for text when the view is not focused, hot, or disabled.</summary>
-    public Attribute Normal { get; init; }
-
-    /// <summary>
-    ///     Gets a new <see cref="ColorScheme"/> with the same values as this instance, but with the foreground and background
-    ///     colors adjusted to be more visible.
-    /// </summary>
-    /// <returns></returns>
-    public ColorScheme GetHighlightColorScheme ()
-    {
-        return this with
-        {
-            Normal = new (Normal.Foreground.GetHighlightColor (), Normal.Background),
-            HotNormal = new (HotNormal.Foreground.GetHighlightColor (), HotNormal.Background),
-            Focus = new (Focus.Foreground.GetHighlightColor (), Focus.Background),
-            HotFocus = new (HotFocus.Foreground.GetHighlightColor (), HotFocus.Background)
-        };
-    }
-
-    /// <summary>Compares two <see cref="ColorScheme"/> objects for equality.</summary>
-    /// <param name="other"></param>
-    /// <returns>true if the two objects are equal</returns>
-    public virtual bool Equals (ColorScheme? other)
-    {
-        return other is { }
-               && EqualityComparer<Attribute>.Default.Equals (Normal, other.Normal)
-               && EqualityComparer<Attribute>.Default.Equals (Focus, other.Focus)
-               && EqualityComparer<Attribute>.Default.Equals (HotNormal, other.HotNormal)
-               && EqualityComparer<Attribute>.Default.Equals (HotFocus, other.HotFocus)
-               && EqualityComparer<Attribute>.Default.Equals (Disabled, other.Disabled);
-    }
-
-    /// <summary>Returns a hashcode for this instance.</summary>
-    /// <returns>hashcode for this instance</returns>
-    public override int GetHashCode () { return HashCode.Combine (Normal, Focus, HotNormal, HotFocus, Disabled); }
-
-    /// <inheritdoc/>
-    public override string ToString () { return $"Normal: {Normal}; Focus: {Focus}; HotNormal: {HotNormal}; HotFocus: {HotFocus}; Disabled: {Disabled}"; }
-}
diff --git a/Terminal.Gui/Drawing/Color/ColorStrings.cs b/Terminal.Gui/Drawing/Color/ColorStrings.cs
index fc57b7a3e1..f365bd8718 100644
--- a/Terminal.Gui/Drawing/Color/ColorStrings.cs
+++ b/Terminal.Gui/Drawing/Color/ColorStrings.cs
@@ -8,18 +8,18 @@ namespace Terminal.Gui;
 /// </summary>
 public static class ColorStrings
 {
-    private static readonly AnsiColorNameResolver Ansi = new();
-    private static readonly W3cColorNameResolver W3c = new();
-    private static readonly MultiStandardColorNameResolver Multi = new();
+    private static readonly AnsiColorNameResolver _ansi = new();
+    private static readonly StandardColorsNameResolver _standard = new();
+    private static readonly MultiStandardColorNameResolver _multi = new();
 
     /// <summary>
-    ///     Gets the W3C standard string for <paramref name="color"/>.
+    ///     Gets the W3C+  standard string for <paramref name="color"/>.
     /// </summary>
     /// <param name="color">The color.</param>
     /// <returns><see langword="null"/> if there is no standard color name for the specified color.</returns>
-    public static string? GetW3CColorName (Color color)
+    public static string? GetStandardColorName (Color color)
     {
-        if (W3c.TryNameColor (color, out string? name))
+        if (_standard.TryNameColor (color, out string? name))
         {
             return name;
         }
@@ -31,9 +31,10 @@ public static class ColorStrings
     /// </summary>
     /// <param name="color">The color.</param>
     /// <returns><see langword="null"/> if there is no standard color name for the specified color.</returns>
+    // ReSharper disable once InconsistentNaming
     public static string? GetANSIColor16Name (Color color)
     {
-        if (Ansi.TryNameColor (color, out string? name))
+        if (_ansi.TryNameColor (color, out string? name))
         {
             return name;
         }
@@ -47,7 +48,7 @@ public static class ColorStrings
     /// <returns>Standard color name for the specified color; otherwise <see langword="null"/>.</returns>
     public static string? GetColorName (Color color)
     {
-        if (Multi.TryNameColor (color, out string? name))
+        if (_multi.TryNameColor (color, out string? name))
         {
             return name;
         }
@@ -55,23 +56,23 @@ public static class ColorStrings
     }
 
     /// <summary>
-    ///     Returns the list of W3C standard color names.
+    ///     Returns the list of W3C+ standard color names.
     /// </summary>
     /// <returns></returns>
-    public static IEnumerable<string> GetW3CColorNames ()
+    public static IEnumerable<string> GetStandardColorNames ()
     {
-        return W3c.GetColorNames ();
+        return _standard.GetColorNames ();
     }
 
     /// <summary>
-    ///     Parses <paramref name="name"/> and returns <paramref name="color"/> if name is a W3C standard named color.
+    ///     Parses <paramref name="name"/> and returns <paramref name="color"/> if name is a W3C+ standard named color.
     /// </summary>
     /// <param name="name">The name to parse.</param>
     /// <param name="color">If successful, the color.</param>
     /// <returns><see langword="true"/> if <paramref name="name"/> was parsed successfully.</returns>
-    public static bool TryParseW3CColorName (ReadOnlySpan<char> name, out Color color)
+    public static bool TryParseStandardColorName (ReadOnlySpan<char> name, out Color color)
     {
-        if (W3c.TryParseColor (name, out color))
+        if (_standard.TryParseColor (name, out color))
         {
             return true;
         }
@@ -87,7 +88,7 @@ public static bool TryParseW3CColorName (ReadOnlySpan<char> name, out Color colo
     /// <returns><see langword="true"/> if <paramref name="name"/> was parsed successfully.</returns>
     public static bool TryParseColor16 (ReadOnlySpan<char> name, out Color color)
     {
-        if (Ansi.TryParseColor (name, out color))
+        if (_ansi.TryParseColor (name, out color))
         {
             return true;
         }
@@ -103,7 +104,7 @@ public static bool TryParseColor16 (ReadOnlySpan<char> name, out Color color)
     /// <returns><see langword="true"/> if <paramref name="name"/> was parsed successfully.</returns>
     public static bool TryParseNamedColor (ReadOnlySpan<char> name, out Color color)
     {
-        if (Multi.TryParseColor (name, out color))
+        if (_multi.TryParseColor (name, out color))
         {
             return true;
         }
diff --git a/Terminal.Gui/Drawing/Color/MultiStandardColorNameResolver.cs b/Terminal.Gui/Drawing/Color/MultiStandardColorNameResolver.cs
index 01554bbb31..40f5be1f8a 100644
--- a/Terminal.Gui/Drawing/Color/MultiStandardColorNameResolver.cs
+++ b/Terminal.Gui/Drawing/Color/MultiStandardColorNameResolver.cs
@@ -3,186 +3,83 @@
 using System.Collections.Frozen;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 
 namespace Terminal.Gui;
 
 /// <summary>
-/// Backwards compatible(-ish) color name resolver prioritizing ANSI 4-bit (16) colors with fallback to W3C colors.
+/// Color name resolver prioritizing Standard (W3C+) colors with fallback to ANSI 4-bit (16) colors.
 /// </summary>
 public class MultiStandardColorNameResolver : IColorNameResolver
 {
-    private static readonly AnsiColorNameResolver Ansi = new();
-    private static readonly W3cColorNameResolver W3c = new();
-    private static readonly FrozenSet<Color> W3cBlockedColors;
-    private static readonly ImmutableArray<string> CombinedColorNames;
-    private static readonly FrozenDictionary<int, (string Name, Color Color)> W3cSubstituteColors;
+    private static readonly AnsiColorNameResolver _ansi = new ();
+    private static readonly StandardColorsNameResolver _standard = new ();
+
+    private static readonly ImmutableArray<string> _combinedColorNames;
+    private static readonly FrozenDictionary<string, Color> _nameToColorMap;
+    private static readonly FrozenDictionary<uint, string> _colorToNameMap;
 
     static MultiStandardColorNameResolver ()
     {
-        HashSet<string> combinedNames = new(Ansi.GetColorNames());
-
-        HashSet<Color> w3cInconsistentColors = new();
-        Dictionary<string, Color> w3cSubstituteColors = new(StringComparer.OrdinalIgnoreCase);
-
-        IEnumerable<string> enumerableW3cNames = W3c.GetColorNames ();
-        IReadOnlyList<string> w3cNames =  enumerableW3cNames is IReadOnlyList<string> alreadyReadOnlyList
-            ? alreadyReadOnlyList
-            : [.. enumerableW3cNames];
-
-        Dictionary<Color, HashSet<string>> w3cColorsWithAlternativeNames = w3cNames
-            .GroupBy(w3cName =>
-            {
-                if (!W3c.TryParseColor(w3cName, out Color w3cColor))
-                {
-                    throw new InvalidOperationException ($"W3C color name '{w3cName}' does not resolve to any W3C color.");
-                }
-                return w3cColor;
-            })
-            .Where(g => g.Count() > 1)
-            .ToDictionary(g => g.Key, g => g.ToHashSet());
+        Dictionary<string, Color> nameToColor = new (StringComparer.OrdinalIgnoreCase);
+        Dictionary<uint, string> colorToName = new ();
 
-        // Gather inconsistencies between ANSI and W3C, filter out or substitute problematic W3C colors and names,
-        // and create additional blocklist for W3C colors.
-        // Blocking and filtering is only applied to W3C because this resolver prioritizes ANSI for backwards compatibility.
-        // It would be a lot simpler to just prioritize W3C colors and names.
-        foreach (string w3cName in w3cNames)
+        foreach (string name in _standard.GetColorNames ())
         {
-            if (w3cSubstituteColors.ContainsKey (w3cName))
-            {
-                // Already dealt with alternative name.
-                continue;
-            }
-
-            if (!W3c.TryParseColor (w3cName, out Color w3cColor))
-            {
-                // This condition is just inverted to reduce indentation.
-                // Also it should practically never happen if the W3C color name resolver is properly implemented.
-                throw new InvalidOperationException ($"W3C color name '{w3cName}' does not resolve to any color.");
-            }
-
-            if (w3cColorsWithAlternativeNames.TryGetValue (w3cColor, out var names))
+            if (_standard.TryParseColor (name, out Color color))
             {
-                bool substituted = false;
-                // Alternative names cause issues with ColorPicker etc. when combined with ANSI and prioritizing ANSI resolver.
-                // For example Aqua is not in ColorName16 but the actual color value resolves to ANSI Cyan
-                // so autocomplete for Aqua suddenly changes to Cyan because they happen to have same color value in both color scheme.
-                // Also DarkGrey would cause inconsistencies because the alternative DarkGray exists in ANSI and has different color value.
-                foreach (string name in names)
+                if (nameToColor.TryAdd (name, color))
                 {
-                    if (Ansi.TryParseColor (name, out Color substituteColor))
-                    {
-                        // Block the W3C color when it is inconsistent with the substitute color
-                        // so there is no situation where W3C color -> color name -> ANSI color.
-                        if (w3cColor != substituteColor)
-                        {
-                            w3cInconsistentColors.Add (w3cColor);
-                        }
-
-                        // Substitute all W3C alternatives to match with the ANSI color to keep colors consistent.
-                        foreach (string alternativeName in names)
-                        {
-                            w3cSubstituteColors.Add (alternativeName, substituteColor);
-                            combinedNames.Add (alternativeName);
-                        }
-                        substituted = true;
-                        break;
-                    }
-                }
-
-                if (substituted)
-                {
-                    // Already dealt with, continue to next W3C color name.
-                    continue;
+                    _ = colorToName.TryAdd (color.Argb, name);
                 }
             }
+        }
 
-            // Same name, different ANSI value.
-            // For example both #767676 (ColorName16) and #A9A9A9 (W3C) resolve to DarkGray,
-            // although a bad example because it is already substituted due to also having alternative names.
-            if (Ansi.TryParseColor (w3cName, out Color ansiColor) && w3cColor != ansiColor)
+        foreach (string name in _ansi.GetColorNames ())
+        {
+            if (_ansi.TryParseColor (name, out Color color))
             {
-                w3cInconsistentColors.Add (w3cColor);
-                continue;
+                nameToColor.TryAdd (name, color);
+                colorToName.TryAdd (color.Argb, name);
             }
-
-            combinedNames.Add (w3cName);
         }
 
-        // TODO: Utilize .NET 9 and later alternative lookup for matching ReadOnlySpan<char> with string.
-        W3cSubstituteColors = w3cSubstituteColors.ToFrozenDictionary (
-            // Workaround for alternative lookup not being available in .NET 8 by matching ReadOnlySpan<char> hash code to string hash code.
-            keySelector: kvp => string.GetHashCode (kvp.Key, StringComparison.OrdinalIgnoreCase),
-            // The string element is for detecting hash collision.
-            elementSelector: kvp => (kvp.Key, kvp.Value));
-        W3cBlockedColors = w3cInconsistentColors.ToFrozenSet ();
-        CombinedColorNames = combinedNames.Order ().ToImmutableArray ();
-    }
-
-    /// <inheritdoc/>
-    public IEnumerable<string> GetColorNames ()
-    {
-        return CombinedColorNames;
+        _nameToColorMap = nameToColor.ToFrozenDictionary ();
+        _colorToNameMap = colorToName.ToFrozenDictionary ();
+        _combinedColorNames = nameToColor.Keys.Order ().ToImmutableArray ();
     }
 
     /// <inheritdoc/>
-    public bool TryNameColor (Color color, [NotNullWhen (true)] out string? name)
-    {
-        if (Ansi.TryNameColor (color, out string? ansiName))
-        {
-            name = ansiName;
-            return true;
-        }
-
-        if (!IsBlockedW3cColor (color) &&
-            W3c.TryNameColor (color, out string? w3cName))
-        {
-            name = w3cName;
-            return true;
-        }
-
-        name = null;
-        return false;
-    }
+    public IEnumerable<string> GetColorNames () => _combinedColorNames;
 
     /// <inheritdoc/>
     public bool TryParseColor (ReadOnlySpan<char> name, out Color color)
     {
-        if (Ansi.TryParseColor (name, out color))
-        {
-            return true;
-        }
-
-        if (GetSubstituteW3cColor (name, out color))
+        if (name.StartsWith ("#") || name.StartsWith ("0x", StringComparison.OrdinalIgnoreCase))
         {
-            return true;
+            try
+            {
+                color = Color.Parse (name.ToString (), CultureInfo.InvariantCulture);
+                return true;
+            }
+            catch
+            {
+                color = default;
+                return false;
+            }
         }
 
-        if (W3c.TryParseColor (name, out color) &&
-            !IsBlockedW3cColor (color))
-        {
-            return true;
-        }
+        if (_ansi.TryParseColor (name, out color)) return true;
+        if (_standard.TryParseColor (name, out color)) return true;
 
         color = default;
         return false;
     }
 
-    private static bool GetSubstituteW3cColor (ReadOnlySpan<char> name, out Color substituteColor)
-    {
-        int nameHashCode = string.GetHashCode(name, StringComparison.OrdinalIgnoreCase);
-        if (W3cSubstituteColors.TryGetValue (nameHashCode, out var match) &&
-            match is (string matchName, Color matchColor) &&
-            name.Equals (matchName, StringComparison.OrdinalIgnoreCase))
-        {
-            substituteColor = matchColor;
-            return true;
-        }
-        substituteColor = default;
-        return false;
-    }
 
-    private static bool IsBlockedW3cColor (Color color)
+    /// <inheritdoc/>
+    public bool TryNameColor (Color color, [NotNullWhen (true)] out string? name)
     {
-        return W3cBlockedColors.Contains (color);
+        return _colorToNameMap.TryGetValue (color.Argb, out name);
     }
 }
diff --git a/Terminal.Gui/Drawing/Color/StandardColor.cs b/Terminal.Gui/Drawing/Color/StandardColor.cs
new file mode 100644
index 0000000000..21071b360c
--- /dev/null
+++ b/Terminal.Gui/Drawing/Color/StandardColor.cs
@@ -0,0 +1,1252 @@
+namespace Terminal.Gui;
+
+/// <summary>
+///     Represents standard color names with their RGB values. Derived from the W3C color names, but includes other common
+///     names.
+/// </summary>
+/// <remarks>
+///     Based on https://www.w3schools.com/colors/color_tryit.asp page.
+/// </remarks>
+public enum StandardColor
+{
+    /// <summary>
+    ///     Alice blue RGB(240, 248, 255).
+    ///     <para>
+    ///         A very pale shade of blue, almost white.
+    ///     </para>
+    /// </summary>
+    AliceBlue = 0xF0F8FF,
+
+    /// <summary>
+    ///     Antique white RGB(250, 235, 215).
+    ///     <para>
+    ///         A light beige color with a hint of orange.c
+    ///     </para>
+    /// </summary>
+    AntiqueWhite = 0xFAEBD7,
+
+    /// <summary>
+    ///     Amber Phosphor RGB(255, 191, 0).
+    /// <para>
+    ///     Matches the Amber Phosphor color used on classic terminals.
+    /// </para>
+    /// </summary>
+    AmberPhosphor = 0xFFBF00,
+
+    /// <summary>
+    ///     Aqua RGB(0, 255, 255).
+    ///     <para>
+    ///         A bright cyan color, often associated with water.
+    ///     </para>
+    /// </summary>
+    Aqua = 0x00FFFF,
+
+    /// <summary>
+    ///     Aquamarine RGB(127, 255, 212).
+    ///     <para>
+    ///         A light greenish-blue color, resembling the gemstone aquamarine.
+    ///     </para>
+    /// </summary>
+    Aquamarine = 0x7FFFD4,
+
+    /// <summary>
+    ///     Azure RGB(240, 255, 255).
+    ///     <para>
+    ///         A pale cyan color, resembling the color of the sky on a clear day.
+    ///     </para>
+    /// </summary>
+    Azure = 0xF0FFFF,
+
+    /// <summary>
+    ///     Beige RGB(245, 245, 220).
+    ///     <para>
+    ///         A pale sandy yellow color, often used in interior design.
+    ///     </para>
+    /// </summary>
+    Beige = 0xF5F5DC,
+
+    /// <summary>
+    ///     Bisque RGB(255, 228, 196).
+    ///     <para>
+    ///         A pale orange color, resembling the color of bisque pottery.
+    ///     </para>
+    /// </summary>
+    Bisque = 0xFFE4C4,
+
+    /// <summary>
+    ///     Black RGB(0, 0, 0).
+    ///     <para>
+    ///         The darkest color, representing the absence of light.
+    ///     </para>
+    /// </summary>
+    Black = 0x000000,
+
+    /// <summary>
+    ///     Blanched almond RGB(255, 235, 205).
+    ///     <para>
+    ///         A pale yellowish-orange color, resembling blanched almonds.
+    ///     </para>
+    /// </summary>
+    BlanchedAlmond = 0xFFEBCD,
+
+    /// <summary>
+    ///     Blue RGB(0, 0, 255).
+    ///     <para>
+    ///         A primary color, often associated with the sky and the sea.
+    ///     </para>
+    /// </summary>
+    Blue = 0x0000FF,
+
+    /// <summary>
+    ///     Blue violet RGB(138, 43, 226).
+    ///     <para>
+    ///         A deep purple color with a hint of blue.
+    ///     </para>
+    /// </summary>
+    BlueViolet = 0x8A2BE2,
+
+    /// <summary>
+    ///     Brown RGB(165, 42, 42).
+    ///     <para>
+    ///         A dark reddish-brown color, resembling the color of wood or soil.
+    ///     </para>
+    /// </summary>
+    Brown = 0xA52A2A,
+
+    /// <summary>
+    ///     Burly wood RGB(222, 184, 135).
+    ///     <para>
+    ///         A light brown color, resembling the color of burly wood.
+    ///     </para>
+    /// </summary>
+    BurlyWood = 0xDEB887,
+
+    /// <summary>
+    ///     Cadet blue RGB(95, 158, 160).
+    ///     <para>
+    ///         A light bluish-green color, first used as a color name in English in 1892.
+    ///     </para>
+    /// </summary>
+    CadetBlue = 0x5F9EA0,
+
+    /// <summary>
+    ///     Charcoal RGB(54, 69, 79).
+    ///     <para>
+    ///         A dark grayish-black color, resembling burnt wood.
+    ///     </para>
+    /// </summary>
+    Charcoal = 0x36454F,
+
+    /// <summary>
+    ///     Cornflower blue RGB(100, 149, 237).
+    ///     <para>
+    ///         A medium blue color, resembling the cornflower plant.
+    ///     </para>
+    /// </summary>
+    CornflowerBlue = 0x6495ED,
+
+    /// <summary>
+    ///     Cornsilk RGB(255, 248, 220).
+    ///     <para>
+    ///         A pale yellow color, resembling the silky threads of corn.
+    ///     </para>
+    /// </summary>
+    Cornsilk = 0xFFF8DC,
+
+    /// <summary>
+    ///     Crimson RGB(220, 20, 60).
+    ///     <para>
+    ///         A deep red color, resembling the color of blood.
+    ///     </para>
+    /// </summary>
+    Crimson = 0xDC143C,
+
+    /// <summary>
+    ///     Cyan RGB(0, 255, 255).
+    ///     <para>
+    ///         Same as <see cref="Aqua"/>.
+    ///     </para>
+    /// </summary>
+    Cyan = Aqua,
+
+    /// <summary>
+    ///     Dark blue RGB(0, 0, 139).
+    ///     <para>
+    ///         A very dark shade of blue.
+    ///     </para>
+    /// </summary>
+    DarkBlue = 0x00008B,
+
+    /// <summary>
+    ///     Dark cyan RGB(0, 139, 139).
+    ///     <para>
+    ///         A dark shade of cyan.
+    ///     </para>
+    /// </summary>
+    DarkCyan = 0x008B8B,
+
+    /// <summary>
+    ///     Dark goldenrod RGB(184, 134, 11).
+    ///     <para>
+    ///         A dark yellowish-brown color.
+    ///     </para>
+    /// </summary>
+    DarkGoldenrod = 0xB8860B,
+
+    /// <summary>
+    ///     Dark gray RGB(169, 169, 169).
+    ///     <para>
+    ///         A medium-dark shade of gray.
+    ///     </para>
+    /// </summary>
+    DarkGray = 0xA9A9A9,
+
+    /// <summary>
+    ///     Dark green RGB(0, 100, 0).
+    ///     <para>
+    ///         A dark shade of green.
+    ///     </para>
+    /// </summary>
+    DarkGreen = 0x006400,
+
+    /// <summary>
+    ///     Dark grey RGB(169, 169, 169).
+    ///     <para>
+    ///         Same as <see cref="DarkGray"/>.
+    ///     </para>
+    /// </summary>
+    DarkGrey = DarkGray,
+
+    /// <summary>
+    ///     Dark khaki RGB(189, 183, 107).
+    ///     <para>
+    ///         A dark yellowish-brown color.
+    ///     </para>
+    /// </summary>
+    DarkKhaki = 0xBDB76B,
+
+    /// <summary>
+    ///     Dark magenta RGB(139, 0, 139).
+    ///     <para>
+    ///         A dark shade of magenta.
+    ///     </para>
+    /// </summary>
+    DarkMagenta = 0x8B008B,
+
+    /// <summary>
+    ///     Dark olive green RGB(85, 107, 47).
+    ///     <para>
+    ///         A dark yellowish-green color.
+    ///     </para>
+    /// </summary>
+    DarkOliveGreen = 0x556B2F,
+
+    /// <summary>
+    ///     Dark orange RGB(255, 140, 0).
+    ///     <para>
+    ///         A dark shade of orange.
+    ///     </para>
+    /// </summary>
+    DarkOrange = 0xFF8C00,
+
+    /// <summary>
+    ///     Dark orchid RGB(153, 50, 204).
+    ///     <para>
+    ///         A dark purple color with a hint of blue.
+    ///     </para>
+    /// </summary>
+    DarkOrchid = 0x9932CC,
+
+    /// <summary>
+    ///     Dark red RGB(139, 0, 0).
+    ///     <para>
+    ///         A dark shade of red.
+    ///     </para>
+    /// </summary>
+    DarkRed = 0x8B0000,
+
+    /// <summary>
+    ///     Dark salmon RGB(233, 150, 122).
+    ///     <para>
+    ///         A dark pinkish-orange color.
+    ///     </para>
+    /// </summary>
+    DarkSalmon = 0xE9967A,
+
+    /// <summary>
+    ///     Dark sea green RGB(143, 188, 143).
+    ///     <para>
+    ///         A dark shade of sea green.
+    ///     </para>
+    /// </summary>
+    DarkSeaGreen = 0x8FBC8F,
+
+    /// <summary>
+    ///     Dark slate blue RGB(72, 61, 139).
+    ///     <para>
+    ///         A dark blue color with a hint of gray.
+    ///     </para>
+    /// </summary>
+    DarkSlateBlue = 0x483D8B,
+
+    /// <summary>
+    ///     Dark slate gray RGB(47, 79, 79).
+    ///     <para>
+    ///         A very dark gray color with a hint of green.
+    ///     </para>
+    /// </summary>
+    DarkSlateGray = 0x2F4F4F,
+
+    /// <summary>
+    ///     Dark slate grey RGB(47, 79, 79).
+    ///     <para>
+    ///         Same as <see cref="DarkSlateGray"/>.
+    ///     </para>
+    /// </summary>
+    DarkSlateGrey = DarkSlateGray,
+
+    /// <summary>
+    ///     Dark turquoise RGB(0, 206, 209).
+    ///     <para>
+    ///         A dark shade of turquoise.
+    ///     </para>
+    /// </summary>
+    DarkTurquoise = 0x00CED1,
+
+    /// <summary>
+    ///     Dark violet RGB(148, 0, 211).
+    ///     <para>
+    ///         A dark shade of violet.
+    ///     </para>
+    /// </summary>
+    DarkViolet = 0x9400D3,
+
+    /// <summary>
+    ///     Deep pink RGB(255, 20, 147).
+    ///     <para>
+    ///         A bright and intense pink color.
+    ///     </para>
+    /// </summary>
+    DeepPink = 0xFF1493,
+
+    /// <summary>
+    ///     Deep sky blue RGB(0, 191, 255).
+    ///     <para>
+    ///         A bright and intense sky blue color.
+    ///     </para>
+    /// </summary>
+    DeepSkyBlue = 0x00BFFF,
+
+    /// <summary>
+    ///     Dim gray RGB(105, 105, 105).
+    ///     <para>
+    ///         A medium-dark shade of gray.
+    ///     </para>
+    /// </summary>
+    DimGray = 0x696969,
+
+    /// <summary>
+    ///     Dim grey RGB(105, 105, 105).
+    ///     <para>
+    ///         Same as <see cref="DimGray"/>.
+    ///     </para>
+    /// </summary>
+    DimGrey = DimGray,
+
+    /// <summary>
+    ///     Dodger blue RGB(30, 144, 255).
+    ///     <para>
+    ///         A bright and vibrant blue color.
+    ///     </para>
+    /// </summary>
+    DodgerBlue = 0x1E90FF,
+
+    /// <summary>
+    ///     Ebony RGB(85, 93, 80).
+    ///     <para>
+    ///         A very dark gray color with a slight greenish tint.
+    ///     </para>
+    /// </summary>
+    Ebony = 0x555D50,
+
+    /// <summary>
+    ///     Fire brick RGB(178, 34, 34).
+    ///     <para>
+    ///         A dark reddish-brown color, resembling bricks.
+    ///     </para>
+    /// </summary>
+    FireBrick = 0xB22222,
+
+    /// <summary>
+    ///     Floral white RGB(255, 250, 240).
+    ///     <para>
+    ///         A very pale shade of white with a hint of orange.
+    ///     </para>
+    /// </summary>
+    FloralWhite = 0xFFFAF0,
+
+
+    /// <summary>
+    ///     Fluorescent Orange - Same as Amber Phosphor RGB(255, 191, 0).
+    /// <para>
+    ///     Matches the Amber Phosphor color used on classic terminals.
+    /// </para>
+    /// </summary>
+    FluorescentOrange = AmberPhosphor,
+
+    /// <summary>
+    ///     Forest green RGB(34, 139, 34).
+    ///     <para>
+    ///         A dark green color, resembling the color of a forest.
+    ///     </para>
+    /// </summary>
+    ForestGreen = 0x228B22,
+
+    /// <summary>
+    ///     Fuchsia RGB(255, 0, 255).
+    ///     <para>
+    ///         A bright and vibrant magenta color.
+    ///     </para>
+    /// </summary>
+    Fuchsia = 0xFF00FF,
+
+    /// <summary>
+    ///     Gainsboro RGB(220, 220, 220).
+    ///     <para>
+    ///         A very light gray color.
+    ///     </para>
+    /// </summary>
+    Gainsboro = 0xDCDCDC,
+
+    /// <summary>
+    ///     Ghost white RGB(248, 248, 255).
+    ///     <para>
+    ///         A very pale shade of white with a hint of blue.
+    ///     </para>
+    /// </summary>
+    GhostWhite = 0xF8F8FF,
+
+    /// <summary>
+    ///     Gold RGB(255, 215, 0).
+    ///     <para>
+    ///         A bright yellow color, resembling gold.
+    ///     </para>
+    /// </summary>
+    Gold = 0xFFD700,
+
+    /// <summary>
+    ///     Goldenrod RGB(218, 165, 32).
+    ///     <para>
+    ///         A dark yellow color with a hint of brown.
+    ///     </para>
+    /// </summary>
+    Goldenrod = 0xDAA520,
+
+    /// <summary>
+    ///     Gray RGB(128, 128, 128).
+    ///     <para>
+    ///         A medium shade of gray.
+    ///     </para>
+    /// </summary>
+    Gray = 0x808080,
+
+    /// <summary>
+    ///     Green RGB(0, 128, 0).
+    ///     <para>
+    ///         A medium shade of green.
+    ///     </para>
+    /// </summary>
+    Green = 0x008000,
+
+    /// <summary>
+    ///     Green Phosphor RGB(0, 255, 102).
+    /// <para>
+    ///     Matches the Green Phosphor color used on classic terminals.
+    /// </para>
+    /// </summary>
+    GreenPhosphor = 0x00FF66,
+
+    /// <summary>
+    ///     Green yellow RGB(173, 255, 47).
+    ///     <para>
+    ///         A bright yellowish-green color.
+    ///     </para>
+    /// </summary>
+    GreenYellow = 0xADFF2F,
+
+    /// <summary>
+    ///     Grey RGB(128, 128, 128).
+    ///     <para>
+    ///         Same as <see cref="Gray"/>.
+    ///     </para>
+    /// </summary>
+    Grey = Gray,
+
+    /// <summary>
+    ///     Guppie Green - Same as Green Phosphor RGB(0, 255, 102).
+    /// <para>
+    ///     Matches the Green Phosphor color used on classic terminals.
+    /// </para>
+    /// </summary>
+    GuppieGreen = GreenYellow,
+
+    /// <summary>
+    ///     Honey dew RGB(240, 255, 240).
+    ///     <para>
+    ///         A very pale greenish-white color.
+    ///     </para>
+    /// </summary>
+    HoneyDew = 0xF0FFF0,
+
+    /// <summary>
+    ///     Hot pink RGB(255, 105, 180).
+    ///     <para>
+    ///         A bright and vibrant pink color.
+    ///     </para>
+    /// </summary>
+    HotPink = 0xFF69B4,
+
+    /// <summary>
+    ///     Indian red RGB(205, 92, 92).
+    ///     <para>
+    ///         A dark reddish-brown color.
+    ///     </para>
+    /// </summary>
+    IndianRed = 0xCD5C5C,
+
+    /// <summary>
+    ///     Indigo RGB(75, 0, 130).
+    ///     <para>
+    ///         A dark blue-purple color.
+    ///     </para>
+    /// </summary>
+    Indigo = 0x4B0082,
+
+    /// <summary>
+    ///     Ivory RGB(255, 255, 240).
+    ///     <para>
+    ///         A very pale yellowish-white color.
+    ///     </para>
+    /// </summary>
+    Ivory = 0xFFFFF0,
+
+    /// <summary>
+    ///     Jet RGB(52, 52, 52).
+    ///     <para>
+    ///         A very dark gray, often used as a near-black.
+    ///     </para>
+    /// </summary>
+    Jet = 0x343434,
+
+    /// <summary>
+    ///     Khaki RGB(240, 230, 140).
+    ///     <para>
+    ///         A pale yellowish-brown color.
+    ///     </para>
+    /// </summary>
+    Khaki = 0xF0E68C,
+
+    /// <summary>
+    ///     Lavender RGB(230, 230, 250).
+    ///     <para>
+    ///         A pale purple color, resembling the lavender flower.
+    ///     </para>
+    /// </summary>
+    Lavender = 0xE6E6FA,
+
+    /// <summary>
+    ///     Lavender blush RGB(255, 240, 245).
+    ///     <para>
+    ///         A very pale pinkish-white color.
+    ///     </para>
+    /// </summary>
+    LavenderBlush = 0xFFF0F5,
+
+    /// <summary>
+    ///     Lawn green RGB(124, 252, 0).
+    ///     <para>
+    ///         A bright green color, resembling freshly cut grass.
+    ///     </para>
+    /// </summary>
+    LawnGreen = 0x7CFC00,
+
+    /// <summary>
+    ///     Lemon chiffon RGB(255, 250, 205).
+    ///     <para>
+    ///         A pale yellow color, resembling lemon chiffon cake.
+    ///     </para>
+    /// </summary>
+    LemonChiffon = 0xFFFACD,
+
+    /// <summary>
+    ///     Light blue RGB(173, 216, 230).
+    ///     <para>
+    ///         A pale shade of blue.
+    ///     </para>
+    /// </summary>
+    LightBlue = 0xADD8E6,
+
+    /// <summary>
+    ///     Light coral RGB(240, 128, 128).
+    ///     <para>
+    ///         A pale pinkish-orange color.
+    ///     </para>
+    /// </summary>
+    LightCoral = 0xF08080,
+
+    /// <summary>
+    ///     Light cyan RGB(224, 255, 255).
+    ///     <para>
+    ///         A pale shade of cyan.
+    ///     </para>
+    /// </summary>
+    LightCyan = 0xE0FFFF,
+
+    /// <summary>
+    ///     Light goldenrod yellow RGB(250, 250, 210).
+    ///     <para>
+    ///         A pale yellow color with a hint of gold.
+    ///     </para>
+    /// </summary>
+    LightGoldenrodYellow = 0xFAFAD2,
+
+    /// <summary>
+    ///     Light gray RGB(211, 211, 211).
+    ///     <para>
+    ///         A pale shade of gray.
+    ///     </para>
+    /// </summary>
+    LightGray = 0xD3D3D3,
+
+    /// <summary>
+    ///     Light green RGB(144, 238, 144).
+    ///     <para>
+    ///         A pale shade of green.
+    ///     </para>
+    /// </summary>
+    LightGreen = 0x90EE90,
+
+    /// <summary>
+    ///     Light grey RGB(211, 211, 211).
+    ///     <para>
+    ///         Same as <see cref="LightGray"/>.
+    ///     </para>
+    /// </summary>
+    LightGrey = LightGray,
+
+    /// <summary>
+    ///     Light pink RGB(255, 182, 193).
+    ///     <para>
+    ///         A pale shade of pink.
+    ///     </para>
+    /// </summary>
+    LightPink = 0xFFB6C1,
+
+    /// <summary>
+    ///     Light salmon RGB(255, 160, 122).
+    ///     <para>
+    ///         A pale pinkish-orange color.
+    ///     </para>
+    /// </summary>
+    LightSalmon = 0xFFA07A,
+
+    /// <summary>
+    ///     Light sea green RGB(32, 178, 170).
+    ///     <para>
+    ///         A pale shade of sea green.
+    ///     </para>
+    /// </summary>
+    LightSeaGreen = 0x20B2AA,
+
+    /// <summary>
+    ///     Light sky blue RGB(135, 206, 250).
+    ///     <para>
+    ///         A pale shade of sky blue.
+    ///     </para>
+    /// </summary>
+    LightSkyBlue = 0x87CEFA,
+
+    /// <summary>
+    ///     Light slate gray RGB(119, 136, 153).
+    ///     <para>
+    ///         A pale shade of slate gray.
+    ///     </para>
+    /// </summary>
+    LightSlateGray = 0x778899,
+
+    /// <summary>
+    ///     Light slate grey RGB(119, 136, 153).
+    ///     <para>
+    ///         Same as <see cref="LightSlateGray"/>.
+    ///     </para>
+    /// </summary>
+    LightSlateGrey = LightSlateGray,
+
+    /// <summary>
+    ///     Light steel blue RGB(176, 196, 222).
+    ///     <para>
+    ///         A pale shade of steel blue.
+    ///     </para>
+    /// </summary>
+    LightSteelBlue = 0xB0C4DE,
+
+    /// <summary>
+    ///     Light yellow RGB(255, 255, 224).
+    ///     <para>
+    ///         A pale shade of yellow.
+    ///     </para>
+    /// </summary>
+    LightYellow = 0xFFFFE0,
+
+    /// <summary>
+    ///     Lime RGB(0, 255, 0).
+    ///     <para>
+    ///         A bright green color.
+    ///     </para>
+    /// </summary>
+    Lime = 0x00FF00,
+
+    /// <summary>
+    ///     Lime green RGB(50, 205, 50).
+    ///     <para>
+    ///         A bright green color with a hint of yellow.
+    ///     </para>
+    /// </summary>
+    LimeGreen = 0x32CD32,
+
+    /// <summary>
+    ///     Linen RGB(250, 240, 230).
+    ///     <para>
+    ///         A pale beige color, resembling linen fabric.
+    ///     </para>
+    /// </summary>
+    Linen = 0xFAF0E6,
+
+    /// <summary>
+    ///     Magenta RGB(255, 0, 255).
+    ///     <para>
+    ///         A bright and vibrant pinkish-purple color.
+    ///     </para>
+    /// </summary>
+    Magenta = 0xFF00FF,
+
+    /// <summary>
+    ///     Maroon RGB(128, 0, 0).
+    ///     <para>
+    ///         A dark reddish-brown color.
+    ///     </para>
+    /// </summary>
+    Maroon = 0x800000,
+
+    /// <summary>
+    ///     Medium aqua marine RGB(102, 205, 170).
+    ///     <para>
+    ///         A medium shade of greenish-blue.
+    ///     </para>
+    /// </summary>
+    MediumAquaMarine = 0x66CDAA,
+
+    /// <summary>
+    ///     Medium blue RGB(0, 0, 205).
+    ///     <para>
+    ///         A medium shade of blue.
+    ///     </para>
+    /// </summary>
+    MediumBlue = 0x0000CD,
+
+    /// <summary>
+    ///     Medium orchid RGB(186, 85, 211).
+    ///     <para>
+    ///         A medium shade of purple with a hint of pink.
+    ///     </para>
+    /// </summary>
+    MediumOrchid = 0xBA55D3,
+
+    /// <summary>
+    ///     Medium purple RGB(147, 112, 219).
+    ///     <para>
+    ///         A medium shade of purple.
+    ///     </para>
+    /// </summary>
+    MediumPurple = 0x9370DB,
+
+    /// <summary>
+    ///     Medium sea green RGB(60, 179, 113).
+    ///     <para>
+    ///         A medium shade of sea green.
+    ///     </para>
+    /// </summary>
+    MediumSeaGreen = 0x3CB371,
+
+    /// <summary>
+    ///     Medium slate blue RGB(123, 104, 238).
+    ///     <para>
+    ///         A medium shade of slate blue.
+    ///     </para>
+    /// </summary>
+    MediumSlateBlue = 0x7B68EE,
+
+    /// <summary>
+    ///     Medium spring green RGB(0, 250, 154).
+    ///     <para>
+    ///         A medium shade of spring green.
+    ///     </para>
+    /// </summary>
+    MediumSpringGreen = 0x00FA9A,
+
+    /// <summary>
+    ///     Medium turquoise RGB(72, 209, 204).
+    ///     <para>
+    ///         A medium shade of turquoise.
+    ///     </para>
+    /// </summary>
+    MediumTurquoise = 0x48D1CC,
+
+    /// <summary>
+    ///     Medium violet red RGB(199, 21, 133).
+    ///     <para>
+    ///         A medium shade of violet-red.
+    ///     </para>
+    /// </summary>
+    MediumVioletRed = 0xC71585,
+
+    /// <summary>
+    ///     Midnight blue RGB(25, 25, 112).
+    ///     <para>
+    ///         A very dark shade of blue.
+    ///     </para>
+    /// </summary>
+    MidnightBlue = 0x191970,
+
+    /// <summary>
+    ///     Mint cream RGB(245, 255, 250).
+    ///     <para>
+    ///         A very pale greenish-white color.
+    ///     </para>
+    /// </summary>
+    MintCream = 0xF5FFFA,
+
+    /// <summary>
+    ///     Misty rose RGB(255, 228, 225).
+    ///     <para>
+    ///         A very pale pinkish-white color.
+    ///     </para>
+    /// </summary>
+    MistyRose = 0xFFE4E1,
+
+    /// <summary>
+    ///     Moccasin RGB(255, 228, 181).
+    ///     <para>
+    ///         A pale orange color, resembling moccasin leather.
+    ///     </para>
+    /// </summary>
+    Moccasin = 0xFFE4B5,
+
+    /// <summary>
+    ///     Navajo white RGB(255, 222, 173).
+    ///     <para>
+    ///         A pale orange color, resembling Navajo pottery.
+    ///     </para>
+    /// </summary>
+    NavajoWhite = 0xFFDEAD,
+
+    /// <summary>
+    ///     Navy RGB(0, 0, 128).
+    ///     <para>
+    ///         A very dark shade of blue.
+    ///     </para>
+    /// </summary>
+    Navy = 0x000080,
+
+    /// <summary>
+    ///     Old lace RGB(253, 245, 230).
+    ///     <para>
+    ///         A very pale beige color, resembling old lace fabric.
+    ///     </para>
+    /// </summary>
+    OldLace = 0xFDF5E6,
+
+    /// <summary>
+    ///     Olive RGB(128, 128, 0).
+    ///     <para>
+    ///         A dark yellowish-green color.
+    ///     </para>
+    /// </summary>
+    Olive = 0x808000,
+
+    /// <summary>
+    ///     Olive drab RGB(107, 142, 35).
+    ///     <para>
+    ///         A dark yellowish-green color, resembling olive drab fabric.
+    ///     </para>
+    /// </summary>
+    OliveDrab = 0x6B8E23,
+
+    /// <summary>
+    ///     Onyx RGB(53, 56, 57).
+    ///     <para>
+    ///         A dark grayish-black color, resembling the onyx gemstone.
+    ///     </para>
+    /// </summary>
+    Onyx = 0x353839,
+
+    /// <summary>
+    ///     Orange RGB(255, 165, 0).
+    ///     <para>
+    ///         A bright orange color.
+    ///     </para>
+    /// </summary>
+    Orange = 0xFFA500,
+
+    /// <summary>
+    ///     Orange red RGB(255, 69, 0).
+    ///     <para>
+    ///         A bright reddish-orange color.
+    ///     </para>
+    /// </summary>
+    OrangeRed = 0xFF4500,
+
+    /// <summary>
+    ///     Orchid RGB(218, 112, 214).
+    ///     <para>
+    ///         A pale purple color with a hint of pink.
+    ///     </para>
+    /// </summary>
+    Orchid = 0xDA70D6,
+
+    /// <summary>
+    ///     Outer space RGB(65, 74, 76).
+    ///     <para>
+    ///         A dark gray color with a bluish tint, resembling the color of outer space.
+    ///     </para>
+    /// </summary>
+    OuterSpace = 0x414A4C,
+
+    /// <summary>
+    ///     Pale goldenrod RGB(238, 232, 170).
+    ///     <para>
+    ///         A pale yellow color with a hint of gold.
+    ///     </para>
+    /// </summary>
+    PaleGoldenrod = 0xEEE8AA,
+
+    /// <summary>
+    ///     Pale green RGB(152, 251, 152).
+    ///     <para>
+    ///         A pale shade of green.
+    ///     </para>
+    /// </summary>
+    PaleGreen = 0x98FB98,
+
+    /// <summary>
+    ///     Pale turquoise RGB(175, 238, 238).
+    ///     <para>
+    ///         A pale shade of turquoise.
+    ///     </para>
+    /// </summary>
+    PaleTurquoise = 0xAFEEEE,
+
+    /// <summary>
+    ///     Pale violet red RGB(219, 112, 147).
+    ///     <para>
+    ///         A pale shade of violet-red.
+    ///     </para>
+    /// </summary>
+    PaleVioletRed = 0xDB7093,
+
+    /// <summary>
+    ///     Papaya whip RGB(255, 239, 213).
+    ///     <para>
+    ///         A pale orange color, resembling papaya fruit.
+    ///     </para>
+    /// </summary>
+    PapayaWhip = 0xFFEFD5,
+
+    /// <summary>
+    ///     Peach puff RGB(255, 218, 185).
+    ///     <para>
+    ///         A pale orange color, resembling peach skin.
+    ///     </para>
+    /// </summary>
+    PeachPuff = 0xFFDAB9,
+
+    /// <summary>
+    ///     Peru RGB(205, 133, 63).
+    ///     <para>
+    ///         A dark orange-brown color.
+    ///     </para>
+    /// </summary>
+    Peru = 0xCD853F,
+
+    /// <summary>
+    ///     Pink RGB(255, 192, 203).
+    ///     <para>
+    ///         A pale shade of pink.
+    ///     </para>
+    /// </summary>
+    Pink = 0xFFC0CB,
+
+    /// <summary>
+    ///     Plum RGB(221, 160, 221).
+    ///     <para>
+    ///         A pale purple color.
+    ///     </para>
+    /// </summary>
+    Plum = 0xDDA0DD,
+
+    /// <summary>
+    ///     Powder blue RGB(176, 224, 230).
+    ///     <para>
+    ///         A pale shade of blue.
+    ///     </para>
+    /// </summary>
+    PowderBlue = 0xB0E0E6,
+
+    /// <summary>
+    ///     Purple RGB(128, 0, 128).
+    ///     <para>
+    ///         A dark shade of purple.
+    ///     </para>
+    /// </summary>
+    Purple = 0x800080,
+
+    /// <summary>
+    ///     Raisin black RGB(36, 33, 36).
+    ///     <para>
+    ///         A very dark grayish-black color, resembling the color of raisins.
+    ///     </para>
+    /// </summary>
+    RaisinBlack = 0x242124,
+
+    /// <summary>
+    ///     Rebecca purple RGB(102, 51, 153).
+    ///     <para>
+    ///         A medium-dark shade of purple.
+    ///     </para>
+    /// </summary>
+    RebeccaPurple = 0x663399,
+
+    /// <summary>
+    ///     Red RGB(255, 0, 0).
+    ///     <para>
+    ///         A bright red color.
+    ///     </para>
+    /// </summary>
+    Red = 0xFF0000,
+
+    /// <summary>
+    ///     Rosy brown RGB(188, 143, 143).
+    ///     <para>
+    ///         A pale reddish-brown color.
+    ///     </para>
+    /// </summary>
+    RosyBrown = 0xBC8F8F,
+
+    /// <summary>
+    ///     Royal blue RGB(65, 105, 225).
+    ///     <para>
+    ///         A medium shade of blue.
+    ///     </para>
+    /// </summary>
+    RoyalBlue = 0x4169E1,
+
+    /// <summary>
+    ///     Saddle brown RGB(139, 69, 19).
+    ///     <para>
+    ///         A dark reddish-brown color.
+    ///     </para>
+    /// </summary>
+    SaddleBrown = 0x8B4513,
+
+    /// <summary>
+    ///     Salmon RGB(250, 128, 114).
+    ///     <para>
+    ///         A pale pinkish-orange color.
+    ///     </para>
+    /// </summary>
+    Salmon = 0xFA8072,
+
+    /// <summary>
+    ///     Sandy brown RGB(244, 164, 96).
+    ///     <para>
+    ///         A pale orange-brown color.
+    ///     </para>
+    /// </summary>
+    SandyBrown = 0xF4A460,
+
+    /// <summary>
+    ///     Sea green RGB(46, 139, 87).
+    ///     <para>
+    ///         A medium-dark shade of green.
+    ///     </para>
+    /// </summary>
+    SeaGreen = 0x2E8B57,
+
+    /// <summary>
+    ///     Sea shell RGB(255, 245, 238).
+    ///     <para>
+    ///         A very pale orange color, resembling seashells.
+    ///     </para>
+    /// </summary>
+    SeaShell = 0xFFF5EE,
+
+    /// <summary>
+    ///     Sienna RGB(160, 82, 45).
+    ///     <para>
+    ///         A dark orange-brown color.
+    ///     </para>
+    /// </summary>
+    Sienna = 0xA0522D,
+
+    /// <summary>
+    ///     Silver RGB(192, 192, 192).
+    ///     <para>
+    ///         A pale gray color, resembling silver.
+    ///     </para>
+    /// </summary>
+    Silver = 0xC0C0C0,
+
+    /// <summary>
+    ///     Sky blue RGB(135, 206, 235).
+    ///     <para>
+    ///         A pale shade of blue, resembling the sky.
+    ///     </para>
+    /// </summary>
+    SkyBlue = 0x87CEEB,
+
+    /// <summary>
+    ///     Slate blue RGB(106, 90, 205).
+    ///     <para>
+    ///         A medium-dark shade of blue.
+    ///     </para>
+    /// </summary>
+    SlateBlue = 0x6A5ACD,
+
+    /// <summary>
+    ///     Slate gray RGB(112, 128, 144).
+    ///     <para>
+    ///         A medium-dark shade of gray.
+    ///     </para>
+    /// </summary>
+    SlateGray = 0x708090,
+
+    /// <summary>
+    ///     Slate grey RGB(112, 128, 144).
+    ///     <para>
+    ///         Same as <see cref="SlateGray"/>.
+    ///     </para>
+    /// </summary>
+    SlateGrey = SlateGray,
+
+    /// <summary>
+    ///     Snow RGB(255, 250, 250).
+    ///     <para>
+    ///         A very pale shade of white with a hint of pink.
+    ///     </para>
+    /// </summary>
+    Snow = 0xFFFAFA,
+
+    /// <summary>
+    ///     Spring green RGB(0, 255, 127).
+    ///     <para>
+    ///         A bright green color with a hint of yellow.
+    ///     </para>
+    /// </summary>
+    SpringGreen = 0x00FF7F,
+
+    /// <summary>
+    ///     Steel blue RGB(70, 130, 180).
+    ///     <para>
+    ///         A medium-dark shade of blue.
+    ///     </para>
+    /// </summary>
+    SteelBlue = 0x4682B4,
+
+    /// <summary>
+    ///     Tan RGB(210, 180, 140).
+    ///     <para>
+    ///         A pale orange-brown color.
+    ///     </para>
+    /// </summary>
+    Tan = 0xD2B48C,
+
+    /// <summary>
+    ///     Teal RGB(0, 128, 128).
+    ///     <para>
+    ///         A medium-dark shade of greenish-blue.
+    ///     </para>
+    /// </summary>
+    Teal = 0x008080,
+
+    /// <summary>
+    ///     Thistle RGB(216, 191, 216).
+    ///     <para>
+    ///         A pale purple color.
+    ///     </para>
+    /// </summary>
+    Thistle = 0xD8BFD8,
+
+    /// <summary>
+    ///     Tomato RGB(255, 99, 71).
+    ///     <para>
+    ///         A bright reddish-orange color, resembling tomatoes.
+    ///     </para>
+    /// </summary>
+    Tomato = 0xFF6347,
+
+    /// <summary>
+    ///     Turquoise RGB(64, 224, 208).
+    ///     <para>
+    ///         A bright greenish-blue color.
+    ///     </para>
+    /// </summary>
+    Turquoise = 0x40E0D0,
+
+    /// <summary>
+    ///     Violet RGB(238, 130, 238).
+    ///     <para>
+    ///         A bright purple color.
+    ///     </para>
+    /// </summary>
+    Violet = 0xEE82EE,
+
+    /// <summary>
+    ///     Wheat RGB(245, 222, 179).
+    ///     <para>
+    ///         A pale yellowish-brown color, resembling wheat.
+    ///     </para>
+    /// </summary>
+    Wheat = 0xF5DEB3,
+
+    /// <summary>
+    ///     White RGB(255, 255, 255).
+    ///     <para>
+    ///         The lightest color, representing the presence of all colors of light.
+    ///     </para>
+    /// </summary>
+    White = 0xFFFFFF,
+
+    /// <summary>
+    ///     White smoke RGB(245, 245, 245).
+    ///     <para>
+    ///         A very pale shade of gray, resembling smoke.
+    ///     </para>
+    /// </summary>
+    WhiteSmoke = 0xF5F5F5,
+
+    /// <summary>
+    ///     Yellow RGB(255, 255, 0).
+    ///     <para>
+    ///         A bright yellow color.
+    ///     </para>
+    /// </summary>
+    Yellow = 0xFFFF00,
+
+    /// <summary>
+    ///     Yellow green RGB(154, 205, 50).
+    ///     <para>
+    ///         A bright yellowish-green color.
+    ///     </para>
+    /// </summary>
+    YellowGreen = 0x9ACD32
+}
diff --git a/Terminal.Gui/Drawing/Color/StandardColors.cs b/Terminal.Gui/Drawing/Color/StandardColors.cs
new file mode 100644
index 0000000000..02a829692d
--- /dev/null
+++ b/Terminal.Gui/Drawing/Color/StandardColors.cs
@@ -0,0 +1,91 @@
+#nullable enable
+using System.Collections.Frozen;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Terminal.Gui;
+
+/// <summary>
+/// Helper class for transforming to and from <see cref="StandardColor"/> enum.
+/// </summary>
+internal static class StandardColors
+{
+    private static readonly ImmutableArray<string> _names;
+    private static readonly FrozenDictionary<uint, string> _argbNameMap;
+
+    static StandardColors ()
+    {
+        // Populate based on names because enums with same numerical value
+        // are not otherwise distinguishable from each other.
+        string [] standardNames = Enum.GetNames<StandardColor> ().Order ().ToArray ();
+
+        Dictionary<uint, string> map = new (standardNames.Length);
+        foreach (string name in standardNames)
+        {
+            StandardColor standardColor = Enum.Parse<StandardColor> (name);
+            uint argb = GetArgb (standardColor);
+            // TODO: Collect aliases?
+            _ = map.TryAdd (argb, name);
+        }
+
+        _names = ImmutableArray.Create (standardNames);
+        _argbNameMap = map.ToFrozenDictionary ();
+    }
+
+    /// <summary>
+    /// Gets read-only list of the W3C colors in alphabetical order.
+    /// </summary>
+    public static IReadOnlyList<string> GetColorNames ()
+    {
+        return _names;
+    }
+
+    /// <summary>
+    /// Converts the given Standard (W3C+) color name to equivalent color value.
+    /// </summary>
+    /// <param name="name">Standard (W3C+) color name.</param>
+    /// <param name="color">The successfully converted Standard (W3C+) color value.</param>
+    /// <returns>True if the conversion succeeded; otherwise false.</returns>
+    public static bool TryParseColor (ReadOnlySpan<char> name, out Color color)
+    {
+        if (!Enum.TryParse (name, ignoreCase: true, out StandardColor standardColor) ||
+            // Any numerical value converts to undefined enum value.
+            !Enum.IsDefined (standardColor))
+        {
+            color = default;
+            return false;
+        }
+
+        uint argb = GetArgb (standardColor);
+        color = new Color (argb);
+        return true;
+    }
+
+    /// <summary>
+    /// Converts the given color value to a Standard (W3C+) color name.
+    /// </summary>
+    /// <param name="color">Color value to match Standard (W3C+)color.</param>
+    /// <param name="name">The successfully converted Standard (W3C+) color name.</param>
+    /// <returns>True if conversion succeeded; otherwise false.</returns>
+    public static bool TryNameColor (Color color, [NotNullWhen (true)] out string? name)
+    {
+        if (_argbNameMap.TryGetValue (color.Argb, out name))
+        {
+            return true;
+        }
+
+        name = null;
+        return false;
+    }
+
+    internal static uint GetArgb (StandardColor standardColor)
+    {
+        const int ALPHA_SHIFT = 24;
+        const uint ALPHA_MASK = 0xFFU << ALPHA_SHIFT;
+
+        int rgb = (int)standardColor;
+
+        uint argb = (uint)rgb | ALPHA_MASK;
+        return argb;
+    }
+}
diff --git a/Terminal.Gui/Drawing/Color/StandardColorsNameResolver.cs b/Terminal.Gui/Drawing/Color/StandardColorsNameResolver.cs
new file mode 100644
index 0000000000..8c582aeff2
--- /dev/null
+++ b/Terminal.Gui/Drawing/Color/StandardColorsNameResolver.cs
@@ -0,0 +1,20 @@
+#nullable enable
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Terminal.Gui;
+
+/// <summary>
+/// Standard (W3C+) color name resolver.
+/// </summary>
+public class StandardColorsNameResolver : IColorNameResolver
+{
+    /// <inheritdoc/>
+    public IEnumerable<string> GetColorNames () => StandardColors.GetColorNames ();
+
+    /// <inheritdoc/>
+    public bool TryParseColor (ReadOnlySpan<char> name, out Color color) => StandardColors.TryParseColor (name, out color);
+
+    /// <inheritdoc/>
+    public bool TryNameColor (Color color, [NotNullWhen (true)] out string? name) => StandardColors.TryNameColor (color, out name);
+}
\ No newline at end of file
diff --git a/Terminal.Gui/Drawing/Color/W3cColor.cs b/Terminal.Gui/Drawing/Color/W3cColor.cs
deleted file mode 100644
index a2cc07dabd..0000000000
--- a/Terminal.Gui/Drawing/Color/W3cColor.cs
+++ /dev/null
@@ -1,777 +0,0 @@
-namespace Terminal.Gui;
-
-/// <summary>
-/// Represents the W3C color names with their RGB values.
-/// </summary>
-/// <remarks>
-/// Based on https://www.w3schools.com/colors/color_tryit.asp page.
-/// </remarks>
-public enum W3cColor
-{
-    /// <summary>
-    /// Alice blue RGB(240, 248, 255).
-    /// </summary>
-    AliceBlue = 0xF0F8FF,
-
-    /// <summary>
-    /// Antique white RGB(250, 235, 215).
-    /// </summary>
-    AntiqueWhite = 0xFAEBD7,
-
-    /// <summary>
-    /// Aqua RGB(0, 255, 255).
-    /// </summary>
-    Aqua = 0x00FFFF,
-
-    /// <summary>
-    /// Aquamarine RGB(127, 255, 212).
-    /// </summary>
-    Aquamarine = 0x7FFFD4,
-
-    /// <summary>
-    /// Azure RGB(240, 255, 255).
-    /// </summary>
-    Azure = 0xF0FFFF,
-
-    /// <summary>
-    /// Beige RGB(245, 245, 220).
-    /// </summary>
-    Beige = 0xF5F5DC,
-
-    /// <summary>
-    /// Bisque RGB(255, 228, 196).
-    /// </summary>
-    Bisque = 0xFFE4C4,
-
-    /// <summary>
-    /// Black RGB(0, 0, 0).
-    /// </summary>
-    Black = 0x000000,
-
-    /// <summary>
-    /// Blanched almond RGB(255, 235, 205).
-    /// </summary>
-    BlanchedAlmond = 0xFFEBCD,
-
-    /// <summary>
-    /// Blue RGB(0, 0, 255).
-    /// </summary>
-    Blue = 0x0000FF,
-
-    /// <summary>
-    /// Blue violet RGB(138, 43, 226).
-    /// </summary>
-    BlueViolet = 0x8A2BE2,
-
-    /// <summary>
-    /// Brown RGB(165, 42, 42).
-    /// </summary>
-    Brown = 0xA52A2A,
-
-    /// <summary>
-    /// Burly wood RGB(222, 184, 135).
-    /// </summary>
-    BurlyWood = 0xDEB887,
-
-    /// <summary>
-    /// Cadet blue RGB(95, 158, 160).
-    /// </summary>
-    CadetBlue = 0x5F9EA0,
-
-    /// <summary>
-    /// Chartreuse RGB(127, 255, 0).
-    /// </summary>
-    Chartreuse = 0x7FFF00,
-
-    /// <summary>
-    /// Chocolate RGB(210, 105, 30).
-    /// </summary>
-    Chocolate = 0xD2691E,
-
-    /// <summary>
-    /// Coral RGB(255, 127, 80).
-    /// </summary>
-    Coral = 0xFF7F50,
-
-    /// <summary>
-    /// Cornflower blue RGB(100, 149, 237).
-    /// </summary>
-    CornflowerBlue = 0x6495ED,
-
-    /// <summary>
-    /// Cornsilk RGB(255, 248, 220).
-    /// </summary>
-    Cornsilk = 0xFFF8DC,
-
-    /// <summary>
-    /// Crimson RGB(220, 20, 60).
-    /// </summary>
-    Crimson = 0xDC143C,
-
-    /// <summary>
-    /// Cyan RGB(0, 255, 255).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="Aqua"/>.
-    /// </remarks>
-    Cyan = Aqua,
-
-    /// <summary>
-    /// Dark blue RGB(0, 0, 139).
-    /// </summary>
-    DarkBlue = 0x00008B,
-
-    /// <summary>
-    /// Dark cyan RGB(0, 139, 139).
-    /// </summary>
-    DarkCyan = 0x008B8B,
-
-    /// <summary>
-    /// Dark goldenrod RGB(184, 134, 11).
-    /// </summary>
-    DarkGoldenrod = 0xB8860B,
-
-    /// <summary>
-    /// Dark gray RGB(169, 169, 169).
-    /// </summary>
-    DarkGray = 0xA9A9A9,
-
-    /// <summary>
-    /// Dark green RGB(0, 100, 0).
-    /// </summary>
-    DarkGreen = 0x006400,
-
-    /// <summary>
-    /// Dark grey RGB(169, 169, 169).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="DarkGray"/>.
-    /// </remarks>
-    DarkGrey = DarkGray,
-
-    /// <summary>
-    /// Dark khaki RGB(189, 183, 107).
-    /// </summary>
-    DarkKhaki = 0xBDB76B,
-
-    /// <summary>
-    /// Dark magenta RGB(139, 0, 139).
-    /// </summary>
-    DarkMagenta = 0x8B008B,
-
-    /// <summary>
-    /// Dark olive green RGB(85, 107, 47).
-    /// </summary>
-    DarkOliveGreen = 0x556B2F,
-
-    /// <summary>
-    /// Dark orange RGB(255, 140, 0).
-    /// </summary>
-    DarkOrange = 0xFF8C00,
-
-    /// <summary>
-    /// Dark orchid RGB(153, 50, 204).
-    /// </summary>
-    DarkOrchid = 0x9932CC,
-
-    /// <summary>
-    /// Dark red RGB(139, 0, 0).
-    /// </summary>
-    DarkRed = 0x8B0000,
-
-    /// <summary>
-    /// Dark salmon RGB(233, 150, 122).
-    /// </summary>
-    DarkSalmon = 0xE9967A,
-
-    /// <summary>
-    /// Dark sea green RGB(143, 188, 143).
-    /// </summary>
-    DarkSeaGreen = 0x8FBC8F,
-
-    /// <summary>
-    /// Dark slate blue RGB(72, 61, 139).
-    /// </summary>
-    DarkSlateBlue = 0x483D8B,
-
-    /// <summary>
-    /// Dark slate gray RGB(47, 79, 79).
-    /// </summary>
-    DarkSlateGray = 0x2F4F4F,
-
-    /// <summary>
-    /// Dark slate grey RGB(47, 79, 79).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="DarkSlateGray"/>.
-    /// </remarks>
-    DarkSlateGrey = DarkSlateGray,
-
-    /// <summary>
-    /// Dark turquoise RGB(0, 206, 209).
-    /// </summary>
-    DarkTurquoise = 0x00CED1,
-
-    /// <summary>
-    /// Dark violet RGB(148, 0, 211).
-    /// </summary>
-    DarkViolet = 0x9400D3,
-
-    /// <summary>
-    /// Deep pink RGB(255, 20, 147).
-    /// </summary>
-    DeepPink = 0xFF1493,
-
-    /// <summary>
-    /// Deep sky blue RGB(0, 191, 255).
-    /// </summary>
-    DeepSkyBlue = 0x00BFFF,
-
-    /// <summary>
-    /// Dim gray RGB(105, 105, 105).
-    /// </summary>
-    DimGray = 0x696969,
-
-    /// <summary>
-    /// Dim grey RGB(105, 105, 105).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="DimGray"/>.
-    /// </remarks>
-    DimGrey = DimGray,
-
-    /// <summary>
-    /// Dodger blue RGB(30, 144, 255).
-    /// </summary>
-    DodgerBlue = 0x1E90FF,
-
-    /// <summary>
-    /// Fire brick RGB(178, 34, 34).
-    /// </summary>
-    FireBrick = 0xB22222,
-
-    /// <summary>
-    /// Floral white RGB(255, 250, 240).
-    /// </summary>
-    FloralWhite = 0xFFFAF0,
-
-    /// <summary>
-    /// Forest green RGB(34, 139, 34).
-    /// </summary>
-    ForestGreen = 0x228B22,
-
-    /// <summary>
-    /// Fuchsia RGB(255, 0, 255).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="Magenta"/>.
-    /// </remarks>
-    Fuchsia = Magenta,
-
-    /// <summary>
-    /// Gainsboro RGB(220, 220, 220).
-    /// </summary>
-    Gainsboro = 0xDCDCDC,
-
-    /// <summary>
-    /// Ghost white RGB(248, 248, 255).
-    /// </summary>
-    GhostWhite = 0xF8F8FF,
-
-    /// <summary>
-    /// Gold RGB(255, 215, 0).
-    /// </summary>
-    Gold = 0xFFD700,
-
-    /// <summary>
-    /// Goldenrod RGB(218, 165, 32).
-    /// </summary>
-    Goldenrod = 0xDAA520,
-
-    /// <summary>
-    /// Gray RGB(128, 128, 128).
-    /// </summary>
-    Gray = 0x808080,
-
-    /// <summary>
-    /// Green RGB(0, 128, 0).
-    /// </summary>
-    Green = 0x008000,
-
-    /// <summary>
-    /// Green yellow RGB(173, 255, 47).
-    /// </summary>
-    GreenYellow = 0xADFF2F,
-
-    /// <summary>
-    /// Grey RGB(128, 128, 128).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="Gray"/>.
-    /// </remarks>
-    Grey = Gray,
-
-    /// <summary>
-    /// Honey dew RGB(240, 255, 240).
-    /// </summary>
-    HoneyDew = 0xF0FFF0,
-
-    /// <summary>
-    /// Hot pink RGB(255, 105, 180).
-    /// </summary>
-    HotPink = 0xFF69B4,
-
-    /// <summary>
-    /// Indian red RGB(205, 92, 92).
-    /// </summary>
-    IndianRed = 0xCD5C5C,
-
-    /// <summary>
-    /// Indigo RGB(75, 0, 130).
-    /// </summary>
-    Indigo = 0x4B0082,
-
-    /// <summary>
-    /// Ivory RGB(255, 255, 240).
-    /// </summary>
-    Ivory = 0xFFFFF0,
-
-    /// <summary>
-    /// Khaki RGB(240, 230, 140).
-    /// </summary>
-    Khaki = 0xF0E68C,
-
-    /// <summary>
-    /// Lavender RGB(230, 230, 250).
-    /// </summary>
-    Lavender = 0xE6E6FA,
-
-    /// <summary>
-    /// Lavender blush RGB(255, 240, 245).
-    /// </summary>
-    LavenderBlush = 0xFFF0F5,
-
-    /// <summary>
-    /// Lawn green RGB(124, 252, 0).
-    /// </summary>
-    LawnGreen = 0x7CFC00,
-
-    /// <summary>
-    /// Lemon chiffon RGB(255, 250, 205).
-    /// </summary>
-    LemonChiffon = 0xFFFACD,
-
-    /// <summary>
-    /// Light blue RGB(173, 216, 230).
-    /// </summary>
-    LightBlue = 0xADD8E6,
-
-    /// <summary>
-    /// Light coral RGB(240, 128, 128).
-    /// </summary>
-    LightCoral = 0xF08080,
-
-    /// <summary>
-    /// Light cyan RGB(224, 255, 255).
-    /// </summary>
-    LightCyan = 0xE0FFFF,
-
-    /// <summary>
-    /// Light goldenrod yellow RGB(250, 250, 210).
-    /// </summary>
-    LightGoldenrodYellow = 0xFAFAD2,
-
-    /// <summary>
-    /// Light gray RGB(211, 211, 211).
-    /// </summary>
-    LightGray = 0xD3D3D3,
-
-    /// <summary>
-    /// Light green RGB(144, 238, 144).
-    /// </summary>
-    LightGreen = 0x90EE90,
-
-    /// <summary>
-    /// Light grey RGB(211, 211, 211).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="LightGray"/>.
-    /// </remarks>
-    LightGrey = LightGray,
-
-    /// <summary>
-    /// Light pink RGB(255, 182, 193).
-    /// </summary>
-    LightPink = 0xFFB6C1,
-
-    /// <summary>
-    /// Light salmon RGB(255, 160, 122).
-    /// </summary>
-    LightSalmon = 0xFFA07A,
-
-    /// <summary>
-    /// Light sea green RGB(32, 178, 170).
-    /// </summary>
-    LightSeaGreen = 0x20B2AA,
-
-    /// <summary>
-    /// Light sky blue RGB(135, 206, 250).
-    /// </summary>
-    LightSkyBlue = 0x87CEFA,
-
-    /// <summary>
-    /// Light slate gray RGB(119, 136, 153).
-    /// </summary>
-    LightSlateGray = 0x778899,
-
-    /// <summary>
-    /// Light slate grey RGB(119, 136, 153).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="LightSlateGray"/>.
-    /// </remarks>
-    LightSlateGrey = LightSlateGray,
-
-    /// <summary>
-    /// Light steel blue RGB(176, 196, 222).
-    /// </summary>
-    LightSteelBlue = 0xB0C4DE,
-
-    /// <summary>
-    /// Light yellow RGB(255, 255, 224).
-    /// </summary>
-    LightYellow = 0xFFFFE0,
-
-    /// <summary>
-    /// Lime RGB(0, 255, 0).
-    /// </summary>
-    Lime = 0x00FF00,
-
-    /// <summary>
-    /// Lime green RGB(50, 205, 50).
-    /// </summary>
-    LimeGreen = 0x32CD32,
-
-    /// <summary>
-    /// Linen RGB(250, 240, 230).
-    /// </summary>
-    Linen = 0xFAF0E6,
-
-    /// <summary>
-    /// Magenta RGB(255, 0, 255).
-    /// </summary>
-    Magenta = 0xFF00FF,
-
-    /// <summary>
-    /// Maroon RGB(128, 0, 0).
-    /// </summary>
-    Maroon = 0x800000,
-
-    /// <summary>
-    /// Medium aqua marine RGB(102, 205, 170).
-    /// </summary>
-    MediumAquaMarine = 0x66CDAA,
-
-    /// <summary>
-    /// Medium blue RGB(0, 0, 205).
-    /// </summary>
-    MediumBlue = 0x0000CD,
-
-    /// <summary>
-    /// Medium orchid RGB(186, 85, 211).
-    /// </summary>
-    MediumOrchid = 0xBA55D3,
-
-    /// <summary>
-    /// Medium purple RGB(147, 112, 219).
-    /// </summary>
-    MediumPurple = 0x9370DB,
-
-    /// <summary>
-    /// Medium sea green RGB(60, 179, 113).
-    /// </summary>
-    MediumSeaGreen = 0x3CB371,
-
-    /// <summary>
-    /// Medium slate blue RGB(123, 104, 238).
-    /// </summary>
-    MediumSlateBlue = 0x7B68EE,
-
-    /// <summary>
-    /// Medium spring green RGB(0, 250, 154).
-    /// </summary>
-    MediumSpringGreen = 0x00FA9A,
-
-    /// <summary>
-    /// Medium turquoise RGB(72, 209, 204).
-    /// </summary>
-    MediumTurquoise = 0x48D1CC,
-
-    /// <summary>
-    /// Medium violet red RGB(199, 21, 133).
-    /// </summary>
-    MediumVioletRed = 0xC71585,
-
-    /// <summary>
-    /// Midnight blue RGB(25, 25, 112).
-    /// </summary>
-    MidnightBlue = 0x191970,
-
-    /// <summary>
-    /// Mint cream RGB(245, 255, 250).
-    /// </summary>
-    MintCream = 0xF5FFFA,
-
-    /// <summary>
-    /// Misty rose RGB(255, 228, 225).
-    /// </summary>
-    MistyRose = 0xFFE4E1,
-
-    /// <summary>
-    /// Moccasin RGB(255, 228, 181).
-    /// </summary>
-    Moccasin = 0xFFE4B5,
-
-    /// <summary>
-    /// Navajo white RGB(255, 222, 173).
-    /// </summary>
-    NavajoWhite = 0xFFDEAD,
-
-    /// <summary>
-    /// Navy RGB(0, 0, 128).
-    /// </summary>
-    Navy = 0x000080,
-
-    /// <summary>
-    /// Old lace RGB(253, 245, 230).
-    /// </summary>
-    OldLace = 0xFDF5E6,
-
-    /// <summary>
-    /// Olive RGB(128, 128, 0).
-    /// </summary>
-    Olive = 0x808000,
-
-    /// <summary>
-    /// Olive drab RGB(107, 142, 35).
-    /// </summary>
-    OliveDrab = 0x6B8E23,
-
-    /// <summary>
-    /// Orange RGB(255, 165, 0).
-    /// </summary>
-    Orange = 0xFFA500,
-
-    /// <summary>
-    /// Orange red RGB(255, 69, 0).
-    /// </summary>
-    OrangeRed = 0xFF4500,
-
-    /// <summary>
-    /// Orchid RGB(218, 112, 214).
-    /// </summary>
-    Orchid = 0xDA70D6,
-
-    /// <summary>
-    /// Pale goldenrod RGB(238, 232, 170).
-    /// </summary>
-    PaleGoldenrod = 0xEEE8AA,
-
-    /// <summary>
-    /// Pale green RGB(152, 251, 152).
-    /// </summary>
-    PaleGreen = 0x98FB98,
-
-    /// <summary>
-    /// Pale turquoise RGB(175, 238, 238).
-    /// </summary>
-    PaleTurquoise = 0xAFEEEE,
-
-    /// <summary>
-    /// Pale violet red RGB(219, 112, 147).
-    /// </summary>
-    PaleVioletRed = 0xDB7093,
-
-    /// <summary>
-    /// Papaya whip RGB(255, 239, 213).
-    /// </summary>
-    PapayaWhip = 0xFFEFD5,
-
-    /// <summary>
-    /// Peach puff RGB(255, 218, 185).
-    /// </summary>
-    PeachPuff = 0xFFDAB9,
-
-    /// <summary>
-    /// Peru RGB(205, 133, 63).
-    /// </summary>
-    Peru = 0xCD853F,
-
-    /// <summary>
-    /// Pink RGB(255, 192, 203).
-    /// </summary>
-    Pink = 0xFFC0CB,
-
-    /// <summary>
-    /// Plum RGB(221, 160, 221).
-    /// </summary>
-    Plum = 0xDDA0DD,
-
-    /// <summary>
-    /// Powder blue RGB(176, 224, 230).
-    /// </summary>
-    PowderBlue = 0xB0E0E6,
-
-    /// <summary>
-    /// Purple RGB(128, 0, 128).
-    /// </summary>
-    Purple = 0x800080,
-
-    /// <summary>
-    /// Rebecca purple RGB(102, 51, 153).
-    /// </summary>
-    RebeccaPurple = 0x663399,
-
-    /// <summary>
-    /// Red RGB(255, 0, 0).
-    /// </summary>
-    Red = 0xFF0000,
-
-    /// <summary>
-    /// Rosy brown RGB(188, 143, 143).
-    /// </summary>
-    RosyBrown = 0xBC8F8F,
-
-    /// <summary>
-    /// Royal blue RGB(65, 105, 225).
-    /// </summary>
-    RoyalBlue = 0x4169E1,
-
-    /// <summary>
-    /// Saddle brown RGB(139, 69, 19).
-    /// </summary>
-    SaddleBrown = 0x8B4513,
-
-    /// <summary>
-    /// Salmon RGB(250, 128, 114).
-    /// </summary>
-    Salmon = 0xFA8072,
-
-    /// <summary>
-    /// Sandy brown RGB(244, 164, 96).
-    /// </summary>
-    SandyBrown = 0xF4A460,
-
-    /// <summary>
-    /// Sea green RGB(46, 139, 87).
-    /// </summary>
-    SeaGreen = 0x2E8B57,
-
-    /// <summary>
-    /// Sea shell RGB(255, 245, 238).
-    /// </summary>
-    SeaShell = 0xFFF5EE,
-
-    /// <summary>
-    /// Sienna RGB(160, 82, 45).
-    /// </summary>
-    Sienna = 0xA0522D,
-
-    /// <summary>
-    /// Silver RGB(192, 192, 192).
-    /// </summary>
-    Silver = 0xC0C0C0,
-
-    /// <summary>
-    /// Sky blue RGB(135, 206, 235).
-    /// </summary>
-    SkyBlue = 0x87CEEB,
-
-    /// <summary>
-    /// Slate blue RGB(106, 90, 205).
-    /// </summary>
-    SlateBlue = 0x6A5ACD,
-
-    /// <summary>
-    /// Slate gray RGB(112, 128, 144).
-    /// </summary>
-    SlateGray = 0x708090,
-
-    /// <summary>
-    /// Slate grey RGB(112, 128, 144).
-    /// </summary>
-    /// <remarks>
-    /// Same as <see cref="SlateGray"/>.
-    /// </remarks>
-    SlateGrey = SlateGray,
-
-    /// <summary>
-    /// Snow RGB(255, 250, 250).
-    /// </summary>
-    Snow = 0xFFFAFA,
-
-    /// <summary>
-    /// Spring green RGB(0, 255, 127).
-    /// </summary>
-    SpringGreen = 0x00FF7F,
-
-    /// <summary>
-    /// Steel blue RGB(70, 130, 180).
-    /// </summary>
-    SteelBlue = 0x4682B4,
-
-    /// <summary>
-    /// Tan RGB(210, 180, 140).
-    /// </summary>
-    Tan = 0xD2B48C,
-
-    /// <summary>
-    /// Teal RGB(0, 128, 128).
-    /// </summary>
-    Teal = 0x008080,
-
-    /// <summary>
-    /// Thistle RGB(216, 191, 216).
-    /// </summary>
-    Thistle = 0xD8BFD8,
-
-    /// <summary>
-    /// Tomato RGB(255, 99, 71).
-    /// </summary>
-    Tomato = 0xFF6347,
-
-    /// <summary>
-    /// Turquoise RGB(64, 224, 208).
-    /// </summary>
-    Turquoise = 0x40E0D0,
-
-    /// <summary>
-    /// Violet RGB(238, 130, 238).
-    /// </summary>
-    Violet = 0xEE82EE,
-
-    /// <summary>
-    /// Wheat RGB(245, 222, 179).
-    /// </summary>
-    Wheat = 0xF5DEB3,
-
-    /// <summary>
-    /// White RGB(255, 255, 255).
-    /// </summary>
-    White = 0xFFFFFF,
-
-    /// <summary>
-    /// White smoke RGB(245, 245, 245).
-    /// </summary>
-    WhiteSmoke = 0xF5F5F5,
-
-    /// <summary>
-    /// Yellow RGB(255, 255, 0).
-    /// </summary>
-    Yellow = 0xFFFF00,
-
-    /// <summary>
-    /// Yellow green RGB(154, 205, 50).
-    /// </summary>
-    YellowGreen = 0x9ACD32
-}
diff --git a/Terminal.Gui/Drawing/Color/W3cColorNameResolver.cs b/Terminal.Gui/Drawing/Color/W3cColorNameResolver.cs
deleted file mode 100644
index 446e425726..0000000000
--- a/Terminal.Gui/Drawing/Color/W3cColorNameResolver.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#nullable enable
-
-using System.Collections.Frozen;
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Terminal.Gui;
-
-/// <summary>
-/// W3C color name resolver.
-/// </summary>
-public class W3cColorNameResolver : IColorNameResolver
-{
-    /// <inheritdoc/>
-    public IEnumerable<string> GetColorNames () =>
-        W3cColors.GetColorNames ();
-
-    /// <inheritdoc/>
-    public bool TryParseColor (ReadOnlySpan<char> name, out Color color) =>
-        W3cColors.TryParseColor (name, out color);
-
-    /// <inheritdoc/>
-    public bool TryNameColor (Color color, [NotNullWhen (true)] out string? name) =>
-        W3cColors.TryNameColor (color, out name);
-}
-
-/// <summary>
-/// Helper class for transforming to and from <see cref="W3cColor"/> enum.
-/// </summary>
-internal static class W3cColors
-{
-    private static readonly ImmutableArray<string> Names;
-    private static readonly FrozenDictionary<uint, string> ArgbNameMap;
-
-    static W3cColors ()
-    {
-        // Populate based on names because enums with same numerical value
-        // are not otherwise distinguishable from each other.
-        string[] w3cNames = Enum.GetNames<W3cColor> ().Order().ToArray();
-
-        Dictionary<uint, string> map = new(w3cNames.Length);
-        foreach (string name in w3cNames)
-        {
-            W3cColor w3c = Enum.Parse<W3cColor>(name);
-            uint argb = GetArgb(w3c);
-            // TODO: Collect aliases?
-            _ = map.TryAdd (argb, name);
-        }
-
-        Names = ImmutableArray.Create (w3cNames);
-        ArgbNameMap = map.ToFrozenDictionary ();
-    }
-
-    /// <summary>
-    /// Gets read-only list of the W3C colors in alphabetical order.
-    /// </summary>
-    public static IReadOnlyList<string> GetColorNames ()
-    {
-        return Names;
-    }
-
-    /// <summary>
-    /// Converts the given W3C color name to equivalent color value.
-    /// </summary>
-    /// <param name="name">W3C color name.</param>
-    /// <param name="color">The successfully converted W3C color value.</param>
-    /// <returns>True if the conversion succeeded; otherwise false.</returns>
-    public static bool TryParseColor (ReadOnlySpan<char> name, out Color color)
-    {
-        if (!Enum.TryParse (name, ignoreCase: true, out W3cColor w3cColor) ||
-            // Any numerical value converts to undefined enum value.
-            !Enum.IsDefined (w3cColor))
-        {
-            color = default;
-            return false;
-        }
-
-        uint argb = GetArgb (w3cColor);
-        color = new Color (argb);
-        return true;
-    }
-
-    /// <summary>
-    /// Converts the given color value to a W3C color name.
-    /// </summary>
-    /// <param name="color">Color value to match W3C color.</param>
-    /// <param name="name">The successfully converted W3C color name.</param>
-    /// <returns>True if conversion succeeded; otherwise false.</returns>
-    public static bool TryNameColor (Color color, [NotNullWhen (true)] out string? name)
-    {
-        if (ArgbNameMap.TryGetValue (color.Argb, out name))
-        {
-            return true;
-        }
-
-        name = null;
-        return false;
-    }
-
-    private static uint GetArgb (W3cColor w3cColor)
-    {
-        const int alphaShift = 24;
-        const uint alphaMask = 0xFFU << alphaShift;
-
-        int rgb = (int)w3cColor;
-
-        uint argb = (uint)rgb | alphaMask;
-        return argb;
-    }
-}
diff --git a/Terminal.Gui/Drawing/Glyphs.cs b/Terminal.Gui/Drawing/Glyphs.cs
index 627d925a61..e429e6aa0b 100644
--- a/Terminal.Gui/Drawing/Glyphs.cs
+++ b/Terminal.Gui/Drawing/Glyphs.cs
@@ -27,161 +27,161 @@ public class Glyphs
     // IMPORTANT: in ./UnitTests/bin/Debug/netX.0/config.json
 
     /// <summary>File icon.  Defaults to ☰ (Trigram For Heaven)</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune File { get; set; } = (Rune)'☰';
 
     /// <summary>Folder icon.  Defaults to ꤉ (Kayah Li Digit Nine)</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Folder { get; set; } = (Rune)'꤉';
 
     /// <summary>Horizontal Ellipsis - … U+2026</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune HorizontalEllipsis { get; set; } = (Rune)'…';
 
     /// <summary>Vertical Four Dots - ⁞ U+205e</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune VerticalFourDots { get; set; } = (Rune)'⁞';
 
     #region ----------------- Single Glyphs -----------------
 
     /// <summary>Checked indicator (e.g. for <see cref="ListView"/> and <see cref="CheckBox"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Rune CheckStateChecked { get; set; } = (Rune)'☑';
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static Rune CheckStateChecked { get; set; } = (Rune)'☒'; // '☑' is colored
 
     /// <summary>Not Checked indicator (e.g. for <see cref="ListView"/> and <see cref="CheckBox"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune CheckStateUnChecked { get; set; } = (Rune)'☐';
 
     /// <summary>Null Checked indicator (e.g. for <see cref="ListView"/> and <see cref="CheckBox"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Rune CheckStateNone { get; set; } = (Rune)'☒';
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static Rune CheckStateNone { get; set; } = (Rune)'□'; // TODO: Verify this works as broadly as possible
 
     /// <summary>Selected indicator  (e.g. for <see cref="ListView"/> and <see cref="RadioGroup"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Selected { get; set; } = (Rune)'◉';
 
     /// <summary>Not Selected indicator (e.g. for <see cref="ListView"/> and <see cref="RadioGroup"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune UnSelected { get; set; } = (Rune)'○';
 
     /// <summary>Horizontal arrow.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune RightArrow { get; set; } = (Rune)'►';
 
     /// <summary>Left arrow.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune LeftArrow { get; set; } = (Rune)'◄';
 
     /// <summary>Down arrow.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune DownArrow { get; set; } = (Rune)'▼';
 
     /// <summary>Vertical arrow.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune UpArrow { get; set; } = (Rune)'▲';
 
     /// <summary>Left default indicator (e.g. for <see cref="Button"/>.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune LeftDefaultIndicator { get; set; } = (Rune)'►';
 
     /// <summary>Horizontal default indicator (e.g. for <see cref="Button"/>.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune RightDefaultIndicator { get; set; } = (Rune)'◄';
 
     /// <summary>Left Bracket (e.g. for <see cref="Button"/>. Default is (U+005B) - [.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune LeftBracket { get; set; } = (Rune)'⟦';
 
     /// <summary>Horizontal Bracket (e.g. for <see cref="Button"/>. Default is (U+005D) - ].</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune RightBracket { get; set; } = (Rune)'⟧';
 
     /// <summary>Half block meter segment (e.g. for <see cref="ProgressBar"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune BlocksMeterSegment { get; set; } = (Rune)'▌';
 
     /// <summary>Continuous block meter segment (e.g. for <see cref="ProgressBar"/>).</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune ContinuousMeterSegment { get; set; } = (Rune)'█';
 
     /// <summary>Stipple pattern (e.g. for <see cref="ScrollBar"/>). Default is Light Shade (U+2591) - ░.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Stipple { get; set; } = (Rune)'░';
 
     /// <summary>Diamond. Default is Lozenge (U+25CA) - ◊.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Diamond { get; set; } = (Rune)'◊';
 
     /// <summary>Close. Default is Heavy Ballot X (U+2718) - ✘.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Close { get; set; } = (Rune)'✘';
 
     /// <summary>Minimize. Default is Lower Horizontal Shadowed White Circle (U+274F) - ❏.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Minimize { get; set; } = (Rune)'❏';
 
     /// <summary>Maximize. Default is Upper Horizontal Shadowed White Circle (U+273D) - ✽.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Maximize { get; set; } = (Rune)'✽';
 
     /// <summary>Dot. Default is (U+2219) - ∙.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Dot { get; set; } = (Rune)'∙';
 
     /// <summary>Dotted Square - ⬚ U+02b1a┝</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune DottedSquare { get; set; } = (Rune)'⬚';
 
     /// <summary>Black Circle . Default is (U+025cf) - ●.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune BlackCircle { get; set; } = (Rune)'●'; // Black Circle - ● U+025cf
 
     /// <summary>Expand (e.g. for <see cref="TreeView"/>.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Expand { get; set; } = (Rune)'+';
 
     /// <summary>Expand (e.g. for <see cref="TreeView"/>.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Collapse { get; set; } = (Rune)'-';
 
     /// <summary>Identical To (U+226)</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune IdenticalTo { get; set; } = (Rune)'≡';
 
     /// <summary>Move indicator. Default is Lozenge (U+25CA) - ◊.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Move { get; set; } = (Rune)'◊';
 
     /// <summary>Size Horizontally indicator. Default is ┥Left Right Arrow - ↔ U+02194</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeHorizontal { get; set; } = (Rune)'↔';
 
     /// <summary>Size Vertical indicator. Default Up Down Arrow - ↕ U+02195</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeVertical { get; set; } = (Rune)'↕';
 
     /// <summary>Size Top Left indicator. North West Arrow - ↖ U+02196</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeTopLeft { get; set; } = (Rune)'↖';
 
     /// <summary>Size Top Right indicator. North East Arrow - ↗ U+02197</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeTopRight { get; set; } = (Rune)'↗';
 
     /// <summary>Size Bottom Right indicator. South East Arrow - ↘ U+02198</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeBottomRight { get; set; } = (Rune)'↘';
 
     /// <summary>Size Bottom Left indicator. South West Arrow - ↙ U+02199</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune SizeBottomLeft { get; set; } = (Rune)'↙';
 
     /// <summary>Apple (non-BMP). Because snek. And because it's an example of a non-BMP surrogate pair. See Issue #2610.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune Apple { get; set; } = "🍎".ToRunes () [0]; // nonBMP
 
     /// <summary>Apple (BMP). Because snek. See Issue #2610.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune AppleBMP { get; set; } = (Rune)'❦';
 
     #endregion
@@ -189,342 +189,342 @@ public class Glyphs
     #region ----------------- Lines -----------------
 
     /// <summary>Box Drawings Horizontal Line - Light (U+2500) - ─</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune HLine { get; set; } = (Rune)'─';
 
     /// <summary>Box Drawings Vertical Line - Light (U+2502) - │</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune VLine { get; set; } = (Rune)'│';
 
     /// <summary>Box Drawings Double Horizontal (U+2550) - ═</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune HLineDbl { get; set; } = (Rune)'═';
 
     /// <summary>Box Drawings Double Vertical (U+2551) - ║</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDbl { get; set; } = (Rune)'║';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDbl { get; set; } = (Rune)'║';
 
     /// <summary>Box Drawings Heavy Double Dash Horizontal (U+254D) - ╍</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa2 { get; set; } = (Rune)'╍';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa2 { get; set; } = (Rune)'╍';
 
     /// <summary>Box Drawings Heavy Triple Dash Vertical (U+2507) - ┇</summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static Rune VLineHvDa3 { get; set; } = (Rune)'┇';
 
     /// <summary>Box Drawings Heavy Triple Dash Horizontal (U+2505) - ┅</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa3 { get; set; } = (Rune)'┅';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa3 { get; set; } = (Rune)'┅';
 
     /// <summary>Box Drawings Heavy Quadruple Dash Horizontal (U+2509) - ┉</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa4 { get; set; } = (Rune)'┉';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHvDa4 { get; set; } = (Rune)'┉';
 
     /// <summary>Box Drawings Heavy Double Dash Vertical (U+254F) - ╏</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHvDa2 { get; set; } = (Rune)'╏';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHvDa2 { get; set; } = (Rune)'╏';
 
     /// <summary>Box Drawings Heavy Quadruple Dash Vertical (U+250B) - ┋</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHvDa4 { get; set; } = (Rune)'┋';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHvDa4 { get; set; } = (Rune)'┋';
 
     /// <summary>Box Drawings Light Double Dash Horizontal (U+254C) - ╌</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa2 { get; set; } = (Rune)'╌';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa2 { get; set; } = (Rune)'╌';
 
     /// <summary>Box Drawings Light Triple Dash Vertical (U+2506) - ┆</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa3 { get; set; } = (Rune)'┆';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa3 { get; set; } = (Rune)'┆';
 
     /// <summary>Box Drawings Light Triple Dash Horizontal (U+2504) - ┄</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa3 { get; set; } = (Rune)'┄';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa3 { get; set; } = (Rune)'┄';
 
     /// <summary>Box Drawings Light Quadruple Dash Horizontal (U+2508) - ┈</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa4 { get; set; } = (Rune)'┈';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineDa4 { get; set; } = (Rune)'┈';
 
     /// <summary>Box Drawings Light Double Dash Vertical (U+254E) - ╎</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa2 { get; set; } = (Rune)'╎';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa2 { get; set; } = (Rune)'╎';
 
     /// <summary>Box Drawings Light Quadruple Dash Vertical (U+250A) - ┊</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa4 { get; set; } = (Rune)'┊';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineDa4 { get; set; } = (Rune)'┊';
 
     /// <summary>Box Drawings Heavy Horizontal (U+2501) - ━</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHv { get; set; } = (Rune)'━';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HLineHv { get; set; } = (Rune)'━';
 
     /// <summary>Box Drawings Heavy Vertical (U+2503) - ┃</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHv { get; set; } = (Rune)'┃';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune VLineHv { get; set; } = (Rune)'┃';
 
     /// <summary>Box Drawings Light Left (U+2574) - ╴</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfLeftLine { get; set; } = (Rune)'╴';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfLeftLine { get; set; } = (Rune)'╴';
 
     /// <summary>Box Drawings Light Vertical (U+2575) - ╵</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfTopLine { get; set; } = (Rune)'╵';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfTopLine { get; set; } = (Rune)'╵';
 
     /// <summary>Box Drawings Light Horizontal (U+2576) - ╶</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfRightLine { get; set; } = (Rune)'╶';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfRightLine { get; set; } = (Rune)'╶';
 
     /// <summary>Box Drawings Light Down (U+2577) - ╷</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfBottomLine { get; set; } = (Rune)'╷';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfBottomLine { get; set; } = (Rune)'╷';
 
     /// <summary>Box Drawings Heavy Left (U+2578) - ╸</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfLeftLineHv { get; set; } = (Rune)'╸';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfLeftLineHv { get; set; } = (Rune)'╸';
 
     /// <summary>Box Drawings Heavy Vertical (U+2579) - ╹</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfTopLineHv { get; set; } = (Rune)'╹';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfTopLineHv { get; set; } = (Rune)'╹';
 
     /// <summary>Box Drawings Heavy Horizontal (U+257A) - ╺</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfRightLineHv { get; set; } = (Rune)'╺';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfRightLineHv { get; set; } = (Rune)'╺';
 
     /// <summary>Box Drawings Light Vertical and Horizontal (U+257B) - ╻</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfBottomLineLt { get; set; } = (Rune)'╻';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune HalfBottomLineLt { get; set; } = (Rune)'╻';
 
     /// <summary>Box Drawings Light Horizontal and Heavy Horizontal (U+257C) - ╼</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightSideLineLtHv { get; set; } = (Rune)'╼';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightSideLineLtHv { get; set; } = (Rune)'╼';
 
     /// <summary>Box Drawings Light Vertical and Heavy Horizontal (U+257D) - ╽</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomSideLineLtHv { get; set; } = (Rune)'╽';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomSideLineLtHv { get; set; } = (Rune)'╽';
 
     /// <summary>Box Drawings Heavy Left and Light Horizontal (U+257E) - ╾</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftSideLineHvLt { get; set; } = (Rune)'╾';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftSideLineHvLt { get; set; } = (Rune)'╾';
 
     /// <summary>Box Drawings Heavy Vertical and Light Horizontal (U+257F) - ╿</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopSideLineHvLt { get; set; } = (Rune)'╿';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopSideLineHvLt { get; set; } = (Rune)'╿';
 
     #endregion
 
     #region ----------------- Upper Left Corners -----------------
 
     /// <summary>Box Drawings Upper Left Corner - Light Vertical and Light Horizontal (U+250C) - ┌</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCorner { get; set; } = (Rune)'┌';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCorner { get; set; } = (Rune)'┌';
 
     /// <summary>Box Drawings Upper Left Corner -  Double (U+2554) - ╔</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerDbl { get; set; } = (Rune)'╔';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerDbl { get; set; } = (Rune)'╔';
 
     /// <summary>Box Drawings Upper Left Corner - Light Arc Down and Horizontal (U+256D) - ╭</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerR { get; set; } = (Rune)'╭';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerR { get; set; } = (Rune)'╭';
 
     /// <summary>Box Drawings Heavy Down and Horizontal (U+250F) - ┏</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerHv { get; set; } = (Rune)'┏';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerHv { get; set; } = (Rune)'┏';
 
     /// <summary>Box Drawings Down Heavy and Horizontal Light (U+251E) - ┎</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerHvLt { get; set; } = (Rune)'┎';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerHvLt { get; set; } = (Rune)'┎';
 
     /// <summary>Box Drawings Down Light and Horizontal Heavy (U+250D) - ┎</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerLtHv { get; set; } = (Rune)'┍';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerLtHv { get; set; } = (Rune)'┍';
 
     /// <summary>Box Drawings Double Down and Single Horizontal (U+2553) - ╓</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerDblSingle { get; set; } = (Rune)'╓';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerDblSingle { get; set; } = (Rune)'╓';
 
     /// <summary>Box Drawings Single Down and Double Horizontal (U+2552) - ╒</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerSingleDbl { get; set; } = (Rune)'╒';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ULCornerSingleDbl { get; set; } = (Rune)'╒';
 
     #endregion
 
     #region ----------------- Lower Left Corners -----------------
 
     /// <summary>Box Drawings Lower Left Corner - Light Vertical and Light Horizontal (U+2514) - └</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCorner { get; set; } = (Rune)'└';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCorner { get; set; } = (Rune)'└';
 
     /// <summary>Box Drawings Heavy Vertical and Horizontal (U+2517) - ┗</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerHv { get; set; } = (Rune)'┗';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerHv { get; set; } = (Rune)'┗';
 
     /// <summary>Box Drawings Heavy Vertical and Horizontal Light (U+2516) - ┖</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerHvLt { get; set; } = (Rune)'┖';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerHvLt { get; set; } = (Rune)'┖';
 
     /// <summary>Box Drawings Vertical Light and Horizontal Heavy (U+2511) - ┕</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerLtHv { get; set; } = (Rune)'┕';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerLtHv { get; set; } = (Rune)'┕';
 
     /// <summary>Box Drawings Double Vertical and Double Left (U+255A) - ╚</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerDbl { get; set; } = (Rune)'╚';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerDbl { get; set; } = (Rune)'╚';
 
     /// <summary>Box Drawings Single Vertical and Double Left (U+2558) - ╘</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerSingleDbl { get; set; } = (Rune)'╘';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerSingleDbl { get; set; } = (Rune)'╘';
 
     /// <summary>Box Drawings Double Down and Single Left (U+2559) - ╙</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerDblSingle { get; set; } = (Rune)'╙';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerDblSingle { get; set; } = (Rune)'╙';
 
     /// <summary>Box Drawings Upper Left Corner - Light Arc Down and Left (U+2570) - ╰</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerR { get; set; } = (Rune)'╰';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LLCornerR { get; set; } = (Rune)'╰';
 
     #endregion
 
     #region ----------------- Upper Right Corners -----------------
 
     /// <summary>Box Drawings Upper Horizontal Corner - Light Vertical and Light Horizontal (U+2510) - ┐</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCorner { get; set; } = (Rune)'┐';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCorner { get; set; } = (Rune)'┐';
 
     /// <summary>Box Drawings Upper Horizontal Corner - Double Vertical and Double Horizontal (U+2557) - ╗</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerDbl { get; set; } = (Rune)'╗';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerDbl { get; set; } = (Rune)'╗';
 
     /// <summary>Box Drawings Upper Horizontal Corner - Light Arc Vertical and Horizontal (U+256E) - ╮</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerR { get; set; } = (Rune)'╮';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerR { get; set; } = (Rune)'╮';
 
     /// <summary>Box Drawings Heavy Down and Left (U+2513) - ┓</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerHv { get; set; } = (Rune)'┓';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerHv { get; set; } = (Rune)'┓';
 
     /// <summary>Box Drawings Heavy Vertical and Left Down Light (U+2511) - ┑</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerHvLt { get; set; } = (Rune)'┑';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerHvLt { get; set; } = (Rune)'┑';
 
     /// <summary>Box Drawings Down Light and Horizontal Heavy (U+2514) - ┒</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerLtHv { get; set; } = (Rune)'┒';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerLtHv { get; set; } = (Rune)'┒';
 
     /// <summary>Box Drawings Double Vertical and Single Left (U+2556) - ╖</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerDblSingle { get; set; } = (Rune)'╖';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerDblSingle { get; set; } = (Rune)'╖';
 
     /// <summary>Box Drawings Single Vertical and Double Left (U+2555) - ╕</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerSingleDbl { get; set; } = (Rune)'╕';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune URCornerSingleDbl { get; set; } = (Rune)'╕';
 
     #endregion
 
     #region ----------------- Lower Right Corners -----------------
 
     /// <summary>Box Drawings Lower Right Corner - Light (U+2518) - ┘</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCorner { get; set; } = (Rune)'┘';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCorner { get; set; } = (Rune)'┘';
 
     /// <summary>Box Drawings Lower Right Corner - Double (U+255D) - ╝</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerDbl { get; set; } = (Rune)'╝';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerDbl { get; set; } = (Rune)'╝';
 
     /// <summary>Box Drawings Lower Right Corner - Rounded (U+256F) - ╯</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerR { get; set; } = (Rune)'╯';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerR { get; set; } = (Rune)'╯';
 
     /// <summary>Box Drawings Lower Right Corner - Heavy (U+251B) - ┛</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerHv { get; set; } = (Rune)'┛';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerHv { get; set; } = (Rune)'┛';
 
     /// <summary>Box Drawings Lower Right Corner - Double Vertical and Single Horizontal (U+255C) - ╜</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerDblSingle { get; set; } = (Rune)'╜';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerDblSingle { get; set; } = (Rune)'╜';
 
     /// <summary>Box Drawings Lower Right Corner - Single Vertical and Double Horizontal (U+255B) - ╛</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerSingleDbl { get; set; } = (Rune)'╛';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerSingleDbl { get; set; } = (Rune)'╛';
 
     /// <summary>Box Drawings Lower Right Corner - Light Vertical and Heavy Horizontal (U+2519) - ┙</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerLtHv { get; set; } = (Rune)'┙';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerLtHv { get; set; } = (Rune)'┙';
 
     /// <summary>Box Drawings Lower Right Corner - Heavy Vertical and Light Horizontal (U+251A) - ┚</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerHvLt { get; set; } = (Rune)'┚';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LRCornerHvLt { get; set; } = (Rune)'┚';
 
     #endregion
 
     #region ----------------- Tees -----------------
 
     /// <summary>Box Drawings Left Tee - Single Vertical and Single Horizontal (U+251C) - ├</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTee { get; set; } = (Rune)'├';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTee { get; set; } = (Rune)'├';
 
     /// <summary>Box Drawings Left Tee - Single Vertical and Double Horizontal (U+255E) - ╞</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDblH { get; set; } = (Rune)'╞';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDblH { get; set; } = (Rune)'╞';
 
     /// <summary>Box Drawings Left Tee - Double Vertical and Single Horizontal (U+255F) - ╟</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDblV { get; set; } = (Rune)'╟';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDblV { get; set; } = (Rune)'╟';
 
     /// <summary>Box Drawings Left Tee - Double Vertical and Double Horizontal (U+2560) - ╠</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDbl { get; set; } = (Rune)'╠';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeDbl { get; set; } = (Rune)'╠';
 
     /// <summary>Box Drawings Left Tee - Heavy Horizontal and Light Vertical (U+2523) - ┝</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvH { get; set; } = (Rune)'┝';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvH { get; set; } = (Rune)'┝';
 
     /// <summary>Box Drawings Left Tee - Light Horizontal and Heavy Vertical (U+252B) - ┠</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvV { get; set; } = (Rune)'┠';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvV { get; set; } = (Rune)'┠';
 
     /// <summary>Box Drawings Left Tee - Heavy Vertical and Heavy Horizontal (U+2527) - ┣</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvDblH { get; set; } = (Rune)'┣';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune LeftTeeHvDblH { get; set; } = (Rune)'┣';
 
     /// <summary>Box Drawings Right Tee - Single Vertical and Single Horizontal (U+2524) - ┤</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTee { get; set; } = (Rune)'┤';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTee { get; set; } = (Rune)'┤';
 
     /// <summary>Box Drawings Right Tee - Single Vertical and Double Horizontal (U+2561) - ╡</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDblH { get; set; } = (Rune)'╡';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDblH { get; set; } = (Rune)'╡';
 
     /// <summary>Box Drawings Right Tee - Double Vertical and Single Horizontal (U+2562) - ╢</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDblV { get; set; } = (Rune)'╢';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDblV { get; set; } = (Rune)'╢';
 
     /// <summary>Box Drawings Right Tee - Double Vertical and Double Horizontal (U+2563) - ╣</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDbl { get; set; } = (Rune)'╣';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeDbl { get; set; } = (Rune)'╣';
 
     /// <summary>Box Drawings Right Tee - Heavy Horizontal and Light Vertical (U+2528) - ┥</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvH { get; set; } = (Rune)'┥';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvH { get; set; } = (Rune)'┥';
 
     /// <summary>Box Drawings Right Tee - Light Horizontal and Heavy Vertical (U+2530) - ┨</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvV { get; set; } = (Rune)'┨';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvV { get; set; } = (Rune)'┨';
 
     /// <summary>Box Drawings Right Tee - Heavy Vertical and Heavy Horizontal (U+252C) - ┫</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvDblH { get; set; } = (Rune)'┫';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune RightTeeHvDblH { get; set; } = (Rune)'┫';
 
     /// <summary>Box Drawings Top Tee - Single Vertical and Single Horizontal (U+252C) - ┬</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTee { get; set; } = (Rune)'┬';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTee { get; set; } = (Rune)'┬';
 
     /// <summary>Box Drawings Top Tee - Single Vertical and Double Horizontal (U+2564) - ╤</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDblH { get; set; } = (Rune)'╤';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDblH { get; set; } = (Rune)'╤';
 
     /// <summary>Box Drawings Top Tee - Double Vertical and Single Horizontal  (U+2565) - ╥</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDblV { get; set; } = (Rune)'╥';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDblV { get; set; } = (Rune)'╥';
 
     /// <summary>Box Drawings Top Tee - Double Vertical and Double Horizontal (U+2566) - ╦</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDbl { get; set; } = (Rune)'╦';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeDbl { get; set; } = (Rune)'╦';
 
     /// <summary>Box Drawings Top Tee - Heavy Horizontal and Light Vertical (U+252F) - ┯</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvH { get; set; } = (Rune)'┯';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvH { get; set; } = (Rune)'┯';
 
     /// <summary>Box Drawings Top Tee - Light Horizontal and Heavy Vertical (U+2537) - ┰</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvV { get; set; } = (Rune)'┰';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvV { get; set; } = (Rune)'┰';
 
     /// <summary>Box Drawings Top Tee - Heavy Vertical and Heavy Horizontal (U+2533) - ┳</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvDblH { get; set; } = (Rune)'┳';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune TopTeeHvDblH { get; set; } = (Rune)'┳';
 
     /// <summary>Box Drawings Bottom Tee - Single Vertical and Single Horizontal (U+2534) - ┴</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTee { get; set; } = (Rune)'┴';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTee { get; set; } = (Rune)'┴';
 
     /// <summary>Box Drawings Bottom Tee - Single Vertical and Double Horizontal (U+2567) - ╧</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDblH { get; set; } = (Rune)'╧';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDblH { get; set; } = (Rune)'╧';
 
     /// <summary>Box Drawings Bottom Tee - Double Vertical and Single Horizontal (U+2568) - ╨</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDblV { get; set; } = (Rune)'╨';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDblV { get; set; } = (Rune)'╨';
 
     /// <summary>Box Drawings Bottom Tee - Double Vertical and Double Horizontal (U+2569) - ╩</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDbl { get; set; } = (Rune)'╩';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeDbl { get; set; } = (Rune)'╩';
 
     /// <summary>Box Drawings Bottom Tee - Heavy Horizontal and Light Vertical (U+2535) - ┷</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvH { get; set; } = (Rune)'┷';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvH { get; set; } = (Rune)'┷';
 
     /// <summary>Box Drawings Bottom Tee - Light Horizontal and Heavy Vertical (U+253D) - ┸</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvV { get; set; } = (Rune)'┸';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvV { get; set; } = (Rune)'┸';
 
     /// <summary>Box Drawings Bottom Tee - Heavy Vertical and Heavy Horizontal (U+2539) - ┻</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvDblH { get; set; } = (Rune)'┻';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune BottomTeeHvDblH { get; set; } = (Rune)'┻';
 
     #endregion
 
     #region ----------------- Crosses -----------------
 
     /// <summary>Box Drawings Cross - Single Vertical and Single Horizontal (U+253C) - ┼</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune Cross { get; set; } = (Rune)'┼';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune Cross { get; set; } = (Rune)'┼';
 
     /// <summary>Box Drawings Cross - Single Vertical and Double Horizontal (U+256A) - ╪</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDblH { get; set; } = (Rune)'╪';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDblH { get; set; } = (Rune)'╪';
 
     /// <summary>Box Drawings Cross - Double Vertical and Single Horizontal (U+256B) - ╫</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDblV { get; set; } = (Rune)'╫';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDblV { get; set; } = (Rune)'╫';
 
     /// <summary>Box Drawings Cross - Double Vertical and Double Horizontal (U+256C) - ╬</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDbl { get; set; } = (Rune)'╬';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossDbl { get; set; } = (Rune)'╬';
 
     /// <summary>Box Drawings Cross - Heavy Horizontal and Light Vertical (U+253F) - ┿</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHvH { get; set; } = (Rune)'┿';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHvH { get; set; } = (Rune)'┿';
 
     /// <summary>Box Drawings Cross - Light Horizontal and Heavy Vertical (U+2541) - ╂</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHvV { get; set; } = (Rune)'╂';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHvV { get; set; } = (Rune)'╂';
 
     /// <summary>Box Drawings Cross - Heavy Vertical and Heavy Horizontal (U+254B) - ╋</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHv { get; set; } = (Rune)'╋';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune CrossHv { get; set; } = (Rune)'╋';
 
     #endregion
 
     #region ----------------- ShadowStyle -----------------
 
     /// <summary>Shadow - Vertical Start - Left Half Block - ▌ U+0258c</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowVerticalStart { get; set; } = (Rune)'▖'; // Half: '\u2596'  ▖;
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowVerticalStart { get; set; } = (Rune)'▖'; // Half: '\u2596'  ▖;
 
     /// <summary>Shadow - Vertical - Left Half Block - ▌ U+0258c</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowVertical { get; set; } = (Rune)'▌';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowVertical { get; set; } = (Rune)'▌';
 
     /// <summary>Shadow - Horizontal Start - Upper Half Block - ▀ U+02580</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontalStart { get; set; } = (Rune)'▝'; // Half: ▝ U+0259d;
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontalStart { get; set; } = (Rune)'▝'; // Half: ▝ U+0259d;
 
     /// <summary>Shadow - Horizontal - Upper Half Block - ▀ U+02580</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontal { get; set; } = (Rune)'▀';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontal { get; set; } = (Rune)'▀';
 
     /// <summary>Shadow - Horizontal End - Quadrant Upper Left - ▘ U+02598</summary>
-    [SerializableConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontalEnd { get; set; } = (Rune)'▘';
+    [ConfigurationProperty(Scope = typeof(ThemeScope))] public static Rune ShadowHorizontalEnd { get; set; } = (Rune)'▘';
 
     #endregion
 }
diff --git a/Terminal.Gui/Drawing/LineCanvas/LineCanvas.cs b/Terminal.Gui/Drawing/LineCanvas/LineCanvas.cs
index 47f08c4ae0..7a7b8e3098 100644
--- a/Terminal.Gui/Drawing/LineCanvas/LineCanvas.cs
+++ b/Terminal.Gui/Drawing/LineCanvas/LineCanvas.cs
@@ -13,7 +13,7 @@ public LineCanvas ()
         // TODO: Refactor ConfigurationManager to not use an event handler for this.
         // Instead, have it call a method on any class appropriately attributed
         // to update the cached values. See Issue #2871
-        Applied += ConfigurationManager_Applied;
+        ConfigurationManager.Applied += ConfigurationManager_Applied;
     }
 
     private readonly List<StraightLine> _lines = [];
@@ -963,7 +963,7 @@ public override void SetGlyphs ()
     /// <inheritdoc/>
     public void Dispose ()
     {
-        Applied -= ConfigurationManager_Applied;
+        ConfigurationManager.Applied -= ConfigurationManager_Applied;
         GC.SuppressFinalize (this);
     }
 }
diff --git a/Terminal.Gui/Drawing/Scheme.cs b/Terminal.Gui/Drawing/Scheme.cs
new file mode 100644
index 0000000000..a01149be4f
--- /dev/null
+++ b/Terminal.Gui/Drawing/Scheme.cs
@@ -0,0 +1,577 @@
+#nullable enable
+using System.Collections.Immutable;
+using System.Numerics;
+using System.Text.Json.Serialization;
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     Represents a theme definition that maps each <see cref="VisualRole"/> (such as <see cref="VisualRole.Focus"/>,
+///     <see cref="VisualRole.Disabled"/>, etc.)
+///     to an <see cref="Attribute"/> describing its foreground color, background color, and text style.
+///     <para>
+///         A <see cref="Scheme"/> enables consistent, semantic theming of UI elements by associating each visual state
+///         with a specific style.
+///         Each property (e.g., <see cref="Normal"/>, <see cref="Focus"/>, <see cref="Disabled"/>) is an
+///         <see cref="Attribute"/>.
+///         If a property is not explicitly set, its value is derived from other roles (typically <see cref="Normal"/>)
+///         using well-defined inheritance rules.
+///     </para>
+///     <para>
+///         <see cref="Scheme"/> objects are immutable. To update a scheme, create a new instance with the desired values.
+///         Use <see cref="SchemeManager"/> to manage available schemes and apply them to views.
+///     </para>
+///     <para>
+///         See <see href="https://gui-cs.github.io/Terminal.GuiV2Docs/docs/drawing.html"/> for more information.
+///     </para>
+/// </summary>
+/// <remarks>
+///     <para>
+///         <b>Immutability:</b> Scheme objects are immutable. Once constructed, their properties cannot be changed. To
+///         modify a Scheme,
+///         create a new instance with the desired values (e.g., using the <see cref="Scheme(Scheme)"/> constructor).
+///     </para>
+///     <para>
+///         <b>Attribute Resolution Algorithm:</b>
+///         <br/>
+///         Each <see cref="Scheme"/> property corresponds to a <see cref="VisualRole"/> and is an <see cref="Attribute"/>.
+///         The <see cref="Normal"/> attribute must always be set.
+///         All other attributes are optional. If an attribute for a given <see cref="VisualRole"/> is not explicitly set,
+///         its value is derived using the following rules:
+///         <list type="number">
+///             <item>
+///                 <description><b>Normal:</b> Must always be explicitly set.</description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>Focus:</b> If not set, derived from <see cref="Normal"/> by swapping foreground and background
+///                     colors.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>Active:</b> If not set, derived from <see cref="Focus"/> by:
+///                     <list type="bullet">
+///                         <item>
+///                             <description>
+///                                 Setting <c>Foreground</c> to <see cref="Focus"/>'s foreground with
+///                                 <c>GetHighlightColor()</c>.
+///                             </description>
+///                         </item>
+///                         <item>
+///                             <description>
+///                                 Setting <c>Background</c> to <see cref="Focus"/>'s background with
+///                                 <c>GetDimColor()</c>.
+///                             </description>
+///                         </item>
+///                         <item>
+///                             <description>Adding <see cref="TextStyle.Bold"/> to the style.</description>
+///                         </item>
+///                     </list>
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>Highlight:</b> If not set, derived from <see cref="Normal"/> by:
+///                     <list type="bullet">
+///                         <item>
+///                             <description>
+///                                 Setting <c>Foreground</c> to <see cref="Normal"/>'s background with
+///                                 <c>GetHighlightColor()</c>.
+///                             </description>
+///                         </item>
+///                         <item>
+///                             <description>Setting <c>Background</c> to <see cref="Normal"/>'s background.</description>
+///                         </item>
+///                         <item>
+///                             <description>
+///                                 Setting <c>Style</c> to <see cref="Editable"/>'s style with
+///                                 <see cref="TextStyle.Italic"/> added.
+///                             </description>
+///                         </item>
+///                     </list>
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>Editable:</b> If not set, derived from <see cref="Normal"/> by:
+///                     <list type="bullet">
+///                         <item>
+///                             <description>
+///                                 Setting <c>Foreground</c> to <see cref="Normal"/>'s background with
+///                                 <c>GetHighlightColor()</c>.
+///                             </description>
+///                         </item>
+///                         <item>
+///                             <description>
+///                                 Setting <c>Background</c> to <see cref="Normal"/>'s background with
+///                                 <c>GetDimColor()</c>.
+///                             </description>
+///                         </item>
+///                     </list>
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>ReadOnly:</b> If not set, derived from <see cref="Editable"/> by adding
+///                     <see cref="TextStyle.Faint"/> to the style.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>Disabled:</b> If not set, derived from <see cref="Normal"/> by adding
+///                     <see cref="TextStyle.Faint"/> to the style.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>HotNormal:</b> If not set, derived from <see cref="Normal"/> by adding
+///                     <see cref="TextStyle.Underline"/> to the style.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>HotFocus:</b> If not set, derived from <see cref="Focus"/> by adding
+///                     <see cref="TextStyle.Underline"/> to the style.
+///                 </description>
+///             </item>
+///             <item>
+///                 <description>
+///                     <b>HotActive:</b> If not set, derived from <see cref="Active"/> by adding
+///                     <see cref="TextStyle.Underline"/> to the style.
+///                 </description>
+///             </item>
+///         </list>
+///         This algorithm ensures that every <see cref="VisualRole"/> always resolves to a valid <see cref="Attribute"/>,
+///         either explicitly set or derived.
+///     </para>
+/// </remarks>
+[JsonConverter (typeof (SchemeJsonConverter))]
+public record Scheme : IEqualityOperators<Scheme, Scheme, bool>
+{
+    /// <summary>
+    ///     INTERNAL: Gets the hard-coded set of <see cref="Scheme"/>s. Used for generating the built-in config.json and for
+    ///     unit tests that don't depend on ConfigurationManager.
+    /// </summary>
+    /// <returns></returns>
+    internal static ImmutableSortedDictionary<string, Scheme> GetHardCodedSchemes ()
+    {
+        return ImmutableSortedDictionary.CreateRange (
+                                                      StringComparer.InvariantCultureIgnoreCase,
+                                                      [
+                                                          new KeyValuePair<string, Scheme> (SchemeManager.SchemesToSchemeName (Schemes.Base)!, CreateBase ()),
+                                                          new (SchemeManager.SchemesToSchemeName (Schemes.Dialog)!, CreateDialog ()),
+                                                          new (SchemeManager.SchemesToSchemeName (Schemes.Error)!, CreateError ()),
+                                                          new (SchemeManager.SchemesToSchemeName (Schemes.Menu)!, CreateMenu ()),
+                                                          new (SchemeManager.SchemesToSchemeName (Schemes.Toplevel)!, CreateToplevel ()),
+                                                      ]
+                                                     );
+
+        Scheme CreateBase ()
+        {
+            return new ()
+            {
+                Normal = new (StandardColor.LightBlue, StandardColor.RaisinBlack)
+            };
+        }
+
+        Scheme CreateError ()
+        {
+            return new ()
+            {
+                Normal = new (StandardColor.IndianRed, StandardColor.RaisinBlack)
+            };
+        }
+
+        Scheme CreateDialog ()
+        {
+            return new ()
+            {
+                Normal = new (StandardColor.LightSkyBlue, StandardColor.OuterSpace)
+            };
+        }
+
+        Scheme CreateMenu ()
+        {
+            return new ()
+            {
+                Normal = new (StandardColor.Charcoal, StandardColor.LightBlue, TextStyle.Bold)
+            };
+        }
+
+        Scheme CreateToplevel ()
+        {
+            return new ()
+            {
+                Normal = new (StandardColor.CadetBlue, StandardColor.Charcoal)
+            };
+        }
+
+    }
+
+    /// <summary>Creates a new instance set to the default attributes (see <see cref="Attribute.Default"/>).</summary>
+    public Scheme () : this (Attribute.Default) { }
+
+    /// <summary>Creates a new instance, initialized with the values from <paramref name="scheme"/>.</summary>
+    /// <param name="scheme">The scheme to initialize the new instance with.</param>
+    public Scheme (Scheme? scheme)
+    {
+        ArgumentNullException.ThrowIfNull (scheme);
+
+        Normal = scheme.Normal;
+
+        _hotNormal = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out Attribute? hotNormal) ? hotNormal : null;
+        _focus = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out Attribute? focus) ? focus : null;
+        _hotFocus = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out Attribute? hotFocus) ? hotFocus : null;
+        _active = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out Attribute? active) ? active : null;
+        _hotActive = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out Attribute? hotActive) ? hotActive : null;
+        _highlight = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out Attribute? highlight) ? highlight : null;
+        _editable = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out Attribute? editable) ? editable : null;
+        _readOnly = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out Attribute? readOnly) ? readOnly : null;
+        _disabled = scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out Attribute? disabled) ? disabled : null;
+    }
+
+    /// <summary>Creates a new instance, initialized with the values from <paramref name="attribute"/>.</summary>
+    /// <param name="attribute">The attribute to initialize the new instance with.</param>
+    public Scheme (Attribute attribute)
+    {
+        // Only set Normal as explicitly set
+        Normal = attribute;
+    }
+
+    /// <summary>
+    ///     Gets the <see cref="Attribute"/> associated with a specified <see cref="VisualRole"/>,
+    ///     applying inheritance rules for attributes not explicitly set.
+    /// </summary>
+    /// <param name="role">The semantic <see cref="VisualRole"/> describing the element being rendered.</param>
+    /// <returns>
+    ///     The corresponding <see cref="Attribute"/> from the <see cref="Scheme"/>, possibly derived if not explicitly
+    ///     set.
+    /// </returns>
+    public Attribute GetAttributeForRole (VisualRole role)
+    {
+        // Use a HashSet to guard against recursion cycles
+        return GetAttributeForRoleCore (role, []);
+    }
+
+    /// <summary>
+    ///     Attempts to get the <see cref="Attribute"/> associated with a specified <see cref="VisualRole"/>. If the
+    ///     role is not explicitly set, it will return false and the out parameter will be null.
+    /// </summary>
+    /// <param name="role"></param>
+    /// <param name="attribute"></param>
+    /// <returns></returns>
+    public bool TryGetExplicitlySetAttributeForRole (VisualRole role, out Attribute? attribute)
+    {
+        // Use a HashSet to guard against recursion cycles
+        attribute = role switch
+                    {
+                        VisualRole.Normal => _normal,
+                        VisualRole.HotNormal => _hotNormal,
+                        VisualRole.Focus => _focus,
+                        VisualRole.HotFocus => _hotFocus,
+                        VisualRole.Active => _active,
+                        VisualRole.HotActive => _hotActive,
+                        VisualRole.Highlight => _highlight,
+                        VisualRole.Editable => _editable,
+                        VisualRole.ReadOnly => _readOnly,
+                        VisualRole.Disabled => _disabled,
+                        _ => null
+                    };
+
+        return attribute is { };
+    }
+
+    // TODO: Provide a CWP-based API that lets devs override this algo?
+
+    private Attribute GetAttributeForRoleCore (VisualRole role, HashSet<VisualRole> stack)
+    {
+        // Prevent infinite recursion
+        if (!stack.Add (role))
+        {
+            return Normal; // fallback
+        }
+
+        Attribute? attr = Normal;
+        if (role == VisualRole.Normal || TryGetExplicitlySetAttributeForRole (role, out attr))
+        {
+            return attr!.Value;
+        }
+
+        // TODO: Provide an API that lets devs override this algo?
+
+        // Derivation algorithm as documented
+        Attribute result = role switch
+                           {
+                               VisualRole.Focus =>
+                                   GetAttributeForRoleCore (VisualRole.Normal, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Normal, stack).Background,
+                                       Background = GetAttributeForRoleCore (VisualRole.Normal, stack).Foreground
+                                   },
+
+                               VisualRole.Active =>
+                                   GetAttributeForRoleCore (VisualRole.Focus, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Focus, stack).Foreground.GetBrighterColor (),
+                                       Background = GetAttributeForRoleCore (VisualRole.Focus, stack).Background.GetDimColor (),
+                                       Style = GetAttributeForRoleCore (VisualRole.Focus, stack).Style | TextStyle.Bold
+                                   },
+
+                               VisualRole.Highlight =>
+                                   GetAttributeForRoleCore (VisualRole.Normal, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Normal, stack).Background.GetBrighterColor (),
+                                       Background = GetAttributeForRoleCore (VisualRole.Normal, stack).Background,
+                                       Style = GetAttributeForRoleCore (VisualRole.Editable, stack).Style | TextStyle.Italic
+                                   },
+
+                               VisualRole.Editable =>
+                                   GetAttributeForRoleCore (VisualRole.Normal, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Normal, stack).Foreground,
+                                       Background = GetAttributeForRoleCore (VisualRole.Normal, stack).Foreground.GetDimColor (0.5)
+                                   },
+
+                               VisualRole.ReadOnly =>
+                                   GetAttributeForRoleCore (VisualRole.Editable, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Editable, stack).Foreground.GetDimColor (0.05),
+                                   },
+
+                               VisualRole.Disabled =>
+                                   GetAttributeForRoleCore (VisualRole.Normal, stack) with
+                                   {
+                                       Foreground = GetAttributeForRoleCore (VisualRole.Normal, stack).Foreground.GetDimColor (0.05),
+                                   },
+
+                               VisualRole.HotNormal =>
+                                   GetAttributeForRoleCore (VisualRole.Normal, stack) with
+                                   {
+                                       Style = GetAttributeForRoleCore (VisualRole.Normal, stack).Style | TextStyle.Underline
+                                   },
+
+                               VisualRole.HotFocus =>
+                                   GetAttributeForRoleCore (VisualRole.Focus, stack) with
+                                   {
+                                       Style = GetAttributeForRoleCore (VisualRole.Focus, stack).Style | TextStyle.Underline
+                                   },
+
+                               VisualRole.HotActive =>
+                                   GetAttributeForRoleCore (VisualRole.Active, stack) with
+                                   {
+                                       Style = GetAttributeForRoleCore (VisualRole.Active, stack).Style | TextStyle.Underline
+                                   },
+
+                               _ => GetAttributeForRoleCore (VisualRole.Normal, stack)
+                           };
+
+        stack.Remove (role);
+
+        return result;
+    }
+
+    /// <summary>
+    ///     Gets the <see cref="Attribute"/> associated with a specified <see cref="VisualRole"/> string.
+    /// </summary>
+    /// <param name="roleName">The name of the <see cref="VisualRole"/> describing the element being rendered.</param>
+    /// <returns>The corresponding <see cref="Attribute"/> from the <see cref="Scheme"/>.</returns>
+    public Attribute GetAttributeForRole (string roleName)
+    {
+        if (Enum.TryParse (roleName, true, out VisualRole role))
+        {
+            return GetAttributeForRole (role);
+        }
+
+        // If the string does not match any VisualRole, return the default Normal attribute
+        return Normal;
+    }
+
+    // Helper method for property _get implementation
+    private Attribute GetAttributeForRoleProperty (Attribute? explicitValue, VisualRole role)
+    {
+        if (explicitValue is { })
+        {
+            return explicitValue.Value;
+        }
+
+        return GetAttributeForRoleCore (role, []);
+    }
+
+    // Helper method for property _set implementation
+    private Attribute? SetAttributeForRoleProperty (Attribute value, VisualRole role)
+    {
+        // If value is the same as the algorithm value, use null
+        if (GetAttributeForRoleCore (role, []) == value)
+        {
+            return null;
+        }
+        return value;
+    }
+
+    private readonly Attribute? _normal;
+
+    /// <summary>
+    ///     The default visual role for unfocused, unselected, enabled elements.
+    ///     The Normal attribute must always be set. All other attributes are optional, and if not explicitly
+    ///     set, will be automatically generated. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Normal
+    {
+        get => _normal!.Value;
+        init => _normal = value;
+    }
+
+    private readonly Attribute? _hotNormal;
+
+    /// <summary>
+    ///     The visual role for <see cref="Normal"/> elements with a <see cref="View.HotKey"/> indicator.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute HotNormal
+    {
+        get => GetAttributeForRoleProperty (_hotNormal, VisualRole.HotNormal);
+        init => _hotNormal = SetAttributeForRoleProperty (value, VisualRole.HotNormal);
+    }
+
+    private readonly Attribute? _focus;
+
+    /// <summary>
+    ///     The visual role when the element is focused.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Focus
+    {
+        get => GetAttributeForRoleProperty (_focus, VisualRole.Focus);
+        init => _focus = SetAttributeForRoleProperty (value, VisualRole.Focus);
+    }
+
+    private readonly Attribute? _hotFocus;
+
+    /// <summary>
+    ///     The visual role for <see cref="Focus"/> elements with a <see cref="View.HotKey"/> indicator.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute HotFocus
+    {
+        get => GetAttributeForRoleProperty (_hotFocus, VisualRole.HotFocus);
+        init => _hotFocus = SetAttributeForRoleProperty (value, VisualRole.HotFocus);
+    }
+
+    private readonly Attribute? _active;
+
+    /// <summary>
+    ///     The visual role for elements that are active or selected (e.g., selected item in a <see cref="ListView"/>). Also
+    ///     used
+    ///     for headers in, <see cref="HexView"/>, <see cref="CharMap"/> and  <see cref="TabView"/>.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Active
+    {
+        get => GetAttributeForRoleProperty (_active, VisualRole.Active);
+        init => _active = SetAttributeForRoleProperty (value, VisualRole.Active);
+    }
+
+    private readonly Attribute? _hotActive;
+
+    /// <summary>
+    ///     The visual role for <see cref="Active"/> elements with a <see cref="View.HotKey"/> indicator.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute HotActive
+    {
+        get => GetAttributeForRoleProperty (_hotActive, VisualRole.HotActive);
+        init => _hotActive = SetAttributeForRoleProperty (value, VisualRole.HotActive);
+    }
+
+    private readonly Attribute? _highlight;
+
+    /// <summary>
+    ///     The visual role for elements that are highlighted (e.g., when the mouse is hovering over a <see cref="Button"/>).
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Highlight
+    {
+        get => GetAttributeForRoleProperty (_highlight, VisualRole.Highlight);
+        init => _highlight = SetAttributeForRoleProperty (value, VisualRole.Highlight);
+    }
+
+    private readonly Attribute? _editable;
+
+    /// <summary>
+    ///     The visual role for elements that are editable (e.g., <see cref="TextField"/> and <see cref="TextView"/>).
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Editable
+    {
+        get => GetAttributeForRoleProperty (_editable, VisualRole.Editable);
+        init => _editable = SetAttributeForRoleProperty (value, VisualRole.Editable);
+    }
+
+    private readonly Attribute? _readOnly;
+
+    /// <summary>
+    ///     The visual role for elements that are normally editable but currently read-only.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute ReadOnly
+    {
+        get => GetAttributeForRoleProperty (_readOnly, VisualRole.ReadOnly);
+        init => _readOnly = SetAttributeForRoleProperty (value, VisualRole.ReadOnly);
+    }
+
+    private readonly Attribute? _disabled;
+
+    /// <summary>
+    ///     The visual role for elements that are disabled and not interactable.
+    ///     If not explicitly set, will be a derived value. See the description for <see cref="Scheme"/> for details on the
+    ///     algorithm used.
+    /// </summary>
+    public Attribute Disabled
+    {
+        get => GetAttributeForRoleProperty (_disabled, VisualRole.Disabled);
+        init => _disabled = SetAttributeForRoleProperty (value, VisualRole.Disabled);
+    }
+
+    /// <inheritdoc/>
+    public virtual bool Equals (Scheme? other)
+    {
+        return other is { }
+               && EqualityComparer<Attribute>.Default.Equals (Normal, other.Normal)
+               && EqualityComparer<Attribute>.Default.Equals (HotNormal, other.HotNormal)
+               && EqualityComparer<Attribute>.Default.Equals (Focus, other.Focus)
+               && EqualityComparer<Attribute>.Default.Equals (HotFocus, other.HotFocus)
+               && EqualityComparer<Attribute>.Default.Equals (Active, other.Active)
+               && EqualityComparer<Attribute>.Default.Equals (HotActive, other.HotActive)
+               && EqualityComparer<Attribute>.Default.Equals (Highlight, other.Highlight)
+               && EqualityComparer<Attribute>.Default.Equals (Editable, other.Editable)
+               && EqualityComparer<Attribute>.Default.Equals (ReadOnly, other.ReadOnly)
+               && EqualityComparer<Attribute>.Default.Equals (Disabled, other.Disabled);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode ()
+    {
+        return HashCode.Combine (
+                                 HashCode.Combine (Normal, HotNormal, Focus, HotFocus, Active, HotActive, Highlight, Editable),
+                                 HashCode.Combine (ReadOnly, Disabled)
+                                );
+    }
+
+    /// <inheritdoc/>
+    public override string ToString ()
+    {
+        return $"Normal: {Normal}; HotNormal: {HotNormal}; Focus: {Focus}; HotFocus: {HotFocus}; "
+               + $"Active: {Active}; HotActive: {HotActive}; Highlight: {Highlight}; Editable: {Editable}; "
+               + $"ReadOnly: {ReadOnly}; Disabled: {Disabled}";
+    }
+}
diff --git a/Terminal.Gui/Drawing/Schemes.cs b/Terminal.Gui/Drawing/Schemes.cs
new file mode 100644
index 0000000000..ffcdce4a69
--- /dev/null
+++ b/Terminal.Gui/Drawing/Schemes.cs
@@ -0,0 +1,34 @@
+namespace Terminal.Gui;
+
+// ReSharper disable InconsistentNaming
+/// <summary>
+///     The built-in scheme names used by <see cref="SchemeManager"/>.
+///     <see cref="SchemeManager.GetSchemeNames"/> returns a collection valid scheme names, based on this enum.
+/// </summary>
+public enum Schemes
+{
+    /// <summary>
+    ///     The base scheme used for most Views.
+    /// </summary>
+    Base,
+
+    /// <summary>
+    ///     The menu scheme, used for Terminal.Gui.Menu, MenuBar, and StatusBar.
+    /// </summary>
+    Menu,
+
+    /// <summary>
+    ///     The dialog scheme, used for Dialog, MessageBox, and other views dialog-like views.
+    /// </summary>
+    Dialog,
+
+    /// <summary>
+    ///     The application Toplevel scheme, used for the Toplevel View.
+    /// </summary>
+    Toplevel,
+
+    /// <summary>
+    ///     The scheme for showing errors.
+    /// </summary>
+    Error
+}
diff --git a/Terminal.Gui/Drawing/TextStyle.cs b/Terminal.Gui/Drawing/TextStyle.cs
index 5a7fbb806c..204b7ee80b 100644
--- a/Terminal.Gui/Drawing/TextStyle.cs
+++ b/Terminal.Gui/Drawing/TextStyle.cs
@@ -1,7 +1,9 @@
+using System.Text.Json.Serialization;
+
 namespace Terminal.Gui;
 
 /// <summary>
-///     Defines non-color text style flags for an <see cref="Attribute"/>.
+///     Defines non-color style flags for an <see cref="Attribute"/>.
 /// </summary>
 /// <remarks>
 ///     <para>
@@ -9,7 +11,7 @@ namespace Terminal.Gui;
 ///         Styles that are poorly supported, non-visual, or redundant with other APIs are omitted.
 ///     </para>
 ///     <para>
-///         Multiple styles can be combined using bitwise operations. Use <see cref="Attribute.TextStyle"/>
+///         Multiple styles can be combined using bitwise operations. Use <see cref="Attribute.Style"/>
 ///         to get or set these styles on an <see cref="Attribute"/>.
 ///     </para>
 ///     <para>
@@ -20,6 +22,7 @@ namespace Terminal.Gui;
 ///     </para>
 /// </remarks>
 [Flags]
+[JsonConverter (typeof (JsonStringEnumConverter<TextStyle>))]
 public enum TextStyle : byte
 {
     /// <summary>
diff --git a/Terminal.Gui/Drawing/VisualRole.cs b/Terminal.Gui/Drawing/VisualRole.cs
new file mode 100644
index 0000000000..8286e1e4bd
--- /dev/null
+++ b/Terminal.Gui/Drawing/VisualRole.cs
@@ -0,0 +1,64 @@
+namespace Terminal.Gui;
+
+/// <summary>
+///     Represents the semantic visual role of a visual element rendered by a <see cref="View"/>. Each VisualRole maps to
+///     a property of <see cref="Scheme"/> (e.g., <see cref="Scheme.Normal"/>).
+/// </summary>
+/// <remarks>
+///     A single View may render as one or multiple elements. Each element can be associated with a different
+///     <see cref="VisualRole"/>.
+/// </remarks>
+public enum VisualRole
+{
+    /// <summary>
+    ///     The default visual role for unfocused, unselected, enabled elements.
+    /// </summary>
+    Normal,
+
+    /// <summary>
+    ///     The visual role for <see cref="Normal"/> elements with a <see cref="View.HotKey"/> indicator.
+    /// </summary>
+    HotNormal,
+
+    /// <summary>
+    ///     The visual role when the element is focused.
+    /// </summary>
+    Focus,
+
+    /// <summary>
+    ///     The visual role for <see cref="Focus"/> elements with a <see cref="View.HotKey"/> indicator.
+    /// </summary>
+    HotFocus,
+
+    /// <summary>
+    ///     The visual role for elements that are active or selected (e.g., selected item in a <see cref="ListView"/>). Also
+    ///     used
+    ///     for headers in, <see cref="HexView"/>, <see cref="CharMap"/> and  <see cref="TabView"/>.
+    /// </summary>
+    Active,
+
+    /// <summary>
+    ///     The visual role for <see cref="Active"/> elements with a <see cref="View.HotKey"/> indicator.
+    /// </summary>
+    HotActive,
+
+    /// <summary>
+    ///     The visual role for elements that are highlighted (e.g., when the mouse is hovering over a <see cref="Button"/>).
+    /// </summary>
+    Highlight,
+
+    /// <summary>
+    ///     The visual role for elements that are disabled and not interactable.
+    /// </summary>
+    Disabled,
+
+    /// <summary>
+    ///     The visual role for elements that are editable (e.g., <see cref="TextField"/> and <see cref="TextView"/>).
+    /// </summary>
+    Editable,
+
+    /// <summary>
+    ///     The visual role for elements that are normally editable but currently read-only.
+    /// </summary>
+    ReadOnly
+}
diff --git a/Terminal.Gui/Drawing/VisualRoleEventArgs.cs b/Terminal.Gui/Drawing/VisualRoleEventArgs.cs
new file mode 100644
index 0000000000..52be6055f1
--- /dev/null
+++ b/Terminal.Gui/Drawing/VisualRoleEventArgs.cs
@@ -0,0 +1,29 @@
+#nullable enable
+namespace Terminal.Gui;
+
+/// <summary>Args for events that relate <see cref="VisualRole"/>.</summary>
+public class VisualRoleEventArgs : CancelEventArgs<Attribute>
+{
+    /// <inheritdoc/>
+    public VisualRoleEventArgs (in VisualRole role, ref readonly Attribute currentValue, ref Attribute newValue, bool cancel = false) : base (
+                                                                                                                                              in currentValue,
+                                                                                                                                              ref newValue,
+                                                                                                                                              cancel)
+    {
+        Role = role;
+    }
+
+    /// <inheritdoc/>
+    protected VisualRoleEventArgs (in VisualRole role, ref readonly Attribute currentValue, ref Attribute newValue) : base (currentValue, newValue)
+    {
+        Role = role;
+    }
+
+    /// <inheritdoc/>
+    public VisualRoleEventArgs (in VisualRole role, ref Attribute newValue) : base (default (Attribute), newValue) { Role = role; }
+
+    /// <summary>
+    ///     The <see cref="VisualRole"/> that is being set.
+    /// </summary>
+    public VisualRole Role { get; set; }
+}
diff --git a/Terminal.Gui/FileServices/FileDialogStyle.cs b/Terminal.Gui/FileServices/FileDialogStyle.cs
index 9726d99598..dec3e2d1dc 100644
--- a/Terminal.Gui/FileServices/FileDialogStyle.cs
+++ b/Terminal.Gui/FileServices/FileDialogStyle.cs
@@ -45,14 +45,14 @@ public FileDialogStyle (IFileSystem fileSystem)
     ///     Gets or sets the default value to use for <see cref="UseColors"/>. This can be populated from .tui config
     ///     files via <see cref="ConfigurationManager"/>
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static bool DefaultUseColors { get; set; }
 
     /// <summary>
     ///     Gets or sets the default value to use for <see cref="UseUnicodeCharacters"/>. This can be populated from .tui
     ///     config files via <see cref="ConfigurationManager"/>
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static bool DefaultUseUnicodeCharacters { get; set; }
 
     /// <summary>
diff --git a/Terminal.Gui/Input/Keyboard/Key.cs b/Terminal.Gui/Input/Keyboard/Key.cs
index dfcd34e672..e6ba29d441 100644
--- a/Terminal.Gui/Input/Keyboard/Key.cs
+++ b/Terminal.Gui/Input/Keyboard/Key.cs
@@ -1080,7 +1080,7 @@ out parsedInt
     private static Rune _separator = new ('+');
 
     /// <summary>Gets or sets the separator character used when parsing and printing Keys. E.g. Ctrl+A. The default is '+'.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Rune Separator
     {
         get => _separator;
diff --git a/Terminal.Gui/ModuleInitializers.cs b/Terminal.Gui/ModuleInitializers.cs
new file mode 100644
index 0000000000..371b209289
--- /dev/null
+++ b/Terminal.Gui/ModuleInitializers.cs
@@ -0,0 +1,31 @@
+using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     Contains module initializers that run when the Terminal.Gui assembly is loaded.
+/// </summary>
+internal static class ModuleInitializers
+{
+    /// <summary>
+    /// Initializes the ConfigurationManager when the Terminal.Gui assembly is loaded.
+    /// Ensures configuration properties are loaded deterministically before any part
+    /// of the library is used.
+    /// </summary>
+    [RequiresUnreferencedCode ("AOT")]
+#pragma warning disable CA2255
+    [ModuleInitializer]
+    [RequiresDynamicCode ("Calls Terminal.Gui.ConfigurationManager.Initialize()")]
+#pragma warning restore CA2255
+    internal static void InitializeConfigurationManager ()
+    {
+        // Initialize ConfigurationManager to ensure all configuration properties
+        // are loaded deterministically
+        ConfigurationManager.Initialize ();
+
+        // Note: We're only initializing the config properties structure here,
+        // not loading settings from files. That still happens during Application.Init()
+        // via InitializeConfigurationManagement()
+    }
+}
diff --git a/Terminal.Gui/README.md b/Terminal.Gui/README.md
index a9ec754602..4a448a8eeb 100644
--- a/Terminal.Gui/README.md
+++ b/Terminal.Gui/README.md
@@ -16,9 +16,8 @@ All files required to build the **Terminal.Gui** library (and NuGet package).
 
 - `Clipboard\` - Classes related to clipboard access.
 
-- `Input\` - Classes relating to keyboard and mouse input. Includes `Responder`, which is the base class for `View`
+- `Input\` - Classes relating to keyboard and mouse input. 
 	- `Events.cs` - Defines keyboard and mouse-related structs & classes. 
-	- `Responder` - Base class for the windowing class hierarchy. Implements support for keyboard & mouse input.
 	- etc...
 
 - `Text\` - Classes related to text processing
@@ -26,7 +25,7 @@ All files required to build the **Terminal.Gui** library (and NuGet package).
 - `Drawing\` - Classes related to drawing 
 
 - `View\` - The `View` class heirarchy, not including any sub-classes
-	- `View.cs` - Derived from `Responder`, the base class for non-modal visual elements such as controls.
+	- `View.cs` - The base class for non-modal visual elements such as controls.
 	- `Layout\`	
 		- `PosDim.cs` - Implements *Computed Layout* system. These classes have deep dependencies on `View`.
 
diff --git a/Terminal.Gui/Resources/config.json b/Terminal.Gui/Resources/config.json
index df672d65c0..4a7204d92b 100644
--- a/Terminal.Gui/Resources/config.json
+++ b/Terminal.Gui/Resources/config.json
@@ -39,10 +39,141 @@
   "FileDialogStyle.DefaultUseUnicodeCharacters": false,
 
   // --------------- Themes -----------------
-  "Theme": "Default",
   "Themes": [
+    // We do not override any hard-coded properties for Default here; 
+    // Default is by definition the same as hard-coded.
+    //{
+    //  "Default": {
+    //  }
+    //},
     {
-      "Default": {
+      "TurboPascal 5": {
+        "Schemes": [
+          {
+            "TopLevel": {
+              "Normal": {
+                "Foreground": "White",
+                "Background": "Blue"
+              }
+            }
+          },
+          {
+            "Base": {
+              "Normal": {
+                "Foreground": "Yellow",
+                "Background": "Blue"
+              }
+            }
+          },
+          {
+            "Dialog": {
+              "Normal": {
+                "Foreground": "Black",
+                "Background": "LightGray"
+              }
+            }
+          },
+          {
+            "Menu": {
+              "Normal": {
+                "Foreground": "Black",
+                "Background": "Cyan",
+                "Style": "None"
+              },
+              "Focus": {
+                "Foreground": "Black",
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "HotNormal": {
+                "Foreground": "BrightRed",
+                "Background": "Cyan",
+                "Style": "None"
+              },
+              "HotFocus": {
+                "Foreground": "BrightRed",
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "Disabled": {
+                "Foreground": "DarkGray",
+                "Background": "Cyan",
+                "Style": "None"
+              }
+            }
+          },
+          {
+            "Error": {
+              "Normal": {
+                "Foreground": "BrightRed",
+                "Background": "LightGray",
+                "Style": "None"
+              }
+            }
+          }
+        ],
+        "Glyphs.CheckStateChecked": "☒",
+        "Glyphs.CheckStateNone": "□",
+        "Glyphs.CheckStateUnChecked": "☐",
+        "Glyphs.LeftBracket": "[",
+        "Glyphs.RightBracket": "]"
+      }
+    },
+    {
+      "Anders": {
+        "Schemes": [
+          {
+            "TopLevel": {
+              "Normal": {
+                "Foreground": "WhiteSmoke",
+                "Background": "DimGray"
+              }
+            }
+          },
+          {
+            "Base": {
+              "Normal": {
+                "Foreground": "White",
+                "Background": "DarkBlue"
+              }
+            },
+          },
+          {
+            "Dialog": {
+              "Normal": {
+                "Foreground": "BrightBlue",
+                "Background": "LightGray"
+              },
+            }
+          },
+          {
+            "Menu": {
+              "Normal": {
+                "Foreground": "White",
+                "Background": "Blue",
+                "Style": "Bold"
+              },
+            }
+          },
+          {
+            "Error": {
+              "Normal": {
+                "Foreground": "Red",
+                "Background": "WhiteSmoke",
+                "Style": "Italic"
+              },
+            }
+          }
+        ],
+        "Glyphs.CheckStateChecked": "☒",
+        "Glyphs.CheckStateNone": "□",
+        "Glyphs.CheckStateUnChecked": "☐",
+        "Glyphs.LeftBracket": "[",
+        "Glyphs.RightBracket": "]"
+      }
+    },
+    {
+      "Dark": {
         "Dialog.DefaultButtonAlignment": "End",
         "Dialog.DefaultButtonAlignmentModes": "AddSpaceBetweenItems",
         "Dialog.DefaultBorderStyle": "Heavy",
@@ -52,79 +183,165 @@
         "MessageBox.DefaultButtonAlignment": "Center",
         "MessageBox.DefaultBorderStyle": "Heavy",
         "Button.DefaultShadow": "Opaque",
-        "Menuv2.DefaultBorderStyle": "Single",
-        "MenuBarv2.DefaultBorderStyle": "None",
-        "StatusBar.DefaultSeparatorLineStyle": "Single",
-        "ColorSchemes": [
+        "Schemes": [
           {
             "TopLevel": {
               "Normal": {
-                "Foreground": "BrightGreen",
-                "Background": "#505050" // DarkerGray
+                "Foreground": "LightGray",
+                "Background": "Black",
+                "Style": "None"
               },
               "Focus": {
                 "Foreground": "White",
-                "Background": "#696969" // DimGray
+                "Background": "Charcoal",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "Yellow",
-                "Background": "#505050" // DarkerGray
-              },
-              "HotFocus": {
-                "Foreground": "Yellow",
-                "Background": "#696969" // DimGray
+                "Foreground": "Silver",
+                "Background": "Black",
+                "Style": "Underline"
               },
               "Disabled": {
                 "Foreground": "DarkGray",
-                "Background": "#505050" // DarkerGray
+                "Background": "Black",
+                "Style": "Faint"
+              },
+              "HotFocus": {
+                "Foreground": "White",
+                "Background": "Charcoal",
+                "Style": "Underline"
+              },
+              "Active": {
+                "Foreground": "White",
+                "Background": "Onyx",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "Onyx",
+                "Style": "Underline"
+              },
+              "Highlight": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "LightYellow",
+                "Background": "Black",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "Black",
+                "Style": "Italic"
               }
             }
           },
           {
             "Base": {
               "Normal": {
-                "Foreground": "White",
-                "Background": "Blue"
+                "Foreground": "LightGray",
+                "Background": "Black",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "DarkBlue",
-                "Background": "LightGray"
+                "Foreground": "White",
+                "Background": "Charcoal",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "BrightCyan",
-                "Background": "Blue"
-              },
-              "HotFocus": {
-                "Foreground": "BrightBlue",
-                "Background": "LightGray"
+                "Foreground": "Silver",
+                "Background": "Black",
+                "Style": "Underline"
               },
               "Disabled": {
                 "Foreground": "DarkGray",
-                "Background": "Blue"
+                "Background": "Black",
+                "Style": "Faint"
+              },
+              "HotFocus": {
+                "Foreground": "White",
+                "Background": "Charcoal",
+                "Style": "Underline"
+              },
+              "Active": {
+                "Foreground": "White",
+                "Background": "Onyx"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "Onyx",
+                "Style": "Underline"
+              },
+              "Highlight": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Gray",
+                "Background": "Black",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "Black",
+                "Style": "Italic"
               }
             }
           },
           {
             "Dialog": {
               "Normal": {
-                "Foreground": "Black",
-                "Background": "LightGray"
+                "Foreground": "LightGray",
+                "Background": "Charcoal",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "DarkGray",
-                "Background": "LightGray"
+                "Foreground": "White",
+                "Background": "SlateGray",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "Blue",
-                "Background": "LightGray"
+                "Foreground": "Silver",
+                "Background": "Charcoal",
+                "Style": "Underline"
+              },
+              "Disabled": {
+                "Foreground": "DarkGray",
+                "Background": "Charcoal",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "BrightBlue",
-                "Background": "LightGray"
+                "Foreground": "White",
+                "Background": "SlateGray",
+                "Style": "Underline"
               },
-              "Disabled": {
+              "Active": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "White",
+                "Background": "Onyx",
+                "Style": "None"
+              },
+              "Editable": {
                 "Foreground": "Gray",
-                "Background": "DarkGray"
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "Charcoal",
+                "Style": "Italic"
               }
             }
           },
@@ -132,196 +349,115 @@
             "Menu": {
               "Normal": {
                 "Foreground": "White",
-                "Background": "DarkBlue"
+                "Background": "Onyx",
+                "Style": "Bold"
               },
               "Focus": {
-                "Foreground": "DarkBlue",
-                "Background": "White"
+                "Foreground": "White",
+                "Background": "Charcoal",
+                "Style": "Bold"
               },
               "HotNormal": {
-                "Foreground": "Yellow",
-                "Background": "DarkBlue"
+                "Foreground": "Silver",
+                "Background": "Onyx",
+                "Style": "Underline,Bold"
+              },
+              "Disabled": {
+                "Foreground": "DarkGray",
+                "Background": "Charcoal",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "Blue",
-                "Background": "White"
+                "Foreground": "White",
+                "Background": "Charcoal",
+                "Style": "Underline,Bold"
               },
-              "Disabled": {
+              "Active": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "OuterSpace",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "White",
+                "Background": "SlateGray",
+                "Style": "None"
+              },
+              "Editable": {
                 "Foreground": "Gray",
-                "Background": "DarkGray"
+                "Background": "Onyx",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "Onyx",
+                "Style": "Italic"
               }
             }
           },
           {
             "Error": {
               "Normal": {
-                "Foreground": "Red",
-                "Background": "Pink"
+                "Foreground": "IndianRed",
+                "Background": "Black",
+                "Style": "None"
               },
               "Focus": {
                 "Foreground": "White",
-                "Background": "BrightRed"
+                "Background": "IndianRed",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "Black",
-                "Background": "Pink"
-              },
-              "HotFocus": {
-                "Foreground": "Pink",
-                "Background": "BrightRed"
+                "Foreground": "LightCoral",
+                "Background": "Black",
+                "Style": "Underline"
               },
               "Disabled": {
                 "Foreground": "DarkGray",
-                "Background": "White"
+                "Background": "Black",
+                "Style": "Faint"
+              },
+              "HotFocus": {
+                "Foreground": "White",
+                "Background": "IndianRed",
+                "Style": "Underline"
+              },
+              "Active": {
+                "Foreground": "White",
+                "Background": "LightCoral",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "LightCoral",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "White",
+                "Background": "IndianRed",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Gray",
+                "Background": "Black",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "Black",
+                "Style": "Italic"
               }
             }
           }
-        ],
-        "Glyphs.Apple": "\uD83C\uDF4E",
-        "Glyphs.AppleBMP": "❦",
-        "Glyphs.BlackCircle": "●",
-        "Glyphs.BlocksMeterSegment": "▌",
-        "Glyphs.BottomSideLineLtHv": "╽",
-        "Glyphs.BottomTee": "┴",
-        "Glyphs.BottomTeeDbl": "╩",
-        "Glyphs.BottomTeeDblH": "╧",
-        "Glyphs.BottomTeeDblV": "╨",
-        "Glyphs.BottomTeeHvDblH": "┻",
-        "Glyphs.BottomTeeHvH": "┷",
-        "Glyphs.BottomTeeHvV": "┸",
-        "Glyphs.CheckStateChecked": "☑",
-        "Glyphs.CheckStateNone": "☒",
-        "Glyphs.CheckStateUnChecked": "☐",
-        "Glyphs.Close": "✘",
-        "Glyphs.Collapse": "-",
-        "Glyphs.ContinuousMeterSegment": "█",
-        "Glyphs.Cross": "┼",
-        "Glyphs.CrossDbl": "╬",
-        "Glyphs.CrossDblH": "╪",
-        "Glyphs.CrossDblV": "╫",
-        "Glyphs.CrossHv": "╋",
-        "Glyphs.CrossHvH": "┿",
-        "Glyphs.CrossHvV": "╂",
-        "Glyphs.Diamond": "◊",
-        "Glyphs.Dot": "∙",
-        "Glyphs.DottedSquare": "⬚",
-        "Glyphs.DownArrow": "▼",
-        "Glyphs.Expand": "+",
-        "Glyphs.File": "☰",
-        "Glyphs.Folder": "꤉",
-        "Glyphs.HalfBottomLine": "╷",
-        "Glyphs.HalfBottomLineLt": "╻",
-        "Glyphs.HalfLeftLine": "╴",
-        "Glyphs.HalfLeftLineHv": "╸",
-        "Glyphs.HalfRightLine": "╶",
-        "Glyphs.HalfRightLineHv": "╺",
-        "Glyphs.HalfTopLine": "╵",
-        "Glyphs.HalfTopLineHv": "╹",
-        "Glyphs.HLine": "─",
-        "Glyphs.HLineDa2": "╌",
-        "Glyphs.HLineDa3": "┄",
-        "Glyphs.HLineDa4": "┈",
-        "Glyphs.HLineDbl": "═",
-        "Glyphs.HLineHv": "━",
-        "Glyphs.HLineHvDa2": "╍",
-        "Glyphs.HLineHvDa3": "┅",
-        "Glyphs.HLineHvDa4": "┉",
-        "Glyphs.HorizontalEllipsis": "…",
-        "Glyphs.IdenticalTo": "≡",
-        "Glyphs.LeftArrow": "◄",
-        "Glyphs.LeftBracket": "⟦",
-        "Glyphs.LeftDefaultIndicator": "►",
-        "Glyphs.LeftSideLineHvLt": "╾",
-        "Glyphs.LeftTee": "├",
-        "Glyphs.LeftTeeDbl": "╠",
-        "Glyphs.LeftTeeDblH": "╞",
-        "Glyphs.LeftTeeDblV": "╟",
-        "Glyphs.LeftTeeHvDblH": "┣",
-        "Glyphs.LeftTeeHvH": "┝",
-        "Glyphs.LeftTeeHvV": "┠",
-        "Glyphs.LLCorner": "└",
-        "Glyphs.LLCornerDbl": "╚",
-        "Glyphs.LLCornerDblSingle": "╙",
-        "Glyphs.LLCornerHv": "┗",
-        "Glyphs.LLCornerHvLt": "┖",
-        "Glyphs.LLCornerLtHv": "┕",
-        "Glyphs.LLCornerR": "╰",
-        "Glyphs.LLCornerSingleDbl": "╘",
-        "Glyphs.LRCorner": "┘",
-        "Glyphs.LRCornerDbl": "╝",
-        "Glyphs.LRCornerDblSingle": "╜",
-        "Glyphs.LRCornerHv": "┛",
-        "Glyphs.LRCornerHvLt": "┚",
-        "Glyphs.LRCornerLtHv": "┙",
-        "Glyphs.LRCornerR": "╯",
-        "Glyphs.LRCornerSingleDbl": "╛",
-        "Glyphs.Maximize": "✽",
-        "Glyphs.Minimize": "❏",
-        "Glyphs.Move": "◊",
-        "Glyphs.RightArrow": "►",
-        "Glyphs.RightBracket": "⟧",
-        "Glyphs.RightDefaultIndicator": "◄",
-        "Glyphs.RightSideLineLtHv": "╼",
-        "Glyphs.RightTee": "┤",
-        "Glyphs.RightTeeDbl": "╣",
-        "Glyphs.RightTeeDblH": "╡",
-        "Glyphs.RightTeeDblV": "╢",
-        "Glyphs.RightTeeHvDblH": "┫",
-        "Glyphs.RightTeeHvH": "┥",
-        "Glyphs.RightTeeHvV": "┨",
-        "Glyphs.Selected": "◉",
-        "Glyphs.ShadowHorizontal": "▀",
-        "Glyphs.ShadowHorizontalEnd": "▘",
-        "Glyphs.ShadowHorizontalStart": "▝",
-        "Glyphs.ShadowVertical": "▌",
-        "Glyphs.ShadowVerticalStart": "▖",
-        "Glyphs.SizeBottomLeft": "↙",
-        "Glyphs.SizeBottomRight": "↘",
-        "Glyphs.SizeHorizontal": "↔",
-        "Glyphs.SizeTopLeft": "↖",
-        "Glyphs.SizeTopRight": "↗",
-        "Glyphs.SizeVertical": "↕",
-        "Glyphs.Stipple": "░",
-        "Glyphs.TopSideLineHvLt": "╿",
-        "Glyphs.TopTee": "┬",
-        "Glyphs.TopTeeDbl": "╦",
-        "Glyphs.TopTeeDblH": "╤",
-        "Glyphs.TopTeeDblV": "╥",
-        "Glyphs.TopTeeHvDblH": "┳",
-        "Glyphs.TopTeeHvH": "┯",
-        "Glyphs.TopTeeHvV": "┰",
-        "Glyphs.ULCorner": "┌",
-        "Glyphs.ULCornerDbl": "╔",
-        "Glyphs.ULCornerDblSingle": "╓",
-        "Glyphs.ULCornerHv": "┏",
-        "Glyphs.ULCornerHvLt": "┎",
-        "Glyphs.ULCornerLtHv": "┍",
-        "Glyphs.ULCornerR": "╭",
-        "Glyphs.ULCornerSingleDbl": "╒",
-        "Glyphs.UnSelected": "○",
-        "Glyphs.UpArrow": "▲",
-        "Glyphs.URCorner": "┐",
-        "Glyphs.URCornerDbl": "╗",
-        "Glyphs.URCornerDblSingle": "╖",
-        "Glyphs.URCornerHv": "┓",
-        "Glyphs.URCornerHvLt": "┑",
-        "Glyphs.URCornerLtHv": "┒",
-        "Glyphs.URCornerR": "╮",
-        "Glyphs.URCornerSingleDbl": "╕",
-        "Glyphs.VerticalFourDots": "⁞",
-        "Glyphs.VLine": "│",
-        "Glyphs.VLineDa2": "╎",
-        "Glyphs.VLineDa3": "┆",
-        "Glyphs.VLineDa4": "┊",
-        "Glyphs.VLineDbl": "║",
-        "Glyphs.VLineHv": "┃",
-        "Glyphs.VLineHvDa2": "╏",
-        "Glyphs.VLineHvDa3": "┇",
-        "Glyphs.VLineHvDa4": "┋"
+        ]
       }
     },
     {
-      "Dark": {
+      "Light": {
         "Dialog.DefaultButtonAlignment": "End",
         "Dialog.DefaultButtonAlignmentModes": "AddSpaceBetweenItems",
         "Dialog.DefaultBorderStyle": "Heavy",
@@ -331,28 +467,58 @@
         "MessageBox.DefaultButtonAlignment": "Center",
         "MessageBox.DefaultBorderStyle": "Heavy",
         "Button.DefaultShadow": "Opaque",
-        "ColorSchemes": [
+        "Schemes": [
           {
             "TopLevel": {
               "Normal": {
-                "Foreground": "Gray",
-                "Background": "Black"
+                "Foreground": "DimGray",
+                "Background": "WhiteSmoke",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "White",
-                "Background": "BrightGreen"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "BrightGreen",
-                "Background": "Black"
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Underline"
+              },
+              "Disabled": {
+                "Foreground": "LightGray",
+                "Background": "WhiteSmoke",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "Cyan",
-                "Background": "Black"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "Underline"
               },
-              "Disabled": {
+              "Active": {
+                "Foreground": "Black",
+                "Background": "White",
+                "Style": "Bold"
+              },
+              "HotActive": {
                 "Foreground": "Black",
-                "Background": "Gray"
+                "Background": "White",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Goldenrod",
+                "Background": "WhiteSmoke",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Italic"
               }
             }
           },
@@ -360,95 +526,352 @@
             "Base": {
               "Normal": {
                 "Foreground": "Gray",
-                "Background": "Black"
+                "Background": "WhiteSmoke",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "BrightYellow",
-                "Background": "DarkGray"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "BrightYellow",
-                "Background": "Black"
+                "Foreground": "Silver",
+                "Background": "WhiteSmoke",
+                "Style": "Underline"
+              },
+              "Disabled": {
+                "Foreground": "LightGray",
+                "Background": "WhiteSmoke",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "Cyan",
-                "Background": "Black"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "Underline"
               },
-              "Disabled": {
+              "Active": {
+                "Foreground": "Black",
+                "Background": "White",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "Black",
+                "Background": "White",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
                 "Foreground": "Black",
-                "Background": "Gray"
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Goldenrod",
+                "Background": "WhiteSmoke",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Italic"
               }
             }
           },
           {
             "Dialog": {
               "Normal": {
-                "Foreground": "Gray",
-                "Background": "Black"
+                "Foreground": "DimGray",
+                "Background": "WhiteSmoke",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "BrightCyan",
-                "Background": "Black"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "White",
-                "Background": "Black"
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Underline"
+              },
+              "Disabled": {
+                "Foreground": "LightGray",
+                "Background": "WhiteSmoke",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "White",
-                "Background": "Black"
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "Underline"
               },
-              "Disabled": {
+              "Active": {
                 "Foreground": "Black",
-                "Background": "Gray"
+                "Background": "White",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "Black",
+                "Background": "White",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Black",
+                "Background": "LemonChiffon",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Italic"
               }
             }
           },
           {
             "Menu": {
               "Normal": {
+                "Foreground": "DimGray",
+                "Background": "White",
+                "Style": "Bold"
+              },
+              "Focus": {
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "Bold"
+              },
+              "HotNormal": {
+                "Foreground": "Gray",
+                "Background": "White",
+                "Style": "Underline,Bold"
+              },
+              "Disabled": {
                 "Foreground": "LightGray",
-                "Background": "#505050" // DarkerGray
+                "Background": "WhiteSmoke",
+                "Style": "Faint"
+              },
+              "HotFocus": {
+                "Foreground": "Black",
+                "Background": "Gainsboro",
+                "Style": "Underline,Bold"
+              },
+              "Active": {
+                "Foreground": "Black",
+                "Background": "WhiteSmoke",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "Black",
+                "Background": "WhiteSmoke",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "LightGray",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "DimGray",
+                "Background": "White",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "White",
+                "Style": "Italic"
+              }
+            }
+          },
+          {
+            "Error": {
+              "Normal": {
+                "Foreground": "FireBrick",
+                "Background": "WhiteSmoke",
+                "Style": "None"
               },
               "Focus": {
-                "Foreground": "White",
-                "Background": "Black"
+                "Foreground": "WhiteSmoke",
+                "Background": "FireBrick",
+                "Style": "None"
               },
               "HotNormal": {
-                "Foreground": "White",
-                "Background": "#505050" // DarkerGray
+                "Foreground": "LightCoral",
+                "Background": "WhiteSmoke",
+                "Style": "Underline"
+              },
+              "Disabled": {
+                "Foreground": "LightGray",
+                "Background": "WhiteSmoke",
+                "Style": "Faint"
               },
               "HotFocus": {
-                "Foreground": "White",
-                "Background": "Black"
+                "Foreground": "WhiteSmoke",
+                "Background": "FireBrick",
+                "Style": "Underline"
+              },
+              "Active": {
+                "Foreground": "WhiteSmoke",
+                "Background": "LightCoral",
+                "Style": "Bold"
+              },
+              "HotActive": {
+                "Foreground": "WhiteSmoke",
+                "Background": "LightCoral",
+                "Style": "Underline,Bold"
+              },
+              "Highlight": {
+                "Foreground": "WhiteSmoke",
+                "Background": "FireBrick",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "Goldenrod",
+                "Background": "WhiteSmoke",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "Gray",
+                "Background": "WhiteSmoke",
+                "Style": "Italic"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "Green Phosphor": {
+        "Dialog.DefaultShadow": "None",
+        "FrameView.DefaultBorderStyle": "Single",
+        "Window.DefaultBorderStyle": "Single",
+        "MessageBox.DefaultBorderStyle": "Single",
+        "Button.DefaultShadow": "None",
+        "Menuv2.DefaultBorderStyle": "Single",
+        "Schemes": [
+          {
+            "TopLevel": {
+              "Normal": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "None"
+              }
+            }
+          },
+          {
+            "Base": {
+              "Normal": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "None"
+              },
+              "Active": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "Bold"
+              },
+              "Highlight": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Editable": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
+              }
+            }
+          },
+          {
+            "Dialog": {
+              "Normal": {
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "Bold"
+              },
+              "Active": {
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "Bold"
               },
-              "Disabled": {
-                "Foreground": "Gray",
-                "Background": "Black"
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
               }
             }
           },
           {
-            "Error": {
+            "Menu": {
               "Normal": {
-                "Foreground": "BrightYellow",
-                "Background": "DarkGray"
-              },
-              "Focus": {
-                "Foreground": "DarkGray",
-                "Background": "BrightYellow"
-              },
-              "HotNormal": {
-                "Foreground": "BrightYellow",
-                "Background": "DarkGray"
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "Bold"
               },
-              "HotFocus": {
-                "Foreground": "Red",
-                "Background": "BrightYellow"
+              "Active": {
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "Bold"
               },
-              "Disabled": {
-                "Foreground": "DarkGray",
-                "Background": "Gray"
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "GreenPhosphor",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
+              }
+            }
+          },
+          {
+            "Error": {
+              "Normal": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Active": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "Bold,Italic"
+              },
+              "Highlight": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Editable": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "Italic"
+              },
+              "ReadOnly": {
+                "Foreground": "GreenPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint,Italic"
               }
             }
           }
@@ -456,62 +879,49 @@
       }
     },
     {
-      "Light": {
-        "Dialog.DefaultButtonAlignment": "End",
-        "Dialog.DefaultButtonAlignmentModes": "AddSpaceBetweenItems",
-        "Dialog.DefaultBorderStyle": "Heavy",
-        "Dialog.DefaultShadow": "Transparent",
+      "Amber Phosphor": {
+        "Dialog.DefaultShadow": "None",
         "FrameView.DefaultBorderStyle": "Single",
         "Window.DefaultBorderStyle": "Single",
-        "MessageBox.DefaultButtonAlignment": "Center",
-        "MessageBox.DefaultBorderStyle": "Heavy",
-        "Button.DefaultShadow": "Opaque",
-        "ColorSchemes": [
+        "MessageBox.DefaultBorderStyle": "Single",
+        "Button.DefaultShadow": "None",
+        "Menuv2.DefaultBorderStyle": "Single",
+        "Schemes": [
           {
             "TopLevel": {
               "Normal": {
-                "Foreground": "DarkGray",
-                "Background": "White"
-              },
-              "Focus": {
-                "Foreground": "Black",
-                "Background": "White"
-              },
-              "HotNormal": {
-                "Foreground": "BrightGreen",
-                "Background": "White"
-              },
-              "HotFocus": {
-                "Foreground": "Cyan",
-                "Background": "White"
-              },
-              "Disabled": {
-                "Foreground": "Gray",
-                "Background": "White"
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "None"
               }
             }
           },
           {
             "Base": {
               "Normal": {
-                "Foreground": "#505050", // DarkerGray
-                "Background": "White"
-              },
-              "Focus": {
-                "Foreground": "BrightRed",
-                "Background": "Gray"
-              },
-              "HotNormal": {
-                "Foreground": "Red",
-                "Background": "White"
-              },
-              "HotFocus": {
-                "Foreground": "Cyan",
-                "Background": "DarkGray"
-              },
-              "Disabled": {
-                "Foreground": "Black",
-                "Background": "Gray"
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "None"
+              },
+              "Active": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "Bold"
+              },
+              "Highlight": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Editable": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
               }
             }
           },
@@ -519,71 +929,86 @@
             "Dialog": {
               "Normal": {
                 "Foreground": "Black",
-                "Background": "Gray"
-              },
-              "Focus": {
-                "Foreground": "Blue",
-                "Background": "Gray"
+                "Background": "AmberPhosphor",
+                "Style": "Bold"
               },
-              "HotNormal": {
+              "Active": {
                 "Foreground": "Black",
-                "Background": "Gray"
+                "Background": "AmberPhosphor",
+                "Style": "Bold"
               },
-              "HotFocus": {
-                "Foreground": "BrightBlue",
-                "Background": "Gray"
-              },
-              "Disabled": {
+              "Highlight": {
                 "Foreground": "Black",
-                "Background": "Gray"
+                "Background": "AmberPhosphor",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
               }
             }
           },
           {
             "Menu": {
               "Normal": {
-                "Foreground": "DarkGray",
-                "Background": "LightGray"
-              },
-              "Focus": {
-                "Foreground": "DarkGray",
-                "Background": "White"
-              },
-              "HotNormal": {
-                "Foreground": "BrightRed",
-                "Background": "LightGray"
+                "Foreground": "Black",
+                "Background": "AmberPhosphor",
+                "Style": "Bold"
               },
-              "HotFocus": {
-                "Foreground": "BrightRed",
-                "Background": "White"
+              "Active": {
+                "Foreground": "Black",
+                "Background": "AmberPhosphor",
+                "Style": "Bold"
               },
-              "Disabled": {
-                "Foreground": "Gray",
-                "Background": "White"
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "AmberPhosphor",
+                "Style": "None"
+              },
+              "Editable": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "None"
+              },
+              "ReadOnly": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint"
               }
             }
           },
           {
             "Error": {
               "Normal": {
-                "Foreground": "BrightYellow",
-                "Background": "DarkGray"
-              },
-              "Focus": {
-                "Foreground": "DarkGray",
-                "Background": "BrightYellow"
-              },
-              "HotNormal": {
-                "Foreground": "BrightYellow",
-                "Background": "DarkGray"
-              },
-              "HotFocus": {
-                "Foreground": "Red",
-                "Background": "BrightYellow"
-              },
-              "Disabled": {
-                "Foreground": "DarkGray",
-                "Background": "Gray"
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Active": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "Bold,Italic"
+              },
+              "Highlight": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Black",
+                "Style": "Italic"
+              },
+              "Editable": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "Italic"
+              },
+              "ReadOnly": {
+                "Foreground": "AmberPhosphor",
+                "Background": "Charcoal",
+                "Style": "Faint,Italic"
               }
             }
           }
@@ -591,14 +1016,151 @@
       }
     },
     {
-      "Black & White": {
+      "8-Bit": {
         "Dialog.DefaultShadow": "None",
         "FrameView.DefaultBorderStyle": "Single",
         "Window.DefaultBorderStyle": "Single",
-        "MessageBox.DefaultButtonAlignment": "Center",
-        "MessageBox.DefaultBorderStyle": "Heavy",
+        "MessageBox.DefaultBorderStyle": "Single",
         "Button.DefaultShadow": "None",
-        "ColorSchemes": [
+        "Menuv2.DefaultBorderStyle": "None",
+        "Glyphs.LeftBracket": "[",
+        "Glyphs.RightBracket": "]",
+        "Glyphs.CheckStateChecked": "X",
+        "Glyphs.CheckStateUnChecked": "O",
+        "Glyphs.CheckStateNone": " ",
+        "Glyphs.Selected": "*",
+        "Glyphs.UnSelected": " ",
+        "Glyphs.RightArrow": ">",
+        "Glyphs.LeftArrow": "<",
+        "Glyphs.DownArrow": "v",
+        "Glyphs.UpArrow": "^",
+        "Glyphs.LeftDefaultIndicator": ">",
+        "Glyphs.RightDefaultIndicator": "<",
+        "Glyphs.BlocksMeterSegment": "#",
+        "Glyphs.ContinuousMeterSegment": " ",
+        "Glyphs.Stipple": ".",
+        "Glyphs.Diamond": "+",
+        "Glyphs.Close": "X",
+        "Glyphs.Minimize": "_",
+        "Glyphs.Maximize": "^",
+        "Glyphs.Dot": ".",
+        "Glyphs.DottedSquare": "#",
+        "Glyphs.BlackCircle": "O",
+        "Glyphs.Expand": "+",
+        "Glyphs.Collapse": "-",
+        "Glyphs.IdenticalTo": "=",
+        "Glyphs.Move": "+",
+        "Glyphs.SizeHorizontal": "-",
+        "Glyphs.SizeVertical": "|",
+        "Glyphs.SizeTopLeft": "/",
+        "Glyphs.SizeTopRight": "\\",
+        "Glyphs.SizeBottomRight": "/",
+        "Glyphs.SizeBottomLeft": "\\",
+        "Glyphs.Apple": "@",
+        "Glyphs.AppleBMP": "@",
+        "Glyphs.HLine": "-",
+        "Glyphs.VLine": "|",
+        "Glyphs.HLineDbl": "=",
+        "Glyphs.VLineDbl": "|",
+        "Glyphs.HLineHvDa2": "-",
+        "Glyphs.VLineHvDa2": "|",
+        "Glyphs.HLineHvDa3": "-",
+        "Glyphs.VLineHvDa3": "|",
+        "Glyphs.HLineHvDa4": "-",
+        "Glyphs.VLineHvDa4": "|",
+        "Glyphs.HLineDa2": "-",
+        "Glyphs.VLineDa2": "|",
+        "Glyphs.HLineDa3": "-",
+        "Glyphs.VLineDa3": "|",
+        "Glyphs.HLineDa4": "-",
+        "Glyphs.VLineDa4": "|",
+        "Glyphs.HLineHv": "=",
+        "Glyphs.VLineHv": "|",
+        "Glyphs.HalfLeftLine": "-",
+        "Glyphs.HalfTopLine": "|",
+        "Glyphs.HalfRightLine": "-",
+        "Glyphs.HalfBottomLine": "|",
+        "Glyphs.HalfLeftLineHv": "-",
+        "Glyphs.HalfTopLineHv": "|",
+        "Glyphs.HalfRightLineHv": "-",
+        "Glyphs.HalfBottomLineLt": "|",
+        "Glyphs.RightSideLineLtHv": "-",
+        "Glyphs.BottomSideLineLtHv": "|",
+        "Glyphs.LeftSideLineHvLt": "-",
+        "Glyphs.TopSideLineHvLt": "|",
+        "Glyphs.ULCorner": "+",
+        "Glyphs.ULCornerDbl": "+",
+        "Glyphs.ULCornerR": "+",
+        "Glyphs.ULCornerHv": "+",
+        "Glyphs.ULCornerHvLt": "+",
+        "Glyphs.ULCornerLtHv": "+",
+        "Glyphs.ULCornerDblSingle": "+",
+        "Glyphs.ULCornerSingleDbl": "+",
+        "Glyphs.LLCorner": "+",
+        "Glyphs.LLCornerHv": "+",
+        "Glyphs.LLCornerHvLt": "+",
+        "Glyphs.LLCornerLtHv": "+",
+        "Glyphs.LLCornerDbl": "+",
+        "Glyphs.LLCornerSingleDbl": "+",
+        "Glyphs.LLCornerDblSingle": "+",
+        "Glyphs.LLCornerR": "+",
+        "Glyphs.URCorner": "+",
+        "Glyphs.URCornerDbl": "+",
+        "Glyphs.URCornerR": "+",
+        "Glyphs.URCornerHv": "+",
+        "Glyphs.URCornerHvLt": "+",
+        "Glyphs.URCornerLtHv": "+",
+        "Glyphs.URCornerDblSingle": "+",
+        "Glyphs.URCornerSingleDbl": "+",
+        "Glyphs.LRCorner": "+",
+        "Glyphs.LRCornerDbl": "+",
+        "Glyphs.LRCornerR": "+",
+        "Glyphs.LRCornerHv": "+",
+        "Glyphs.LRCornerDblSingle": "+",
+        "Glyphs.LRCornerSingleDbl": "+",
+        "Glyphs.LRCornerLtHv": "+",
+        "Glyphs.LRCornerHvLt": "+",
+        "Glyphs.LeftTee": "+",
+        "Glyphs.LeftTeeDblH": "+",
+        "Glyphs.LeftTeeDblV": "+",
+        "Glyphs.LeftTeeDbl": "+",
+        "Glyphs.LeftTeeHvH": "+",
+        "Glyphs.LeftTeeHvV": "+",
+        "Glyphs.LeftTeeHvDblH": "+",
+        "Glyphs.RightTee": "+",
+        "Glyphs.RightTeeDblH": "+",
+        "Glyphs.RightTeeDblV": "+",
+        "Glyphs.RightTeeDbl": "+",
+        "Glyphs.RightTeeHvH": "+",
+        "Glyphs.RightTeeHvV": "+",
+        "Glyphs.RightTeeHvDblH": "+",
+        "Glyphs.TopTee": "+",
+        "Glyphs.TopTeeDblH": "+",
+        "Glyphs.TopTeeDblV": "+",
+        "Glyphs.TopTeeDbl": "+",
+        "Glyphs.TopTeeHvH": "+",
+        "Glyphs.TopTeeHvV": "+",
+        "Glyphs.TopTeeHvDblH": "+",
+        "Glyphs.BottomTee": "+",
+        "Glyphs.BottomTeeDblH": "+",
+        "Glyphs.BottomTeeDblV": "+",
+        "Glyphs.BottomTeeDbl": "+",
+        "Glyphs.BottomTeeHvH": "+",
+        "Glyphs.BottomTeeHvV": "+",
+        "Glyphs.BottomTeeHvDblH": "+",
+        "Glyphs.Cross": "+",
+        "Glyphs.CrossDblH": "+",
+        "Glyphs.CrossDblV": "+",
+        "Glyphs.CrossDbl": "+",
+        "Glyphs.CrossHvH": "+",
+        "Glyphs.CrossHvV": "+",
+        "Glyphs.CrossHv": "+",
+        "Glyphs.ShadowVerticalStart": "|",
+        "Glyphs.ShadowVertical": "|",
+        "Glyphs.ShadowHorizontalStart": "-",
+        "Glyphs.ShadowHorizontal": "-",
+        "Glyphs.ShadowHorizontalEnd": "-",
+        "Schemes": [
           {
             "TopLevel": {
               "Normal": {
@@ -620,6 +1182,26 @@
               "Disabled": {
                 "Foreground": "Black",
                 "Background": "Black"
+              },
+              "Active": {
+                "Foreground": "Black",
+                "Background": "White"
+              },
+              "HotActive": {
+                "Foreground": "White",
+                "Background": "Black"
+              },
+              "Highlight": {
+                "Foreground": "Black",
+                "Background": "White"
+              },
+              "Editable": {
+                "Foreground": "White",
+                "Background": "Black"
+              },
+              "ReadOnly": {
+                "Foreground": "White",
+                "Background": "Black"
               }
             }
           },
@@ -644,35 +1226,31 @@
               "Disabled": {
                 "Foreground": "Black",
                 "Background": "Black"
-              }
-            }
-          },
-          {
-            "Dialog": {
-              "Normal": {
+              },
+              "Active": {
                 "Foreground": "Black",
                 "Background": "White"
               },
-              "Focus": {
-                "Foreground": "White",
-                "Background": "Black"
-              },
-              "HotNormal": {
+              "HotActive": {
                 "Foreground": "White",
                 "Background": "Black"
               },
-              "HotFocus": {
+              "Highlight": {
                 "Foreground": "Black",
                 "Background": "White"
               },
-              "Disabled": {
+              "Editable": {
                 "Foreground": "White",
-                "Background": "White"
+                "Background": "Black"
+              },
+              "ReadOnly": {
+                "Foreground": "White",
+                "Background": "Black"
               }
             }
           },
           {
-            "Menu": {
+            "Dialog": {
               "Normal": {
                 "Foreground": "Black",
                 "Background": "White"
@@ -692,181 +1270,119 @@
               "Disabled": {
                 "Foreground": "White",
                 "Background": "White"
-              }
-            }
-          },
-          {
-            "Error": {
-              "Normal": {
+              },
+              "Active": {
                 "Foreground": "White",
                 "Background": "Black"
               },
-              "Focus": {
-                "Foreground": "Black",
-                "Background": "White"
-              },
-              "HotNormal": {
+              "HotActive": {
                 "Foreground": "Black",
                 "Background": "White"
               },
-              "HotFocus": {
+              "Highlight": {
                 "Foreground": "White",
                 "Background": "Black"
               },
-              "Disabled": {
+              "Editable": {
                 "Foreground": "Black",
-                "Background": "Black"
+                "Background": "White"
+              },
+              "ReadOnly": {
+                "Foreground": "Black",
+                "Background": "White"
               }
             }
-          }
-        ]
-      }
-    },
-    {
-      "Gray Scale": {
-        "Dialog.DefaultButtonAlignment": "End",
-        "Dialog.DefaultButtonAlignmentModes": "AddSpaceBetweenItems",
-        "Dialog.DefaultBorderStyle": "Heavy",
-        "Dialog.DefaultShadow": "Transparent",
-        "FrameView.DefaultBorderStyle": "Single",
-        "Window.DefaultBorderStyle": "Single",
-        "MessageBox.DefaultButtonAlignment": "Center",
-        "MessageBox.DefaultBorderStyle": "Heavy",
-        "Button.DefaultShadow": "Opaque",
-        "ColorSchemes": [
+          },
           {
-            "TopLevel": {
+            "Menu": {
               "Normal": {
-                "Foreground": "#A9A9A9", // DarkGray
-                "Background": "#505050" // DarkerGray
+                "Foreground": "Black",
+                "Background": "White"
               },
               "Focus": {
                 "Foreground": "White",
-                "Background": "#696969" // DimGray
+                "Background": "Black"
               },
               "HotNormal": {
-                "Foreground": "#808080", // Gray
-                "Background": "#505050" // DarkerGray
+                "Foreground": "White",
+                "Background": "Black"
               },
               "HotFocus": {
-                "Foreground": "White",
-                "Background": "#808080" // Gray
+                "Foreground": "Black",
+                "Background": "White"
               },
               "Disabled": {
-                "Foreground": "#505050", // DarkerGray
-                "Background": "Black"
-              }
-            }
-          },
-          {
-            "Base": {
-              "Normal": {
-                "Foreground": "#A9A9A9", // DarkGray
-                "Background": "Black"
-              },
-              "Focus": {
                 "Foreground": "White",
-                "Background": "#505050" // DarkerGray
+                "Background": "White"
               },
-              "HotNormal": {
-                "Foreground": "#808080", // Gray
+              "Active": {
+                "Foreground": "White",
                 "Background": "Black"
               },
-              "HotFocus": {
-                "Foreground": "White",
-                "Background": "#505050" // DarkerGray
+              "HotActive": {
+                "Foreground": "Black",
+                "Background": "White"
               },
-              "Disabled": {
-                "Foreground": "#696969", // DimGray
+              "Highlight": {
+                "Foreground": "White",
                 "Background": "Black"
-              }
-            }
-          },
-          {
-            "Dialog": {
-              "Normal": {
-                "Foreground": "#505050", // DarkerGray
-                "Background": "White"
               },
-              "Focus": {
+              "Editable": {
                 "Foreground": "Black",
-                "Background": "#D3D3D3" // LightGray
-              },
-              "HotNormal": {
-                "Foreground": "#808080", // Gray
                 "Background": "White"
               },
-              "HotFocus": {
+              "ReadOnly": {
                 "Foreground": "Black",
-                "Background": "#D3D3D3" // LightGray
-              },
-              "Disabled": {
-                "Foreground": "#696969", // DimGray
                 "Background": "White"
               }
             }
           },
           {
-            "Menu": {
+            "Error": {
               "Normal": {
-                "Foreground": "#D3D3D3", // LightGray
-                "Background": "#505050" // DarkerGray
+                "Foreground": "White",
+                "Background": "Black"
               },
               "Focus": {
-                "Foreground": "White",
-                "Background": "#808080" // Gray
+                "Foreground": "Black",
+                "Background": "White"
               },
               "HotNormal": {
-                "Foreground": "#808080", // Gray
-                "Background": "#505050" // DarkerGray
+                "Foreground": "Black",
+                "Background": "White"
               },
               "HotFocus": {
                 "Foreground": "White",
-                "Background": "#808080" // Gray
+                "Background": "Black"
               },
               "Disabled": {
-                "Foreground": "#505050", // DarkerGray
-                "Background": "#505050" // DarkerGray
-              }
-            }
-          },
-          {
-            "Error": {
-              "Normal": {
+                "Foreground": "Black",
+                "Background": "Black"
+              },
+              "Active": {
                 "Foreground": "Black",
                 "Background": "White"
               },
-              "Focus": {
+              "HotActive": {
                 "Foreground": "White",
                 "Background": "Black"
               },
-              "HotNormal": {
+              "Highlight": {
                 "Foreground": "Black",
-                "Background": "#D3D3D3" // LightGray
+                "Background": "White"
               },
-              "HotFocus": {
+              "Editable": {
                 "Foreground": "White",
                 "Background": "Black"
               },
-              "Disabled": {
-                "Foreground": "#696969", // DimGray
-                "Background": "White"
+              "ReadOnly": {
+                "Foreground": "White",
+                "Background": "Black"
               }
             }
           }
         ]
-      }
-    },
-    {
-      "Minimal": {
-        "Dialog.DefaultShadow": "None",
-        "FrameView.DefaultBorderStyle": "None",
-        "Window.DefaultBorderStyle": "None",
-        "MessageBox.DefaultBorderStyle": "None",
-        "Button.DefaultShadow": "None",
-        "Menuv2.DefaultBorderStyle": "None",
-        "Glyphs.LeftBracket": "[",
-        "Glyphs.RightBracket": "]"
+
       }
     }
   ]
diff --git a/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs
index b068b099a2..5d61076c0f 100644
--- a/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs
+++ b/Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs
@@ -13,9 +13,9 @@ public class AppendAutocomplete : AutocompleteBase
     public AppendAutocomplete (TextField textField)
     {
         this.textField = textField;
-        SelectionKey = KeyCode.Tab;
+        base.SelectionKey = KeyCode.Tab;
 
-        ColorScheme = new ColorScheme
+        Scheme = new Scheme
         {
             Normal = new Attribute (Color.DarkGray, Color.Black),
             Focus = new Attribute (Color.DarkGray, Color.Black),
@@ -26,10 +26,10 @@ public AppendAutocomplete (TextField textField)
     }
 
     /// <summary>
-    ///     The color used for rendering the appended text. Note that only <see cref="ColorScheme.Normal"/> is used and
+    ///     The color used for rendering the appended text. Note that only <see cref="Scheme.Normal"/> is used and
     ///     then only <see cref="Attribute.Foreground"/> (Background comes from <see cref="HostControl"/>).
     /// </summary>
-    public override ColorScheme ColorScheme { get; set; }
+    public override Scheme Scheme { get; set; }
 
     /// <inheritdoc/>
     public override View HostControl
@@ -108,8 +108,9 @@ public override void RenderOverlay (Point renderAt)
         // draw it like it's selected, even though it's not
         textField.SetAttribute (
                                new Attribute (
-                                              ColorScheme.Normal.Foreground,
-                                              textField.ColorScheme.Focus.Background
+                                              Scheme.Normal.Foreground,
+                                              textField.GetAttributeForRole(VisualRole.Focus).Background,
+                                              Scheme.Normal.Style
                                              )
                               );
         textField.Move (textField.Text.Length, 0);
diff --git a/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs b/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs
index ad51d5e225..e9026d123c 100644
--- a/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs
+++ b/Terminal.Gui/Text/Autocomplete/AutocompleteBase.cs
@@ -34,7 +34,7 @@ public abstract class AutocompleteBase : IAutocomplete
     public virtual int SelectedIdx { get; set; }
 
     /// <inheritdoc/>
-    public abstract ColorScheme ColorScheme { get; set; }
+    public abstract Scheme Scheme { get; set; }
 
     /// <inheritdoc/>
     public virtual Key SelectionKey { get; set; } = Key.Enter;
diff --git a/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs
index 88d3a80260..532fd8aa8c 100644
--- a/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs
+++ b/Terminal.Gui/Text/Autocomplete/IAutocomplete.cs
@@ -18,7 +18,7 @@ public interface IAutocomplete
     ///     The colors to use to render the overlay. Accessing this property before the Application has been initialized
     ///     will cause an error
     /// </summary>
-    ColorScheme ColorScheme { get; set; }
+    Scheme Scheme { get; set; }
 
     /// <summary>The context used by the autocomplete menu.</summary>
     AutocompleteContext Context { get; set; }
diff --git a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs
index 6eb4682c79..858e922792 100644
--- a/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs
+++ b/Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs
@@ -9,7 +9,7 @@ namespace Terminal.Gui;
 public abstract partial class PopupAutocomplete : AutocompleteBase
 {
     private bool _closed;
-    private ColorScheme _colorScheme;
+    private Scheme _scheme;
     private View _hostControl;
     private View _top;  // The _hostControl's SuperView
     private View _popup;
@@ -22,18 +22,18 @@ public abstract partial class PopupAutocomplete : AutocompleteBase
     ///     The colors to use to render the overlay. Accessing this property before the Application has been initialized
     ///     will cause an error
     /// </summary>
-    public override ColorScheme ColorScheme
+    public override Scheme Scheme
     {
         get
         {
-            if (_colorScheme is null)
+            if (_scheme is null)
             {
-                _colorScheme = Colors.ColorSchemes ["Menu"];
+                _scheme = SchemeManager.GetScheme (Schemes.Menu);
             }
 
-            return _colorScheme;
+            return _scheme;
         }
-        set => _colorScheme = value;
+        set => _scheme = value;
     }
 
     /// <summary>The host control to handle.</summary>
@@ -51,7 +51,7 @@ public override View HostControl
 
             if (_hostControl is null)
             {
-                RemovePopupFromTop();
+                RemovePopupFromTop ();
                 _top.Removed -= _top_Removed;
                 _top = null;
 
@@ -390,11 +390,11 @@ public override void RenderOverlay (Point renderAt)
         {
             if (i == SelectedIdx - ScrollOffset)
             {
-                _popup.SetAttribute (ColorScheme.Focus);
+                _popup.SetAttribute (Scheme.Focus);
             }
             else
             {
-                _popup.SetAttribute (ColorScheme.Normal);
+                _popup.SetAttribute (Scheme.Normal);
             }
 
             _popup.Move (0, i);
diff --git a/Terminal.Gui/Views/NerdFonts.cs b/Terminal.Gui/Text/NerdFonts.cs
similarity index 99%
rename from Terminal.Gui/Views/NerdFonts.cs
rename to Terminal.Gui/Text/NerdFonts.cs
index 64f20fe40b..b0ae8c917a 100644
--- a/Terminal.Gui/Views/NerdFonts.cs
+++ b/Terminal.Gui/Text/NerdFonts.cs
@@ -15,7 +15,7 @@ internal class NerdFonts
     ///     If <see langword="true"/>, enables the use of Nerd unicode symbols. This requires specific font(s) to be
     ///     installed on the users machine to work correctly.  Defaults to <see langword="false"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static bool Enable { get; set; } = false;
 
     /// <summary>Mapping of file extension to <see cref="Glyphs"/> name.</summary>
diff --git a/Terminal.Gui/Text/StringPropertyEventArgs.cs b/Terminal.Gui/Text/StringPropertyEventArgs.cs
new file mode 100644
index 0000000000..9de062d8cd
--- /dev/null
+++ b/Terminal.Gui/Text/StringPropertyEventArgs.cs
@@ -0,0 +1,21 @@
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
+
+/// <summary>Event args for <see langword="string"/> type property events</summary>
+public class StringPropertyEventArgs : CancelEventArgs
+{
+    /// <summary>Creates a new instance of the <see cref="StringPropertyEventArgs"/> class.</summary>
+    public StringPropertyEventArgs (in string? currentString, ref string? newString)
+    {
+        CurrentString = currentString;
+        NewString = newString;
+    }
+
+    /// <summary>Gets the current <see cref="String"/>.</summary>
+    public string? CurrentString { get; }
+
+    /// <summary>Gets or sets the new <see cref="String"/>.</summary>
+    public string? NewString { get; set;  }
+}
diff --git a/Terminal.Gui/View/Adornment/Adornment.cs b/Terminal.Gui/View/Adornment/Adornment.cs
index dce0e3147b..3911c18471 100644
--- a/Terminal.Gui/View/Adornment/Adornment.cs
+++ b/Terminal.Gui/View/Adornment/Adornment.cs
@@ -10,7 +10,7 @@ namespace Terminal.Gui;
 /// <remarsk>
 ///     <para>
 ///         Each of <see cref="Margin"/>, <see cref="Border"/>, and <see cref="Padding"/> has slightly different
-///         behavior relative to <see cref="ColorScheme"/>, <see cref="View.SetFocus()"/>, keyboard input, and
+///         behavior relative to <see cref="Scheme"/>, <see cref="View.SetFocus()"/>, keyboard input, and
 ///         mouse input. Each can be customized by manipulating their SubViews.
 ///     </para>
 /// </remarsk>
@@ -82,6 +82,28 @@ public Thickness Thickness
     #endregion Thickness
 
     #region View Overrides
+
+    // If a scheme is explicitly set, use that. Otherwise, use the scheme of the parent view.
+    private Scheme? _scheme;
+
+    /// <inheritdoc />
+    protected override bool OnGettingScheme (out Scheme? scheme)
+    {
+        scheme = _scheme ?? Parent?.GetScheme () ?? SchemeManager.GetScheme (Schemes.Base);
+
+        return true;
+    }
+
+    /// <param name="scheme"></param>
+    /// <inheritdoc />
+    protected override bool OnSettingScheme (in Scheme? scheme)
+    {
+        Parent?.SetNeedsDraw ();
+
+        _scheme = scheme;
+        return false;
+    }
+
     /// <summary>
     ///     Gets the rectangle that describes the area of the Adornment. The Location is always (0,0).
     ///     The size is the size of the <see cref="View.Frame"/>.
@@ -215,6 +237,37 @@ public override bool Contains (in Point location)
         return Thickness.Contains (outside, location);
     }
 
+    /// <summary>
+    ///     INTERNAL: Gets all Views (Subviews and Adornments) in the of <see cref="Adornment"/> hierarchcy that are at <paramref name="screenLocation"/>,
+    ///     regardless of whether they will be drawn or see mouse events or not. Views with <see cref="View.Visible"/> set to <see langword="false"/> will not be included.
+    ///     The list is ordered by depth. The deepest View is at the end of the list (the topmost View is at element 0).
+    /// </summary>
+    /// <param name="adornment">The root Adornment from which the search for subviews begins.</param>
+    /// <param name="screenLocation">The screen-relative location where the search for views is focused.</param>
+    /// <returns>A list of views that are located under the specified point.</returns>
+    internal static List<View?> GetViewsAtLocation (Adornment? adornment, in Point screenLocation)
+    {
+        List<View?> result = [];
+
+        if (adornment is null || adornment.Thickness == Thickness.Empty)
+        {
+            return result;
+        }
+
+        Point superViewRelativeLocation = adornment.Parent!.SuperView?.ScreenToViewport (screenLocation) ?? screenLocation;
+
+        if (adornment.Contains (superViewRelativeLocation))
+        {
+            List<View?> adornmentResult = GetViewsAtLocation (adornment as View, screenLocation);
+            if (adornmentResult.Count > 0)
+            {
+                result.AddRange (adornmentResult);
+            }
+        }
+
+        return result;
+    }
+
     #endregion View Overrides
 
     /// <inheritdoc/>
diff --git a/Terminal.Gui/View/Adornment/Border.Arrangment.cs b/Terminal.Gui/View/Adornment/Border.Arrangment.cs
new file mode 100644
index 0000000000..7baccb835e
--- /dev/null
+++ b/Terminal.Gui/View/Adornment/Border.Arrangment.cs
@@ -0,0 +1,792 @@
+#nullable enable
+using System.ComponentModel;
+using System.Diagnostics;
+
+namespace Terminal.Gui;
+
+// Border Arrange Mode
+
+public partial class Border
+{
+    internal ViewArrangement Arranging { get; set; }
+
+    private Button? _moveButton; // always top-left
+    private Button? _allSizeButton;
+    private Button? _leftSizeButton;
+    private Button? _rightSizeButton;
+    private Button? _topSizeButton;
+    private Button? _bottomSizeButton;
+
+    /// <summary>
+    ///     Starts "Arrange Mode" where <see cref="Adornment.Parent"/> can be moved and/or resized using the mouse
+    ///     or keyboard. If <paramref name="arrangement"/> is <see cref="ViewArrangement.Fixed"/> keyboard mode is enabled.
+    /// </summary>
+    /// <remarks>
+    ///     Arrange Mode is exited by the user pressing <see cref="Application.ArrangeKey"/>, <see cref="Key.Esc"/>, or by
+    ///     clicking the mouse out of the <see cref="Adornment.Parent"/>'s Frame.
+    /// </remarks>
+    /// <returns></returns>
+    public bool? EnterArrangeMode (ViewArrangement arrangement)
+    {
+        Debug.Assert (Arranging == ViewArrangement.Fixed);
+
+        if (!HasAnyArrangementOptions ())
+        {
+            return false;
+        }
+
+        // Add Commands and KeyBindings - Note it's ok these get added each time. KeyBindings are cleared in EndArrange()
+        AddArrangeModeKeyBindings ();
+
+        Application.MouseEvent += ApplicationOnMouseEvent;
+
+        // Create all necessary arrangement buttons
+        CreateArrangementButtons ();
+
+        if (arrangement == ViewArrangement.Fixed)
+        {
+            // Keyboard mode
+            SetVisibilityForKeyboardMode ();
+            Arranging = ViewArrangement.Movable;
+            CanFocus = true;
+            SetFocus ();
+        }
+        else
+        {
+            // Mouse mode
+            Arranging = arrangement;
+            SetVisibilityForMouseMode (arrangement);
+        }
+
+        if (Arranging != ViewArrangement.Fixed)
+        {
+            if (arrangement == ViewArrangement.Fixed)
+            {
+                // Keyboard mode - enable nav
+                // TODO: Keyboard mode only supports sizing from bottom/right.
+                Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
+            }
+
+            return true;
+        }
+
+        // Hack for now
+        EndArrangeMode ();
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if the parent view has any arrangement options enabled
+    /// </summary>
+    private bool HasAnyArrangementOptions ()
+    {
+        return Parent!.Arrangement.HasFlag (ViewArrangement.Movable)
+            || Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable)
+            || Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable)
+            || Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable)
+            || Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable);
+    }
+
+    /// <summary>
+    /// Creates all the buttons required for the arrange mode based on allowed arrangement options
+    /// </summary>
+    private void CreateArrangementButtons ()
+    {
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
+        {
+            _moveButton = CreateArrangementButton ("moveButton", Glyphs.Move, 0, 0, ViewArrangement.Movable);
+        }
+
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.Resizable))
+        {
+            _allSizeButton = CreateArrangementButton (
+                "allSizeButton",
+                Glyphs.SizeBottomRight,
+                Pos.AnchorEnd (),
+                Pos.AnchorEnd (),
+                ViewArrangement.Resizable);
+        }
+
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable))
+        {
+            _topSizeButton = CreateArrangementButton (
+                "topSizeButton",
+                Glyphs.SizeVertical,
+                Pos.Center () + Parent!.Margin!.Thickness.Horizontal,
+                0,
+                ViewArrangement.TopResizable);
+        }
+
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
+        {
+            _rightSizeButton = CreateArrangementButton (
+                "rightSizeButton",
+                Glyphs.SizeHorizontal,
+                Pos.AnchorEnd (),
+                Pos.Center () + Parent!.Margin!.Thickness.Vertical / 2,
+                ViewArrangement.RightResizable);
+        }
+
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
+        {
+            _leftSizeButton = CreateArrangementButton (
+                "leftSizeButton",
+                Glyphs.SizeHorizontal,
+                0,
+                Pos.Center () + Parent!.Margin!.Thickness.Vertical / 2,
+                ViewArrangement.LeftResizable);
+        }
+
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable))
+        {
+            _bottomSizeButton = CreateArrangementButton (
+                "bottomSizeButton",
+                Glyphs.SizeVertical,
+                Pos.Center () + Parent!.Margin!.Thickness.Horizontal / 2,
+                Pos.AnchorEnd (),
+                ViewArrangement.BottomResizable);
+        }
+    }
+
+    /// <summary>
+    /// Factory method to create a standardized arrangement button
+    /// </summary>
+    private Button CreateArrangementButton (string id, Rune glyph, Pos x, Pos y, ViewArrangement arrangement)
+    {
+        var button = new Button
+        {
+            Id = id,
+            CanFocus = true,
+            Width = 1,
+            Height = 1,
+            NoDecorations = true,
+            NoPadding = true,
+            ShadowStyle = ShadowStyle.None,
+            Text = $"{glyph}",
+            X = x,
+            Y = y,
+            Visible = false,
+            Data = arrangement
+        };
+
+        Add (button);
+        return button;
+    }
+
+    /// <summary>
+    /// Sets button visibility for keyboard arrangement mode
+    /// </summary>
+    private void SetVisibilityForKeyboardMode ()
+    {
+        if (_moveButton != null)
+        {
+            _moveButton.Visible = true;
+        }
+
+        if (_allSizeButton != null)
+        {
+            _allSizeButton.Visible = true;
+        }
+    }
+
+    /// <summary>
+    /// Sets button visibility based on the specified mouse arrangement mode
+    /// </summary>
+    private void SetVisibilityForMouseMode (ViewArrangement arrangement)
+    {
+        switch (arrangement)
+        {
+            case ViewArrangement.Movable:
+                SetVisibleButton (_moveButton);
+                break;
+
+            case ViewArrangement.RightResizable | ViewArrangement.BottomResizable:
+            case ViewArrangement.Resizable:
+                SetVisibleButton (_rightSizeButton);
+                SetVisibleButton (_bottomSizeButton);
+                if (_allSizeButton != null)
+                {
+                    _allSizeButton.X = Pos.AnchorEnd ();
+                    _allSizeButton.Y = Pos.AnchorEnd ();
+                    _allSizeButton.Visible = true;
+                }
+                break;
+
+            case ViewArrangement.LeftResizable:
+                SetVisibleButton (_leftSizeButton);
+                break;
+
+            case ViewArrangement.RightResizable:
+                SetVisibleButton (_rightSizeButton);
+                break;
+
+            case ViewArrangement.TopResizable:
+                SetVisibleButton (_topSizeButton);
+                break;
+
+            case ViewArrangement.BottomResizable:
+                SetVisibleButton (_bottomSizeButton);
+                break;
+
+            case ViewArrangement.LeftResizable | ViewArrangement.BottomResizable:
+                SetVisibleButton (_leftSizeButton);
+                SetVisibleButton (_bottomSizeButton);
+                if (_allSizeButton != null)
+                {
+                    _allSizeButton.X = 0;
+                    _allSizeButton.Y = Pos.AnchorEnd ();
+                    _allSizeButton.Visible = true;
+                }
+                break;
+
+            case ViewArrangement.LeftResizable | ViewArrangement.TopResizable:
+                SetVisibleButton (_leftSizeButton);
+                SetVisibleButton (_topSizeButton);
+                break;
+
+            case ViewArrangement.RightResizable | ViewArrangement.TopResizable:
+                SetVisibleButton (_rightSizeButton);
+                SetVisibleButton (_topSizeButton);
+                if (_allSizeButton != null)
+                {
+                    _allSizeButton.X = Pos.AnchorEnd ();
+                    _allSizeButton.Y = 0;
+                    _allSizeButton.Visible = true;
+                }
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Helper method to make a button visible if it's not null
+    /// </summary>
+    private void SetVisibleButton (Button? button)
+    {
+        if (button != null)
+        {
+            button.Visible = true;
+        }
+    }
+
+    private void AddArrangeModeKeyBindings ()
+    {
+        AddCommand (Command.Quit, EndArrangeMode);
+
+        AddCommand (
+                    Command.Up,
+                    () =>
+                    {
+                        if (Parent is null)
+                        {
+                            return false;
+                        }
+
+                        if (Arranging == ViewArrangement.Movable)
+                        {
+                            Parent.Y = Parent.Y - 1;
+                        }
+
+                        if (Arranging == ViewArrangement.Resizable)
+                        {
+                            if (Parent.Viewport.Height > 0)
+                            {
+                                Parent.Height = Parent.Height! - 1;
+                            }
+                        }
+
+                        return true;
+                    });
+
+        AddCommand (
+                    Command.Down,
+                    () =>
+                    {
+                        if (Parent is null)
+                        {
+                            return false;
+                        }
+
+                        if (Arranging == ViewArrangement.Movable)
+                        {
+                            Parent.Y = Parent.Y + 1;
+                        }
+
+                        if (Arranging == ViewArrangement.Resizable)
+                        {
+                            Parent.Height = Parent.Height! + 1;
+                        }
+
+                        return true;
+                    });
+
+        AddCommand (
+                    Command.Left,
+                    () =>
+                    {
+                        if (Parent is null)
+                        {
+                            return false;
+                        }
+
+                        if (Arranging == ViewArrangement.Movable)
+                        {
+                            Parent.X = Parent.X - 1;
+                        }
+
+                        if (Arranging == ViewArrangement.Resizable)
+                        {
+                            if (Parent.Viewport.Width > 0)
+                            {
+                                Parent.Width = Parent.Width! - 1;
+                            }
+                        }
+
+                        return true;
+                    });
+
+        AddCommand (
+                    Command.Right,
+                    () =>
+                    {
+                        if (Parent is null)
+                        {
+                            return false;
+                        }
+
+                        if (Arranging == ViewArrangement.Movable)
+                        {
+                            Parent.X = Parent.X + 1;
+                        }
+
+                        if (Arranging == ViewArrangement.Resizable)
+                        {
+                            Parent.Width = Parent.Width! + 1;
+                        }
+
+                        return true;
+                    });
+
+        AddCommand (
+                    Command.Tab,
+                    () =>
+                    {
+                        // BUGBUG: If an arrangeable view has only arrangeable subviews, it's not possible to activate
+                        // BUGBUG: ArrangeMode with keyboard for the superview.
+                        // BUGBUG: AdvanceFocus should be wise to this and when in ArrangeMode, should move across
+                        // BUGBUG: the view hierarchy.
+
+                        AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
+                        Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
+
+                        return true; // Always eat
+                    });
+
+        AddCommand (
+                    Command.BackTab,
+                    () =>
+                    {
+                        AdvanceFocus (NavigationDirection.Backward, TabBehavior.TabStop);
+                        Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
+
+                        return true; // Always eat
+                    });
+
+        HotKeyBindings.Add (Key.Esc, Command.Quit);
+        HotKeyBindings.Add (Application.ArrangeKey, Command.Quit);
+        HotKeyBindings.Add (Key.CursorUp, Command.Up);
+        HotKeyBindings.Add (Key.CursorDown, Command.Down);
+        HotKeyBindings.Add (Key.CursorLeft, Command.Left);
+        HotKeyBindings.Add (Key.CursorRight, Command.Right);
+
+        HotKeyBindings.Add (Key.Tab, Command.Tab);
+        HotKeyBindings.Add (Key.Tab.WithShift, Command.BackTab);
+    }
+
+    private void ApplicationOnMouseEvent (object? sender, MouseEventArgs e)
+    {
+        if (e.Flags != MouseFlags.Button1Clicked)
+        {
+            return;
+        }
+
+        // If mouse click is outside of Border.Thickness then exit Arrange Mode
+        // e.Position is screen relative
+        Point framePos = ScreenToFrame (e.ScreenPosition);
+
+        if (!Thickness.Contains (Frame, framePos))
+        {
+            EndArrangeMode ();
+        }
+    }
+
+    private bool? EndArrangeMode ()
+    {
+        // Debug.Assert (_arranging != ViewArrangement.Fixed);
+        Arranging = ViewArrangement.Fixed;
+
+        Application.MouseEvent -= ApplicationOnMouseEvent;
+
+        if (Application.MouseGrabView == this && _dragPosition.HasValue)
+        {
+            Application.UngrabMouse ();
+        }
+
+        // Clean up all arrangement buttons
+        DisposeSizeButton (ref _moveButton);
+        DisposeSizeButton (ref _allSizeButton);
+        DisposeSizeButton (ref _leftSizeButton);
+        DisposeSizeButton (ref _rightSizeButton);
+        DisposeSizeButton (ref _topSizeButton);
+        DisposeSizeButton (ref _bottomSizeButton);
+
+        HotKeyBindings.Clear ();
+
+        if (CanFocus)
+        {
+            CanFocus = false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Helper method to dispose and remove a button
+    /// </summary>
+    private void DisposeSizeButton (ref Button? button)
+    {
+        if (button != null)
+        {
+            Remove (button);
+            button.Dispose ();
+            button = null;
+        }
+    }
+
+
+    #region Mouse Support
+
+    private Point? _dragPosition;
+    private Point _startGrabPoint;
+
+    /// <inheritdoc/>
+    protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
+    {
+        // BUGBUG: See https://github.com/gui-cs/Terminal.Gui/issues/3312
+        if (!_dragPosition.HasValue && mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed))
+        {
+            Parent!.SetFocus ();
+
+            if (!HasAnyArrangementOptions ())
+            {
+                return false;
+            }
+
+            // Only start grabbing if the user clicks in the Thickness area
+            // Adornment.Contains takes Parent SuperView=relative coords.
+            if (Contains (new (mouseEvent.Position.X + Parent.Frame.X + Frame.X, mouseEvent.Position.Y + Parent.Frame.Y + Frame.Y)))
+            {
+                if (Arranging != ViewArrangement.Fixed)
+                {
+                    EndArrangeMode ();
+                }
+
+                // Set the start grab point to the Frame coords
+                _startGrabPoint = new (mouseEvent.Position.X + Frame.X, mouseEvent.Position.Y + Frame.Y);
+                _dragPosition = mouseEvent.Position;
+                Application.GrabMouse (this);
+
+                SetPressedHighlight (HighlightStyle);
+
+                // Determine the mode based on where the click occurred
+                ViewArrangement arrangeMode = DetermineArrangeModeFromClick ();
+                EnterArrangeMode (arrangeMode);
+
+                // BUGBUG: Should we return the result of EnterArrangeMode?
+                return true;
+            }
+
+            return true;
+        }
+
+        if (mouseEvent.Flags is (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) && Application.MouseGrabView == this)
+        {
+            if (_dragPosition.HasValue)
+            {
+                HandleDragOperation (mouseEvent);
+                return true;
+            }
+        }
+
+        if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Released) && _dragPosition.HasValue)
+        {
+            _dragPosition = null;
+            Application.UngrabMouse ();
+            SetPressedHighlight (HighlightStyle.None);
+
+            EndArrangeMode ();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Determines the arrangement mode based on where the mouse was clicked
+    /// </summary>
+    internal ViewArrangement DetermineArrangeModeFromClick ()
+    {
+        Rectangle sideRect;
+
+        // Check for left resizable region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
+        {
+            sideRect = new (Frame.X, Frame.Y + Thickness.Top, Thickness.Left, Frame.Height - Thickness.Top - Thickness.Bottom);
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return ViewArrangement.LeftResizable;
+            }
+        }
+
+        // Check for right resizable region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
+        {
+            sideRect = new (
+                Frame.X + Frame.Width - Thickness.Right,
+                Frame.Y + Thickness.Top,
+                Thickness.Right,
+                Frame.Height - Thickness.Top - Thickness.Bottom);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.RightResizable);
+            }
+        }
+
+        // Check for top resizable region (only if not movable)
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && !Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
+        {
+            sideRect = new (Frame.X + Thickness.Left, Frame.Y, Frame.Width - Thickness.Left - Thickness.Right, Thickness.Top);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.TopResizable);
+            }
+        }
+
+        // Check for bottom resizable region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable))
+        {
+            sideRect = new (
+                Frame.X + Thickness.Left,
+                Frame.Y + Frame.Height - Thickness.Bottom,
+                Frame.Width - Thickness.Left - Thickness.Right,
+                Thickness.Bottom);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.BottomResizable);
+            }
+        }
+
+        // Check for bottom-left corner region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
+        {
+            sideRect = new (Frame.X, Frame.Height - Thickness.Top, Thickness.Left, Thickness.Bottom);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.BottomResizable | ViewArrangement.LeftResizable);
+            }
+        }
+
+        // Check for bottom-right corner region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
+        {
+            sideRect = new (Frame.X + Frame.Width - Thickness.Right, Frame.Height - Thickness.Top, Thickness.Right, Thickness.Bottom);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.BottomResizable | ViewArrangement.RightResizable);
+            }
+        }
+
+        // Check for top-right corner region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
+        {
+            sideRect = new (Frame.X + Frame.Width - Thickness.Right, Frame.Y, Thickness.Right, Thickness.Top);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.TopResizable | ViewArrangement.RightResizable);
+            }
+        }
+
+        // Check for top-left corner region
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
+        {
+            sideRect = new (Frame.X, Frame.Y, Thickness.Left, Thickness.Top);
+
+            if (sideRect.Contains (_startGrabPoint))
+            {
+                return (ViewArrangement.TopResizable | ViewArrangement.LeftResizable);
+            }
+        }
+
+        // Default to movable if enabled
+        if (Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
+        {
+            return ViewArrangement.Movable;
+        }
+
+        return ViewArrangement.Fixed;
+    }
+
+    /// <summary>
+    /// Handles drag operations for moving and resizing
+    /// </summary>
+    internal void HandleDragOperation (MouseEventArgs mouseEvent)
+    {
+        if (Parent!.SuperView is null)
+        {
+            // Redraw the entire app window.
+            Application.Top!.SetNeedsDraw ();
+        }
+        else
+        {
+            Parent.SuperView.SetNeedsDraw ();
+        }
+
+        _dragPosition = mouseEvent.Position;
+
+        Point parentLoc = Parent!.SuperView?.ScreenToViewport (new (mouseEvent.ScreenPosition.X, mouseEvent.ScreenPosition.Y))
+                          ?? mouseEvent.ScreenPosition;
+
+        int minHeight = Thickness.Vertical + Parent!.Margin!.Thickness.Bottom;
+        int minWidth = Thickness.Horizontal + Parent!.Margin!.Thickness.Right;
+
+        switch (Arranging)
+        {
+            case ViewArrangement.Movable:
+                Parent.X = parentLoc.X - _startGrabPoint.X;
+                Parent.Y = parentLoc.Y - _startGrabPoint.Y;
+                break;
+
+            case ViewArrangement.TopResizable:
+                // Get how much the mouse has moved since the start of the drag
+                // and adjust the height of the parent by that amount
+                int deltaY = parentLoc.Y - Parent.Frame.Y;
+                int newHeight = Math.Max (minHeight, Parent.Frame.Height - deltaY);
+
+                if (newHeight != Parent.Frame.Height)
+                {
+                    Parent.Height = newHeight;
+                    Parent.Y = parentLoc.Y - _startGrabPoint.Y;
+                }
+                break;
+
+            case ViewArrangement.BottomResizable:
+                Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
+                break;
+
+            case ViewArrangement.LeftResizable:
+                // Get how much the mouse has moved since the start of the drag
+                // and adjust the width of the parent by that amount
+                int deltaX = parentLoc.X - Parent.Frame.X;
+                int newWidth = Math.Max (minWidth, Parent.Frame.Width - deltaX);
+
+                if (newWidth != Parent.Frame.Width)
+                {
+                    Parent.Width = newWidth;
+                    Parent.X = parentLoc.X - _startGrabPoint.X;
+                }
+                break;
+
+            case ViewArrangement.RightResizable:
+                Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
+                break;
+
+            case ViewArrangement.BottomResizable | ViewArrangement.RightResizable:
+                Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
+                Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
+                break;
+
+            case ViewArrangement.BottomResizable | ViewArrangement.LeftResizable:
+                int dX = parentLoc.X - Parent.Frame.X;
+                int newW = Math.Max (minWidth, Parent.Frame.Width - dX);
+
+                if (newW != Parent.Frame.Width)
+                {
+                    Parent.Width = newW;
+                    Parent.X = parentLoc.X - _startGrabPoint.X;
+                }
+
+                Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
+                break;
+
+            case ViewArrangement.TopResizable | ViewArrangement.RightResizable:
+                int dY = parentLoc.Y - Parent.Frame.Y;
+                int newH = Math.Max (minHeight, Parent.Frame.Height - dY);
+
+                if (newH != Parent.Frame.Height)
+                {
+                    Parent.Height = newH;
+                    Parent.Y = parentLoc.Y - _startGrabPoint.Y;
+                }
+
+                Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
+                break;
+
+            case ViewArrangement.TopResizable | ViewArrangement.LeftResizable:
+                int dY2 = parentLoc.Y - Parent.Frame.Y;
+                int newH2 = Math.Max (minHeight, Parent.Frame.Height - dY2);
+
+                if (newH2 != Parent.Frame.Height)
+                {
+                    Parent.Height = newH2;
+                    Parent.Y = parentLoc.Y - _startGrabPoint.Y;
+                }
+
+                int dX2 = parentLoc.X - Parent.Frame.X;
+                int newW2 = Math.Max (minWidth, Parent.Frame.Width - dX2);
+
+                if (newW2 != Parent.Frame.Width)
+                {
+                    Parent.Width = newW2;
+                    Parent.X = parentLoc.X - _startGrabPoint.X;
+                }
+                break;
+        }
+    }
+
+    private void Application_GrabbingMouse (object? sender, GrabMouseEventArgs e)
+    {
+        if (Application.MouseGrabView == this && _dragPosition.HasValue)
+        {
+            e.Cancel = true;
+        }
+    }
+
+    private void Application_UnGrabbingMouse (object? sender, GrabMouseEventArgs e)
+    {
+        if (Application.MouseGrabView == this && _dragPosition.HasValue)
+        {
+            e.Cancel = true;
+        }
+    }
+
+    #endregion Mouse Support
+
+
+
+    /// <inheritdoc/>
+    protected override void Dispose (bool disposing)
+    {
+        Application.GrabbingMouse -= Application_GrabbingMouse;
+        Application.UnGrabbingMouse -= Application_UnGrabbingMouse;
+
+        _dragPosition = null;
+        base.Dispose (disposing);
+    }
+}
diff --git a/Terminal.Gui/View/Adornment/Border.cs b/Terminal.Gui/View/Adornment/Border.cs
index c5c2482aa3..4afd993bcb 100644
--- a/Terminal.Gui/View/Adornment/Border.cs
+++ b/Terminal.Gui/View/Adornment/Border.cs
@@ -30,8 +30,11 @@ namespace Terminal.Gui;
 ///             └────────┘
 ///         </example>
 ///     </para>
+///     <para>
+///         The Border provides keyboard and mouse support for moving and resizing the View. See <see cref="ViewArrangement"/>.
+///     </para>
 /// </remarks>
-public class Border : Adornment
+public partial class Border : Adornment
 {
     private LineStyle? _lineStyle;
 
@@ -51,11 +54,11 @@ public Border (View parent) : base (parent)
         Application.UnGrabbingMouse += Application_UnGrabbingMouse;
 
         HighlightStyle |= HighlightStyle.Pressed;
-        Highlight += Border_Highlight;
 
         ThicknessChanged += OnThicknessChanged;
     }
 
+
     // TODO: Move DrawIndicator out of Border and into View
 
     private void OnThicknessChanged (object? sender, EventArgs e)
@@ -72,7 +75,7 @@ private void ShowHideDrawIndicator ()
         {
             if (DrawIndicator is null)
             {
-                DrawIndicator = new()
+                DrawIndicator = new ()
                 {
                     Id = "DrawIndicator",
                     X = 1,
@@ -159,20 +162,6 @@ private void OnLayoutStarted (object sender, LayoutEventArgs e)
 }
 #endif
 
-    /// <summary>
-    ///     The color scheme for the Border. If set to <see langword="null"/>, gets the <see cref="Adornment.Parent"/>
-    ///     scheme. color scheme.
-    /// </summary>
-    public override ColorScheme? ColorScheme
-    {
-        get => base.ColorScheme ?? Parent?.ColorScheme;
-        set
-        {
-            base.ColorScheme = value;
-            Parent?.SetNeedsDraw ();
-        }
-    }
-
     internal Rectangle GetBorderRectangle ()
     {
         Rectangle screenRect = ViewportToScreen (Viewport);
@@ -245,391 +234,6 @@ public BorderSettings Settings
         }
     }
 
-    #region Mouse Support
-
-    private Color? _savedForeColor;
-
-    private void Border_Highlight (object? sender, CancelEventArgs<HighlightStyle> e)
-    {
-        if (!Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
-        {
-            e.Cancel = true;
-
-            return;
-        }
-
-        if (e.NewValue.HasFlag (HighlightStyle.Pressed))
-        {
-            if (!_savedForeColor.HasValue)
-            {
-                _savedForeColor = ColorScheme!.Normal.Foreground;
-            }
-
-            var cs = new ColorScheme (ColorScheme)
-            {
-                Normal = new (ColorScheme!.Normal.Foreground.GetHighlightColor (), ColorScheme.Normal.Background)
-            };
-            ColorScheme = cs;
-        }
-
-        if (e.NewValue == HighlightStyle.None && _savedForeColor.HasValue)
-        {
-            var cs = new ColorScheme (ColorScheme)
-            {
-                Normal = new (_savedForeColor.Value, ColorScheme!.Normal.Background)
-            };
-            ColorScheme = cs;
-        }
-
-        Parent?.SetNeedsDraw ();
-        e.Cancel = true;
-    }
-
-    private Point? _dragPosition;
-    private Point _startGrabPoint;
-
-    /// <inheritdoc/>
-    protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
-    {
-        // BUGBUG: See https://github.com/gui-cs/Terminal.Gui/issues/3312
-        if (!_dragPosition.HasValue && mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed)
-
-            // HACK: Prevents Window from being draggable if it's Top
-            //&& Parent is Toplevel { Modal: true }
-           )
-        {
-            Parent!.SetFocus ();
-
-            if (!Parent!.Arrangement.HasFlag (ViewArrangement.Movable)
-                && !Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable)
-                && !Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable)
-                && !Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable)
-                && !Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable)
-               )
-            {
-                return false;
-            }
-
-            // Only start grabbing if the user clicks in the Thickness area
-            // Adornment.Contains takes Parent SuperView=relative coords.
-            if (Contains (new (mouseEvent.Position.X + Parent.Frame.X + Frame.X, mouseEvent.Position.Y + Parent.Frame.Y + Frame.Y)))
-            {
-                if (Arranging != ViewArrangement.Fixed)
-                {
-                    EndArrangeMode ();
-                }
-
-                // Set the start grab point to the Frame coords
-                _startGrabPoint = new (mouseEvent.Position.X + Frame.X, mouseEvent.Position.Y + Frame.Y);
-                _dragPosition = mouseEvent.Position;
-                Application.GrabMouse (this);
-
-                SetPressedHighlight (HighlightStyle);
-
-                // Arrange Mode -
-                // TODO: This code can be refactored to be more readable and maintainable.
-
-                // If not resizable, but movable: Drag anywhere is move
-                // If resizable and movable: Drag on top is move, other 3 sides are size
-                // If not movable, but resizable: Drag on any side sizes.
-
-                // Get rectangle representing Thickness.Top
-                // If mouse is in that rectangle, set _arranging to ViewArrangement.Movable
-                Rectangle sideRect;
-
-                // If mouse is in any other rectangle, set _arranging to ViewArrangement.<side>
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
-                {
-                    sideRect = new (Frame.X, Frame.Y + Thickness.Top, Thickness.Left, Frame.Height - Thickness.Top - Thickness.Bottom);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.LeftResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
-                {
-                    sideRect = new (
-                                    Frame.X + Frame.Width - Thickness.Right,
-                                    Frame.Y + Thickness.Top,
-                                    Thickness.Right,
-                                    Frame.Height - Thickness.Top - Thickness.Bottom);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.RightResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && !Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
-                {
-                    sideRect = new (Frame.X + Thickness.Left, Frame.Y, Frame.Width - Thickness.Left - Thickness.Right, Thickness.Top);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.TopResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable))
-                {
-                    sideRect = new (
-                                    Frame.X + Thickness.Left,
-                                    Frame.Y + Frame.Height - Thickness.Bottom,
-                                    Frame.Width - Thickness.Left - Thickness.Right,
-                                    Thickness.Bottom);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.BottomResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
-                {
-                    sideRect = new (Frame.X, Frame.Height - Thickness.Top, Thickness.Left, Thickness.Bottom);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.BottomResizable | ViewArrangement.LeftResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
-                {
-                    sideRect = new (Frame.X + Frame.Width - Thickness.Right, Frame.Height - Thickness.Top, Thickness.Right, Thickness.Bottom);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.BottomResizable | ViewArrangement.RightResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
-                {
-                    sideRect = new (Frame.X + Frame.Width - Thickness.Right, Frame.Y, Thickness.Right, Thickness.Top);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.TopResizable | ViewArrangement.RightResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable) && Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
-                {
-                    sideRect = new (Frame.X, Frame.Y, Thickness.Left, Thickness.Top);
-
-                    if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.TopResizable | ViewArrangement.LeftResizable);
-
-                        return true;
-                    }
-                }
-
-                if (Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
-                {
-                    //sideRect = new (Frame.X + Thickness.Left, Frame.Y, Frame.Width - Thickness.Left - Thickness.Right, Thickness.Top);
-
-                    //if (sideRect.Contains (_startGrabPoint))
-                    {
-                        EnterArrangeMode (ViewArrangement.Movable);
-
-                        return true;
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        if (mouseEvent.Flags is (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) && Application.MouseGrabView == this)
-        {
-            if (_dragPosition.HasValue)
-            {
-                if (Parent!.SuperView is null)
-                {
-                    // Redraw the entire app window.
-                    Application.Top!.SetNeedsDraw ();
-                }
-                else
-                {
-                    Parent.SuperView.SetNeedsDraw ();
-                }
-
-                _dragPosition = mouseEvent.Position;
-
-                Point parentLoc = Parent.SuperView?.ScreenToViewport (new (mouseEvent.ScreenPosition.X, mouseEvent.ScreenPosition.Y))
-                                  ?? mouseEvent.ScreenPosition;
-
-                int minHeight = Thickness.Vertical + Parent!.Margin!.Thickness.Bottom;
-                int minWidth = Thickness.Horizontal + Parent!.Margin!.Thickness.Right;
-
-                // TODO: This code can be refactored to be more readable and maintainable.
-                switch (Arranging)
-                {
-                    case ViewArrangement.Movable:
-
-                        GetLocationEnsuringFullVisibility (
-                                                           Parent,
-                                                           parentLoc.X - _startGrabPoint.X,
-                                                           parentLoc.Y - _startGrabPoint.Y,
-                                                           out int nx,
-                                                           out int ny
-
-                                                           //,
-                                                           // out _
-                                                          );
-
-                        Parent.X = parentLoc.X - _startGrabPoint.X;
-                        Parent.Y = parentLoc.Y - _startGrabPoint.Y;
-
-                        break;
-
-                    case ViewArrangement.TopResizable:
-                        // Get how much the mouse has moved since the start of the drag
-                        // and adjust the height of the parent by that amount
-                        int deltaY = parentLoc.Y - Parent.Frame.Y;
-                        int newHeight = Math.Max (minHeight, Parent.Frame.Height - deltaY);
-
-                        if (newHeight != Parent.Frame.Height)
-                        {
-                            Parent.Height = newHeight;
-                            Parent.Y = parentLoc.Y - _startGrabPoint.Y;
-                        }
-
-                        break;
-
-                    case ViewArrangement.BottomResizable:
-                        Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
-
-                        break;
-
-                    case ViewArrangement.LeftResizable:
-                        // Get how much the mouse has moved since the start of the drag
-                        // and adjust the height of the parent by that amount
-                        int deltaX = parentLoc.X - Parent.Frame.X;
-                        int newWidth = Math.Max (minWidth, Parent.Frame.Width - deltaX);
-
-                        if (newWidth != Parent.Frame.Width)
-                        {
-                            Parent.Width = newWidth;
-                            Parent.X = parentLoc.X - _startGrabPoint.X;
-                        }
-
-                        break;
-
-                    case ViewArrangement.RightResizable:
-                        Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
-
-                        break;
-
-                    case ViewArrangement.BottomResizable | ViewArrangement.RightResizable:
-                        Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
-                        Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
-
-                        break;
-
-                    case ViewArrangement.BottomResizable | ViewArrangement.LeftResizable:
-                        int dX = parentLoc.X - Parent.Frame.X;
-                        int newW = Math.Max (minWidth, Parent.Frame.Width - dX);
-
-                        if (newW != Parent.Frame.Width)
-                        {
-                            Parent.Width = newW;
-                            Parent.X = parentLoc.X - _startGrabPoint.X;
-                        }
-
-                        Parent.Height = Math.Max (minHeight, parentLoc.Y - Parent.Frame.Y + Parent!.Margin.Thickness.Bottom + 1);
-
-                        break;
-
-                    case ViewArrangement.TopResizable | ViewArrangement.RightResizable:
-                        int dY = parentLoc.Y - Parent.Frame.Y;
-                        int newH = Math.Max (minHeight, Parent.Frame.Height - dY);
-
-                        if (newH != Parent.Frame.Height)
-                        {
-                            Parent.Height = newH;
-                            Parent.Y = parentLoc.Y - _startGrabPoint.Y;
-                        }
-
-                        Parent.Width = Math.Max (minWidth, parentLoc.X - Parent.Frame.X + Parent!.Margin.Thickness.Right + 1);
-
-                        break;
-
-                    case ViewArrangement.TopResizable | ViewArrangement.LeftResizable:
-                        int dY2 = parentLoc.Y - Parent.Frame.Y;
-                        int newH2 = Math.Max (minHeight, Parent.Frame.Height - dY2);
-
-                        if (newH2 != Parent.Frame.Height)
-                        {
-                            Parent.Height = newH2;
-                            Parent.Y = parentLoc.Y - _startGrabPoint.Y;
-                        }
-
-                        int dX2 = parentLoc.X - Parent.Frame.X;
-                        int newW2 = Math.Max (minWidth, Parent.Frame.Width - dX2);
-
-                        if (newW2 != Parent.Frame.Width)
-                        {
-                            Parent.Width = newW2;
-                            Parent.X = parentLoc.X - _startGrabPoint.X;
-                        }
-
-                        break;
-                }
-
-                return true;
-            }
-        }
-
-        if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Released) && _dragPosition.HasValue)
-        {
-            _dragPosition = null;
-            Application.UngrabMouse ();
-            SetPressedHighlight (HighlightStyle.None);
-
-            EndArrangeMode ();
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private void Application_GrabbingMouse (object? sender, GrabMouseEventArgs e)
-    {
-        if (Application.MouseGrabView == this && _dragPosition.HasValue)
-        {
-            e.Cancel = true;
-        }
-    }
-
-    private void Application_UnGrabbingMouse (object? sender, GrabMouseEventArgs e)
-    {
-        if (Application.MouseGrabView == this && _dragPosition.HasValue)
-        {
-            e.Cancel = true;
-        }
-    }
-
-    #endregion Mouse Support
 
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
@@ -710,20 +314,12 @@ protected override bool OnDrawingContent ()
             && Settings.FastHasFlags (BorderSettings.Title)
             && !string.IsNullOrEmpty (Parent?.Title))
         {
-            Attribute focus = Parent.GetNormalColor ();
-
-            if (Parent.SuperView is { } && Parent.SuperView?.SubViews!.Count (s => s.CanFocus) > 1)
-            {
-                // Only use focus color if there are multiple focusable views
-                focus = GetFocusColor ();
-            }
-
             Rectangle titleRect = new (borderBounds.X + 2, titleY, maxTitleWidth, 1);
 
             Parent.TitleTextFormatter.Draw (
                                             titleRect,
-                                            Parent.HasFocus ? focus : GetNormalColor (),
-                                            Parent.HasFocus ? focus : GetHotNormalColor ());
+                                            GetAttributeForRole (Parent.HasFocus ? VisualRole.Focus : VisualRole.Normal),
+                                            GetAttributeForRole (Parent.HasFocus ? VisualRole.HotFocus : VisualRole.HotNormal));
             Parent?.LineCanvas.Exclude (new (titleRect));
         }
 
@@ -738,14 +334,7 @@ protected override bool OnDrawingContent ()
 
             Attribute prevAttr = Driver?.GetAttribute () ?? Attribute.Default;
 
-            if (ColorScheme is { })
-            {
-                SetAttribute (GetNormalColor ());
-            }
-            else
-            {
-                SetAttribute (Parent!.GetNormalColor ());
-            }
+            SetAttributeForRole (VisualRole.Normal);
 
             if (drawTop)
             {
@@ -905,8 +494,8 @@ protected override bool OnDrawingContent ()
                 {
                     Parent!.TitleTextFormatter.Draw (
                                                      new (borderBounds.X + 2, titleY, maxTitleWidth, 1),
-                                                     Parent.HasFocus ? Parent.GetFocusColor () : Parent.GetNormalColor (),
-                                                     Parent.HasFocus ? Parent.GetFocusColor () : Parent.GetNormalColor ());
+                                                     Parent.HasFocus ? Parent.GetAttributeForRole (VisualRole.Focus) : Parent.GetAttributeForRole (VisualRole.Normal),
+                                                     Parent.HasFocus ? Parent.GetAttributeForRole (VisualRole.Focus) : Parent.GetAttributeForRole (VisualRole.Normal));
                 }
 
                 //Left
@@ -958,7 +547,7 @@ private void SetupGradientLineCanvas (LineCanvas lc, Rectangle rect)
         var g = new Gradient (stops, steps);
 
         var fore = new GradientFill (rect, g, GradientDirection.Diagonal);
-        var back = new SolidFill (GetNormalColor ().Background);
+        var back = new SolidFill (GetAttributeForRole (VisualRole.Normal).Background);
 
         lc.Fill = new (fore, back);
     }
@@ -980,514 +569,4 @@ private static void GetAppealingGradientColors (out List<Color> stops, out List<
         steps = [15];
     }
 
-    internal ViewArrangement Arranging { get; set; }
-
-    private Button? _moveButton; // always top-left
-    private Button? _allSizeButton;
-    private Button? _leftSizeButton;
-    private Button? _rightSizeButton;
-    private Button? _topSizeButton;
-    private Button? _bottomSizeButton;
-
-    /// <summary>
-    ///     Starts "Arrange Mode" where <see cref="Adornment.Parent"/> can be moved and/or resized using the mouse
-    ///     or keyboard. If <paramref name="arrangement"/> is <see cref="ViewArrangement.Fixed"/> keyboard mode is enabled.
-    /// </summary>
-    /// <remarks>
-    ///     Arrange Mode is exited by the user pressing <see cref="Application.ArrangeKey"/>, <see cref="Key.Esc"/>, or by
-    ///     clicking
-    ///     the mouse out of the <see cref="Adornment.Parent"/>'s Frame.
-    /// </remarks>
-    /// <returns></returns>
-    public bool? EnterArrangeMode (ViewArrangement arrangement)
-    {
-        Debug.Assert (Arranging == ViewArrangement.Fixed);
-
-        if (!Parent!.Arrangement.HasFlag (ViewArrangement.Movable)
-            && !Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable)
-            && !Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable)
-            && !Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable)
-            && !Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable)
-           )
-        {
-            return false;
-        }
-
-        // Add Commands and Keybindigs - Note it's ok these get added each time. KeyBindings are cleared in EndArrange()
-        AddArrangeModeKeyBindings ();
-
-        Application.MouseEvent += ApplicationOnMouseEvent;
-
-        // TODO: This code can be refactored to be more readable and maintainable.
-
-        // Create buttons for resizing and moving
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
-        {
-            Debug.Assert (_moveButton is null);
-
-            _moveButton = new ()
-            {
-                Id = "moveButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.Move}",
-                Visible = false,
-                Data = ViewArrangement.Movable
-            };
-            Add (_moveButton);
-        }
-
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.Resizable))
-        {
-            Debug.Assert (_allSizeButton is null);
-
-            _allSizeButton = new ()
-            {
-                Id = "allSizeButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.SizeBottomRight}",
-                X = Pos.AnchorEnd (),
-                Y = Pos.AnchorEnd (),
-                Visible = false,
-                Data = ViewArrangement.Resizable
-            };
-            Add (_allSizeButton);
-        }
-
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.TopResizable))
-        {
-            Debug.Assert (_topSizeButton is null);
-
-            _topSizeButton = new ()
-            {
-                Id = "topSizeButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.SizeVertical}",
-                X = Pos.Center () + Parent!.Margin!.Thickness.Horizontal,
-                Y = 0,
-                Visible = false,
-                Data = ViewArrangement.TopResizable
-            };
-            Add (_topSizeButton);
-        }
-
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.RightResizable))
-        {
-            Debug.Assert (_rightSizeButton is null);
-
-            _rightSizeButton = new ()
-            {
-                Id = "rightSizeButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.SizeHorizontal}",
-                X = Pos.AnchorEnd (),
-                Y = Pos.Center () + Parent!.Margin!.Thickness.Vertical / 2,
-                Visible = false,
-                Data = ViewArrangement.RightResizable
-            };
-            Add (_rightSizeButton);
-        }
-
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.LeftResizable))
-        {
-            Debug.Assert (_leftSizeButton is null);
-
-            _leftSizeButton = new ()
-            {
-                Id = "leftSizeButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.SizeHorizontal}",
-                X = 0,
-                Y = Pos.Center () + Parent!.Margin!.Thickness.Vertical / 2,
-                Visible = false,
-                Data = ViewArrangement.LeftResizable
-            };
-            Add (_leftSizeButton);
-        }
-
-        if (Parent!.Arrangement.HasFlag (ViewArrangement.BottomResizable))
-        {
-            Debug.Assert (_bottomSizeButton is null);
-
-            _bottomSizeButton = new ()
-            {
-                Id = "bottomSizeButton",
-                CanFocus = true,
-                Width = 1,
-                Height = 1,
-                NoDecorations = true,
-                NoPadding = true,
-                ShadowStyle = ShadowStyle.None,
-                Text = $"{Glyphs.SizeVertical}",
-                X = Pos.Center () + Parent!.Margin!.Thickness.Horizontal / 2,
-                Y = Pos.AnchorEnd (),
-                Visible = false,
-                Data = ViewArrangement.BottomResizable
-            };
-            Add (_bottomSizeButton);
-        }
-
-        if (arrangement == ViewArrangement.Fixed)
-        {
-            // Keyboard mode
-            if (Parent!.Arrangement.HasFlag (ViewArrangement.Movable))
-            {
-                _moveButton!.Visible = true;
-            }
-
-            if (Parent!.Arrangement.HasFlag (ViewArrangement.Resizable))
-            {
-                _allSizeButton!.Visible = true;
-            }
-
-            Arranging = ViewArrangement.Movable;
-            CanFocus = true;
-            SetFocus ();
-        }
-        else
-        {
-            // Mouse mode
-            Arranging = arrangement;
-
-            switch (Arranging)
-            {
-                case ViewArrangement.Movable:
-                    _moveButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.RightResizable | ViewArrangement.BottomResizable:
-                case ViewArrangement.Resizable:
-                    _rightSizeButton!.Visible = true;
-                    _bottomSizeButton!.Visible = true;
-
-                    if (_allSizeButton is { })
-                    {
-                        _allSizeButton!.X = Pos.AnchorEnd ();
-                        _allSizeButton!.Y = Pos.AnchorEnd ();
-                        _allSizeButton!.Visible = true;
-                    }
-
-                    break;
-
-                case ViewArrangement.LeftResizable:
-                    _leftSizeButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.RightResizable:
-                    _rightSizeButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.TopResizable:
-                    _topSizeButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.BottomResizable:
-                    _bottomSizeButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.LeftResizable | ViewArrangement.BottomResizable:
-                    _rightSizeButton!.Visible = true;
-                    _bottomSizeButton!.Visible = true;
-
-                    if (_allSizeButton is { })
-                    {
-                        _allSizeButton.X = 0;
-                        _allSizeButton.Y = Pos.AnchorEnd ();
-                        _allSizeButton.Visible = true;
-                    }
-
-                    break;
-
-                case ViewArrangement.LeftResizable | ViewArrangement.TopResizable:
-                    _leftSizeButton!.Visible = true;
-                    _topSizeButton!.Visible = true;
-
-                    break;
-
-                case ViewArrangement.RightResizable | ViewArrangement.TopResizable:
-                    _rightSizeButton!.Visible = true;
-                    _topSizeButton!.Visible = true;
-
-                    if (_allSizeButton is { })
-                    {
-                        _allSizeButton.X = Pos.AnchorEnd ();
-                        _allSizeButton.Y = 0;
-                        _allSizeButton.Visible = true;
-                    }
-
-                    break;
-            }
-        }
-
-        if (Arranging != ViewArrangement.Fixed)
-        {
-            if (arrangement == ViewArrangement.Fixed)
-            {
-                // Keyboard mode - enable nav
-                // TODO: Keyboard mode only supports sizing from bottom/right.
-                Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
-            }
-
-            return true;
-        }
-
-        // Hack for now
-        EndArrangeMode ();
-
-        return false;
-    }
-
-    private void AddArrangeModeKeyBindings ()
-    {
-        AddCommand (Command.Quit, EndArrangeMode);
-
-        AddCommand (
-                    Command.Up,
-                    () =>
-                    {
-                        if (Parent is null)
-                        {
-                            return false;
-                        }
-
-                        if (Arranging == ViewArrangement.Movable)
-                        {
-                            Parent!.Y = Parent.Y - 1;
-                        }
-
-                        if (Arranging == ViewArrangement.Resizable)
-                        {
-                            if (Parent!.Viewport.Height > 0)
-                            {
-                                Parent!.Height = Parent.Height! - 1;
-                            }
-                        }
-
-                        return true;
-                    });
-
-        AddCommand (
-                    Command.Down,
-                    () =>
-                    {
-                        if (Parent is null)
-                        {
-                            return false;
-                        }
-
-                        if (Arranging == ViewArrangement.Movable)
-                        {
-                            Parent!.Y = Parent.Y + 1;
-                        }
-
-                        if (Arranging == ViewArrangement.Resizable)
-                        {
-                            Parent!.Height = Parent.Height! + 1;
-                        }
-
-                        return true;
-                    });
-
-        AddCommand (
-                    Command.Left,
-                    () =>
-                    {
-                        if (Parent is null)
-                        {
-                            return false;
-                        }
-
-                        if (Arranging == ViewArrangement.Movable)
-                        {
-                            Parent!.X = Parent.X - 1;
-                        }
-
-                        if (Arranging == ViewArrangement.Resizable)
-                        {
-                            if (Parent!.Viewport.Width > 0)
-                            {
-                                Parent!.Width = Parent.Width! - 1;
-                            }
-                        }
-
-                        return true;
-                    });
-
-        AddCommand (
-                    Command.Right,
-                    () =>
-                    {
-                        if (Parent is null)
-                        {
-                            return false;
-                        }
-
-                        if (Arranging == ViewArrangement.Movable)
-                        {
-                            Parent!.X = Parent.X + 1;
-                        }
-
-                        if (Arranging == ViewArrangement.Resizable)
-                        {
-                            Parent!.Width = Parent.Width! + 1;
-                        }
-
-                        return true;
-                    });
-
-        AddCommand (
-                    Command.Tab,
-                    () =>
-                    {
-                        // BUGBUG: If an arrangable view has only arrangable subviews, it's not possible to activate
-                        // BUGBUG: ArrangeMode with keyboard for the superview.
-                        // BUGBUG: AdvanceFocus should be wise to this and when in ArrangeMode, should move across
-                        // BUGBUG: the view hierachy.
-
-                        AdvanceFocus (NavigationDirection.Forward, TabBehavior.TabStop);
-                        Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
-
-                        return true; // Always eat
-                    });
-
-        AddCommand (
-                    Command.BackTab,
-                    () =>
-                    {
-                        AdvanceFocus (NavigationDirection.Backward, TabBehavior.TabStop);
-                        Arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
-
-                        return true; // Always eat
-                    });
-
-        HotKeyBindings.Add (Key.Esc, Command.Quit);
-        HotKeyBindings.Add (Application.ArrangeKey, Command.Quit);
-        HotKeyBindings.Add (Key.CursorUp, Command.Up);
-        HotKeyBindings.Add (Key.CursorDown, Command.Down);
-        HotKeyBindings.Add (Key.CursorLeft, Command.Left);
-        HotKeyBindings.Add (Key.CursorRight, Command.Right);
-
-        HotKeyBindings.Add (Key.Tab, Command.Tab);
-        HotKeyBindings.Add (Key.Tab.WithShift, Command.BackTab);
-    }
-
-    private void ApplicationOnMouseEvent (object? sender, MouseEventArgs e)
-    {
-        if (e.Flags != MouseFlags.Button1Clicked)
-        {
-            return;
-        }
-
-        // If mouse click is outside of Border.Thickness then exit Arrange Mode
-        // e.Position is screen relative
-        Point framePos = ScreenToFrame (e.ScreenPosition);
-
-        if (!Thickness.Contains (Frame, framePos))
-        {
-            EndArrangeMode ();
-        }
-    }
-
-    private bool? EndArrangeMode ()
-    {
-        // Debug.Assert (_arranging != ViewArrangement.Fixed);
-        Arranging = ViewArrangement.Fixed;
-
-        Application.MouseEvent -= ApplicationOnMouseEvent;
-
-        if (Application.MouseGrabView == this && _dragPosition.HasValue)
-        {
-            Application.UngrabMouse ();
-        }
-
-        if (_moveButton is { })
-        {
-            Remove (_moveButton);
-            _moveButton.Dispose ();
-            _moveButton = null;
-        }
-
-        if (_allSizeButton is { })
-        {
-            Remove (_allSizeButton);
-            _allSizeButton.Dispose ();
-            _allSizeButton = null;
-        }
-
-        if (_leftSizeButton is { })
-        {
-            Remove (_leftSizeButton);
-            _leftSizeButton.Dispose ();
-            _leftSizeButton = null;
-        }
-
-        if (_rightSizeButton is { })
-        {
-            Remove (_rightSizeButton);
-            _rightSizeButton.Dispose ();
-            _rightSizeButton = null;
-        }
-
-        if (_topSizeButton is { })
-        {
-            Remove (_topSizeButton);
-            _topSizeButton.Dispose ();
-            _topSizeButton = null;
-        }
-
-        if (_bottomSizeButton is { })
-        {
-            Remove (_bottomSizeButton);
-            _bottomSizeButton.Dispose ();
-            _bottomSizeButton = null;
-        }
-
-        HotKeyBindings.Clear ();
-
-        if (CanFocus)
-        {
-            CanFocus = false;
-        }
-
-        return true;
-    }
-
-    /// <inheritdoc/>
-    protected override void Dispose (bool disposing)
-    {
-        Application.GrabbingMouse -= Application_GrabbingMouse;
-        Application.UnGrabbingMouse -= Application_UnGrabbingMouse;
-
-        _dragPosition = null;
-        base.Dispose (disposing);
-    }
 }
diff --git a/Terminal.Gui/View/Adornment/Margin.cs b/Terminal.Gui/View/Adornment/Margin.cs
index 25ad7bf86c..9930a81043 100644
--- a/Terminal.Gui/View/Adornment/Margin.cs
+++ b/Terminal.Gui/View/Adornment/Margin.cs
@@ -5,11 +5,15 @@ namespace Terminal.Gui;
 /// <summary>The Margin for a <see cref="View"/>. Accessed via <see cref="View.Margin"/></summary>
 /// <remarks>
 ///     <para>
-///         The Margin is transparent by default. This can be overriden by explicitly setting <see cref="ColorScheme"/>.
+///         The Margin is transparent by default. This can be overriden by explicitly setting <see cref="Scheme"/>.
 ///     </para>
 ///     <para>
 ///         Margins are drawn after all other Views in the application View hierarchy are drawn.
 ///     </para>
+///     <para>
+///         Margins have <see cref="ViewportSettings.TransparentMouse"/> enabled by default and are thus
+///         transparent to the mouse. This can be overridden by explicitly setting <see cref="ViewportSettings"/>.
+///     </para>
 ///     <para>See the <see cref="Adornment"/> class.</para>
 /// </remarks>
 public class Margin : Adornment
@@ -36,6 +40,12 @@ public Margin (View parent) : base (parent)
 
         // Margin should not be focusable
         CanFocus = false;
+
+        // Margins are transparent by default
+        ViewportSettings |= ViewportSettings.Transparent;
+
+        // Margins are transparent to mouse by default
+        ViewportSettings |= ViewportSettings.TransparentMouse;
     }
 
     // When the Parent is drawn, we cache the clip region so we can draw the Margin after all other Views
@@ -48,7 +58,7 @@ public Margin (View parent) : base (parent)
 
     internal void CacheClip ()
     {
-        if (Thickness != Thickness.Empty && ShadowStyle != ShadowStyle.None)
+        if (Thickness != Thickness.Empty /*&& ShadowStyle != ShadowStyle.None*/)
         {
             // PERFORMANCE: How expensive are these clones?
             _cachedClip = GetClip ()?.Clone ();
@@ -60,11 +70,11 @@ internal void CacheClip ()
     ///     INTERNAL API - Draws the margins for the specified views. This is called by the <see cref="Application"/> on each
     ///     iteration of the main loop after all Views have been drawn.
     /// </summary>
-    /// <param name="margins"></param>
+    /// <param name="views"></param>
     /// <returns><see langword="true"/></returns>
-    internal static bool DrawMargins (IEnumerable<View> margins)
+    internal static bool DrawMargins (IEnumerable<View> views)
     {
-        Stack<View> stack = new (margins);
+        Stack<View> stack = new (views);
 
         while (stack.Count > 0)
         {
@@ -104,87 +114,13 @@ public override void BeginInit ()
         ShadowStyle = base.ShadowStyle;
     }
 
-    // TODO: We may actualy need this. Not clear what broke, if anything by commenting it out. See https://github.com/gui-cs/Terminal.Gui/issues/4016
-    /////// <summary>
-    ///////     The color scheme for the Margin. If set to <see langword="null"/> (the default), the margin will be transparent.
-    /////// </summary>
-    //public override ColorScheme? ColorScheme
+    ///// <inheritdoc />
+    //protected override bool OnGettingScheme (out Scheme? scheme)
     //{
-    //    get
-    //    {
-    //        //if (base.ColorScheme is { })
-    //        {
-    //            return base.ColorScheme;
-    //        }
-
-    //        //return (Parent?.SuperView?.ColorScheme ?? Colors.ColorSchemes ["TopLevel"])!;
-    //    }
-    //    set
-    //    {
-    //        base.ColorScheme = value;
-    //        Parent?.SetNeedsDraw ();
-    //    }
-    //}
-
-    /// <inheritdoc />
-    public override Attribute GetNormalColor ()
-    {
-        if (_colorScheme is { })
-        {
-            return _colorScheme.Normal;
-        }
-        if (Parent is { })
-        {
-            return Parent.GetNormalColor ();
-        }
+    //    scheme = Parent?.SuperView?.GetScheme () ?? SchemeManager.GetScheme (Schemes.Base);
 
-        return base.GetNormalColor ();
-    }
-
-    /// <inheritdoc />
-    public override Attribute GetHotNormalColor ()
-    {
-        if (Parent is { })
-        {
-            return Parent.GetHotNormalColor ();
-        }
-        return base.GetHotNormalColor ();
-    }
-
-    /// <inheritdoc />
-    public override Attribute GetFocusColor ()
-    {
-        if (Parent is { })
-        {
-            return Parent.GetFocusColor ();
-        }
-        return base.GetFocusColor ();
-    }
-
-    /// <inheritdoc />
-    public override Attribute GetHotFocusColor ()
-    {
-        if (Parent is { })
-        {
-            return Parent.GetHotFocusColor ();
-        }
-
-        return base.GetHotFocusColor ();
-    }
-
-    /// <inheritdoc />
-    protected override bool OnSettingNormalAttribute ()
-    {
-        if (Parent is { })
-        {
-            SetAttribute (Parent.GetNormalColor ());
-
-            return true;
-        }
-
-        return false;
-
-    }
+    //    return true;
+    //}
 
     /// <inheritdoc/>
     protected override bool OnClearingViewport ()
@@ -196,11 +132,11 @@ protected override bool OnClearingViewport ()
 
         Rectangle screen = ViewportToScreen (Viewport);
 
-        // This just draws/clears the thickness, not the insides.
-        if (Diagnostics.HasFlag (ViewDiagnosticFlags.Thickness) || base.ColorScheme is { })
+        if (Diagnostics.HasFlag (ViewDiagnosticFlags.Thickness) || HasScheme)
         {
+            // This just draws/clears the thickness, not the insides.
             // TODO: This is a hack. See https://github.com/gui-cs/Terminal.Gui/issues/4016
-            SetAttribute (GetNormalColor ());
+            //SetAttribute (GetAttributeForRole (VisualRole.Normal));
             Thickness.Draw (screen, Diagnostics, ToString ());
         }
 
@@ -213,6 +149,12 @@ protected override bool OnClearingViewport ()
         return true;
     }
 
+    /// <inheritdoc />
+    protected override bool OnDrawingText ()
+    {
+        return ViewportSettings.HasFlag(ViewportSettings.Transparent);
+    }
+
     #region Shadow
 
     private bool _pressed;
diff --git a/Terminal.Gui/View/Adornment/Padding.cs b/Terminal.Gui/View/Adornment/Padding.cs
index 2c7e8d1ab1..8af97c2f23 100644
--- a/Terminal.Gui/View/Adornment/Padding.cs
+++ b/Terminal.Gui/View/Adornment/Padding.cs
@@ -18,19 +18,6 @@ public Padding (View parent) : base (parent)
         /* Do nothing; View.CreateAdornment requires a constructor that takes a parent */
     }
 
-    /// <summary>
-    ///     The color scheme for the Padding. If set to <see langword="null"/>, gets the <see cref="Adornment.Parent"/>
-    ///     scheme. color scheme.
-    /// </summary>
-    public override ColorScheme? ColorScheme
-    {
-        get => base.ColorScheme ?? Parent?.ColorScheme;
-        set
-        {
-            base.ColorScheme = value;
-            Parent?.SetNeedsDraw ();
-        }
-    }
 
     /// <summary>Called when a mouse event occurs within the Padding.</summary>
     /// <remarks>
diff --git a/Terminal.Gui/View/Adornment/ShadowView.cs b/Terminal.Gui/View/Adornment/ShadowView.cs
index 284d6da8e7..4a9f8b61c8 100644
--- a/Terminal.Gui/View/Adornment/ShadowView.cs
+++ b/Terminal.Gui/View/Adornment/ShadowView.cs
@@ -1,7 +1,4 @@
 #nullable enable
-using Microsoft.VisualBasic;
-using System.Diagnostics;
-
 namespace Terminal.Gui;
 
 /// <summary>
@@ -12,39 +9,9 @@ internal class ShadowView : View
     private ShadowStyle _shadowStyle;
 
     /// <inheritdoc/>
-    public override Attribute GetNormalColor ()
-    {
-        if (SuperView is not Adornment adornment)
-        {
-            return base.GetNormalColor ();
-        }
-
-        var attr = Attribute.Default;
-
-        if (adornment.Parent?.SuperView is { })
-        {
-            attr = adornment.Parent.SuperView.GetNormalColor ();
-        }
-        else if (Application.Top is { })
-        {
-            attr = Application.Top.GetNormalColor ();
-        }
-
-        return new (
-                    new Attribute (
-                                   ShadowStyle == ShadowStyle.Opaque ? Color.Black : attr.Foreground.GetDarkerColor (),
-                                   ShadowStyle == ShadowStyle.Opaque ? attr.Background : attr.Background.GetDarkerColor ()));
-
-    }
-
-    /// <inheritdoc />
-    /// <inheritdoc />
-    protected override bool OnDrawingText ()
-    {
-        return true;
-    }
+    protected override bool OnDrawingText () { return true; }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override bool OnClearingViewport ()
     {
         // Prevent clearing (so we can have transparency)
@@ -54,7 +21,6 @@ protected override bool OnClearingViewport ()
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        SetAttribute (GetNormalColor ());
         switch (ShadowStyle)
         {
             case ShadowStyle.Opaque:
@@ -70,10 +36,6 @@ protected override bool OnDrawingContent ()
                 break;
 
             case ShadowStyle.Transparent:
-                //Attribute prevAttr = Driver.GetAttribute ();
-                //var attr = new Attribute (prevAttr.Foreground, prevAttr.Background);
-                //SetAttribute (attr);
-
                 if (Orientation == Orientation.Vertical)
                 {
                     DrawVerticalShadowTransparent (Viewport);
@@ -83,8 +45,6 @@ protected override bool OnDrawingContent ()
                     DrawHorizontalShadowTransparent (Viewport);
                 }
 
-                //SetAttribute (prevAttr);
-
                 break;
         }
 
@@ -103,21 +63,26 @@ public override ShadowStyle ShadowStyle
         {
             Visible = value != ShadowStyle.None;
             _shadowStyle = value;
+
+            ViewportSettings |= ViewportSettings.TransparentMouse;
         }
     }
 
     private void DrawHorizontalShadowOpaque (Rectangle rectangle)
     {
         // Draw the start glyph
+        SetAttribute (GetAttributeUnderLocation (ViewportToScreen (new Point (0, 0))));
         AddRune (0, 0, Glyphs.ShadowHorizontalStart);
 
         // Fill the rest of the rectangle with the glyph - note we skip the last since vertical will draw it
         for (var i = 1; i < rectangle.Width - 1; i++)
         {
+            SetAttribute (GetAttributeUnderLocation (ViewportToScreen (new Point (i, 0))));
             AddRune (i, 0, Glyphs.ShadowHorizontal);
         }
 
         // Last is special
+        SetAttribute (GetAttributeUnderLocation (ViewportToScreen (new Point (rectangle.Width - 1, 0))));
         AddRune (rectangle.Width - 1, 0, Glyphs.ShadowHorizontalEnd);
     }
 
@@ -130,6 +95,7 @@ private void DrawHorizontalShadowTransparent (Rectangle viewport)
             for (int c = Math.Max (0, screen.X + 1); c < screen.X + screen.Width; c++)
             {
                 Driver?.Move (c, r);
+                SetAttribute (GetAttributeUnderLocation (new (c, r)));
 
                 if (c < Driver?.Contents!.GetLength (1) && r < Driver?.Contents?.GetLength (0))
                 {
@@ -142,11 +108,13 @@ private void DrawHorizontalShadowTransparent (Rectangle viewport)
     private void DrawVerticalShadowOpaque (Rectangle viewport)
     {
         // Draw the start glyph
+        SetAttribute (GetAttributeUnderLocation (ViewportToScreen (new Point (0, 0))));
         AddRune (0, 0, Glyphs.ShadowVerticalStart);
 
         // Fill the rest of the rectangle with the glyph
         for (var i = 1; i < viewport.Height - 1; i++)
         {
+            SetAttribute (GetAttributeUnderLocation (ViewportToScreen (new Point (0, i))));
             AddRune (0, i, Glyphs.ShadowVertical);
         }
     }
@@ -155,12 +123,13 @@ private void DrawVerticalShadowTransparent (Rectangle viewport)
     {
         Rectangle screen = ViewportToScreen (Viewport);
 
-        // Fill the rest of the rectangle
+        // Fill in the rest of the rectangle
         for (int c = Math.Max (0, screen.X); c < screen.X + screen.Width; c++)
         {
             for (int r = Math.Max (0, screen.Y); r < screen.Y + viewport.Height; r++)
             {
                 Driver?.Move (c, r);
+                SetAttribute (GetAttributeUnderLocation (new (c, r)));
 
                 if (Driver?.Contents is { } && screen.X < Driver.Contents.GetLength (1) && r < Driver.Contents.GetLength (0))
                 {
@@ -169,4 +138,40 @@ private void DrawVerticalShadowTransparent (Rectangle viewport)
             }
         }
     }
+
+    private Attribute GetAttributeUnderLocation (Point location)
+    {
+        if (SuperView is not Adornment adornment
+            || location.X < 0
+            || location.X >= Application.Screen.Width
+            || location.Y < 0
+            || location.Y >= Application.Screen.Height)
+        {
+            return Attribute.Default;
+        }
+
+        Attribute attr = Driver!.Contents! [location.Y, location.X].Attribute!.Value;
+
+        var newAttribute =
+            new Attribute (
+                           ShadowStyle == ShadowStyle.Opaque ? Color.Black : attr.Foreground.GetDimColor (),
+                           ShadowStyle == ShadowStyle.Opaque ? attr.Background : attr.Background.GetDimColor (0.05),
+                           attr.Style);
+
+        // If the BG is DarkGray, GetDimColor gave up. Instead of using the attribute in the Driver under the shadow,
+        // use the Normal attribute from the View under the shadow.
+        if (newAttribute.Background == Color.DarkGray)
+        {
+            List<View?> currentViewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.Transparent);
+            View? underView = currentViewsUnderMouse!.LastOrDefault ();
+            attr = underView?.GetAttributeForRole (VisualRole.Normal) ?? Attribute.Default;
+
+            newAttribute = new (
+                                ShadowStyle == ShadowStyle.Opaque ? Color.Black : attr.Background.GetDimColor (),
+                                ShadowStyle == ShadowStyle.Opaque ? attr.Background : attr.Foreground.GetDimColor (0.25),
+                                attr.Style);
+        }
+
+        return newAttribute;
+    }
 }
diff --git a/Terminal.Gui/View/SchemeEventArgs.cs b/Terminal.Gui/View/SchemeEventArgs.cs
new file mode 100644
index 0000000000..f9b7f952fe
--- /dev/null
+++ b/Terminal.Gui/View/SchemeEventArgs.cs
@@ -0,0 +1,21 @@
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
+
+/// <summary>Event args for draw events</summary>
+public class SchemeEventArgs : CancelEventArgs
+{
+    /// <summary>Creates a new instance of the <see cref="SchemeEventArgs"/> class.</summary>
+    public SchemeEventArgs (in Scheme? currentScheme, ref Scheme? newScheme)
+    {
+        CurrentScheme = currentScheme;
+        NewScheme = newScheme;
+    }
+
+    /// <summary>Gets the View's current <see cref="Scheme"/>.</summary>
+    public Scheme? CurrentScheme { get; }
+
+    /// <summary>Gets or sets the View's new <see cref="Scheme"/>.</summary>
+    public Scheme? NewScheme { get; set;  }
+}
diff --git a/Terminal.Gui/View/View.Adornments.cs b/Terminal.Gui/View/View.Adornments.cs
index c2d7280580..44b53f973c 100644
--- a/Terminal.Gui/View/View.Adornments.cs
+++ b/Terminal.Gui/View/View.Adornments.cs
@@ -48,7 +48,7 @@ private void DisposeAdornments ()
     /// </summary>
     /// <remarks>
     ///     <para>
-    ///         The margin is typically transparent. This can be overriden by explicitly setting <see cref="ColorScheme"/>.
+    ///         The margin is typically transparent. This can be overriden by explicitly setting <see cref="Scheme"/>.
     ///     </para>
     ///     <para>
     ///         Enabling <see cref="ShadowStyle"/> will change the Thickness of the Margin to include the shadow.
diff --git a/Terminal.Gui/View/View.Attribute.cs b/Terminal.Gui/View/View.Attribute.cs
deleted file mode 100644
index 02ac0f3e5e..0000000000
--- a/Terminal.Gui/View/View.Attribute.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-using System.ComponentModel;
-
-namespace Terminal.Gui;
-
-public partial class View
-{
-    /// <summary>Selects the specified attribute as the attribute to use for future calls to AddRune and AddString.</summary>
-    /// <remarks></remarks>
-    /// <param name="attribute">THe Attribute to set.</param>
-    public Attribute SetAttribute (Attribute attribute)
-    {
-        return Driver?.SetAttribute (attribute) ?? Attribute.Default;
-    }
-
-    /// <summary>Gets the current <see cref="Attribute"/>.</summary>
-    /// <returns>The current attribute.</returns>
-    public Attribute GetAttribute () { return Driver?.GetAttribute () ?? Attribute.Default; }
-
-
-}
diff --git a/Terminal.Gui/View/View.ColorScheme.cs b/Terminal.Gui/View/View.ColorScheme.cs
deleted file mode 100644
index 14abe6fbde..0000000000
--- a/Terminal.Gui/View/View.ColorScheme.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-#nullable enable
-using System.ComponentModel;
-
-namespace Terminal.Gui;
-
-public partial class View
-{
-    // TODO: See https://github.com/gui-cs/Terminal.Gui/issues/4014
-    // TODO: See https://github.com/gui-cs/Terminal.Gui/issues/4016
-    // TODO: Enable ability to tell if ColorScheme was explicitly set; ColorScheme, as is, hides this.
-    internal ColorScheme? _colorScheme;
-
-    /// <summary>The color scheme for this view, if it is not defined, it returns the <see cref="SuperView"/>'s color scheme.</summary>
-    public virtual ColorScheme? ColorScheme
-    {
-        // BUGBUG: This prevents the ability to know if ColorScheme was explicitly set or not.
-        get => _colorScheme ?? SuperView?.ColorScheme;
-        set
-        {
-            if (_colorScheme == value)
-            {
-                return;
-            }
-
-            _colorScheme = value;
-
-            // BUGBUG: This should be in Border.cs somehow
-            if (Border is { } && Border.LineStyle != LineStyle.None && Border.ColorScheme is { })
-            {
-                Border.ColorScheme = _colorScheme;
-            }
-
-            SetNeedsDraw ();
-        }
-    }
-
-    /// <summary>Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.</summary>
-    /// <returns>
-    ///     <see cref="ColorScheme.Focus"/> if <see cref="Enabled"/> is <see langword="true"/> or
-    ///     <see cref="ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>. If it's
-    ///     overridden can return other values.
-    /// </returns>
-    public virtual Attribute GetFocusColor ()
-    {
-        Attribute currAttribute = ColorScheme?.Normal ?? Attribute.Default;
-        var newAttribute = new Attribute ();
-        CancelEventArgs<Attribute> args = new (in currAttribute, ref newAttribute);
-        GettingFocusColor?.Invoke (this, args);
-
-        if (args.Cancel)
-        {
-            return args.NewValue;
-        }
-
-        ColorScheme? cs = ColorScheme ?? new ();
-
-        return Enabled ? GetColor (cs.Focus) : cs.Disabled;
-    }
-
-    /// <summary>
-    ///     Raised the Focus Color is being retrieved, from <see cref="GetFocusColor"/>. Cancel the event and set the new
-    ///     attribute in the event args to
-    ///     a different value to change the focus color.
-    /// </summary>
-    public event EventHandler<CancelEventArgs<Attribute>>? GettingFocusColor;
-
-    /// <summary>Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.</summary>
-    /// <returns>
-    ///     <see cref="ColorScheme.Focus"/> if <see cref="Enabled"/> is <see langword="true"/> or
-    ///     <see cref="ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>. If it's
-    ///     overridden can return other values.
-    /// </returns>
-    public virtual Attribute GetHotFocusColor ()
-    {
-        Attribute currAttribute = ColorScheme?.Normal ?? Attribute.Default;
-        var newAttribute = new Attribute ();
-        CancelEventArgs<Attribute> args = new (in currAttribute, ref newAttribute);
-        GettingHotFocusColor?.Invoke (this, args);
-
-        if (args.Cancel)
-        {
-            return args.NewValue;
-        }
-
-        ColorScheme? cs = ColorScheme ?? new ();
-
-        return Enabled ? GetColor (cs.HotFocus) : cs.Disabled;
-    }
-
-    /// <summary>
-    ///     Raised the HotFocus Color is being retrieved, from <see cref="GetHotFocusColor"/>. Cancel the event and set the new
-    ///     attribute in the event args to
-    ///     a different value to change the focus color.
-    /// </summary>
-    public event EventHandler<CancelEventArgs<Attribute>>? GettingHotFocusColor;
-
-    /// <summary>Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.</summary>
-    /// <returns>
-    ///     <see cref="ColorScheme.HotNormal"/> if <see cref="Enabled"/> is <see langword="true"/> or
-    ///     <see cref="ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>. If it's
-    ///     overridden can return other values.
-    /// </returns>
-    public virtual Attribute GetHotNormalColor ()
-    {
-        Attribute currAttribute = ColorScheme?.Normal ?? Attribute.Default;
-        var newAttribute = new Attribute ();
-        CancelEventArgs<Attribute> args = new (in currAttribute, ref newAttribute);
-        GettingHotNormalColor?.Invoke (this, args);
-
-        if (args.Cancel)
-        {
-            return args.NewValue;
-        }
-
-        ColorScheme? cs = ColorScheme ?? new ();
-
-        return Enabled ? GetColor (cs.HotNormal) : cs.Disabled;
-    }
-
-    /// <summary>
-    ///     Raised the HotNormal Color is being retrieved, from <see cref="GetHotNormalColor"/>. Cancel the event and set the
-    ///     new attribute in the event args to
-    ///     a different value to change the focus color.
-    /// </summary>
-    public event EventHandler<CancelEventArgs<Attribute>>? GettingHotNormalColor;
-
-    /// <summary>Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.</summary>
-    /// <returns>
-    ///     <see cref="ColorScheme.Normal"/> if <see cref="Enabled"/> is <see langword="true"/> or
-    ///     <see cref="ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>. If it's
-    ///     overridden can return other values.
-    /// </returns>
-    public virtual Attribute GetNormalColor ()
-    {
-        Attribute currAttribute = ColorScheme?.Normal ?? Attribute.Default;
-        var newAttribute = new Attribute ();
-        CancelEventArgs<Attribute> args = new (in currAttribute, ref newAttribute);
-        GettingNormalColor?.Invoke (this, args);
-
-        if (args.Cancel)
-        {
-            return args.NewValue;
-        }
-
-        ColorScheme? cs = ColorScheme ?? new ();
-        Attribute disabled = new (cs.Disabled.Foreground, cs.Disabled.Background);
-
-        if (Diagnostics.HasFlag (ViewDiagnosticFlags.Hover) && _hovering)
-        {
-            disabled = new (disabled.Foreground.GetDarkerColor (), disabled.Background.GetDarkerColor ());
-        }
-
-        return Enabled ? GetColor (cs.Normal) : disabled;
-    }
-
-    /// <summary>
-    ///     Raised the Normal Color is being retrieved, from <see cref="GetNormalColor"/>. Cancel the event and set the new
-    ///     attribute in the event args to
-    ///     a different value to change the focus color.
-    /// </summary>
-    public event EventHandler<CancelEventArgs<Attribute>>? GettingNormalColor;
-
-    /// <summary>
-    ///     Sets the Normal attribute if the setting process is not canceled. It triggers an event and checks for
-    ///     cancellation before proceeding.
-    /// </summary>
-    public void SetNormalAttribute ()
-    {
-        if (OnSettingNormalAttribute ())
-        {
-            return;
-        }
-
-        var args = new CancelEventArgs ();
-        SettingNormalAttribute?.Invoke (this, args);
-
-        if (args.Cancel)
-        {
-            return;
-        }
-
-        if (ColorScheme is { })
-        {
-            SetAttribute (GetNormalColor ());
-        }
-    }
-
-    /// <summary>
-    ///     Called when the normal attribute for the View is to be set. This is called before the View is drawn.
-    /// </summary>
-    /// <returns><see langword="true"/> to stop default behavior.</returns>
-    protected virtual bool OnSettingNormalAttribute () { return false; }
-
-    /// <summary>Raised  when the normal attribute for the View is to be set. This is raised before the View is drawn.</summary>
-    /// <returns>
-    ///     Set <see cref="CancelEventArgs.Cancel"/> to <see langword="true"/> to stop default behavior.
-    /// </returns>
-    public event EventHandler<CancelEventArgs>? SettingNormalAttribute;
-
-    private Attribute GetColor (Attribute inputAttribute)
-    {
-        Attribute attr = inputAttribute;
-
-        if (Diagnostics.HasFlag (ViewDiagnosticFlags.Hover) && _hovering)
-        {
-            attr = new (attr.Foreground.GetDarkerColor (), attr.Background.GetDarkerColor ());
-        }
-
-        return attr;
-    }
-}
diff --git a/Terminal.Gui/View/View.Content.cs b/Terminal.Gui/View/View.Content.cs
index b9bf5a49fc..780dc51b34 100644
--- a/Terminal.Gui/View/View.Content.cs
+++ b/Terminal.Gui/View/View.Content.cs
@@ -6,8 +6,8 @@ public partial class View
     #region Content Area
 
     // nullable holder of developer specified Content Size. If null then the developer did not
-    // explicitly set it and contentsize will be calculated dynamically.
-    internal Size? _contentSize;
+    // explicitly set it and the content size will be calculated dynamically.
+    private Size? _contentSize;
 
     /// <summary>
     ///     Sets the size of the View's content.
@@ -79,6 +79,84 @@ public void SetContentSize (Size? contentSize)
     /// </returns>
     public Size GetContentSize () { return _contentSize ?? Viewport.Size; }
 
+    /// <summary>
+    ///     Gets the number of rows required for all the View's SubViews.
+    /// </summary>
+    /// <returns></returns>
+    public int GetWidthRequiredForSubViews ()
+    {
+        int max = GetContentSize ().Width;
+
+        // If ContentSizeTracksViewport is false and there are no subviews, use the explicitly set ContentSize
+        if (!ContentSizeTracksViewport && InternalSubViews.Count == 0)
+        {
+            return max;
+        }
+
+        if (max == 0)
+        {
+            max = Viewport.Width;
+        }
+
+        // Iterate through all subviews to calculate the maximum height
+        foreach (View subView in InternalSubViews)
+        {
+            if (subView.Width is { })
+            {
+                //if (subView.Height is DimAbsolute)
+                //{
+                //    max = Math.Max (max, subView.Height.GetAnchor (0));
+                //}
+                //else
+                {
+                    max = Math.Max (max, subView.X.GetAnchor (0) + subView.Width.Calculate (0, max, subView, Dimension.Width));
+                }
+            }
+        }
+
+        // Return the calculated maximum content size
+        return max;
+    }
+
+    /// <summary>
+    ///     Gets the number of rows required for all the View's SubViews.
+    /// </summary>
+    /// <returns></returns>
+    public int GetHeightRequiredForSubViews ()
+    {
+        int max = GetContentSize ().Height;
+
+        // If ContentSizeTracksViewport is false and there are no subviews, use the explicitly set ContentSize
+        if (!ContentSizeTracksViewport && InternalSubViews.Count == 0)
+        {
+            return max;
+        }
+
+        if (max == 0)
+        {
+            max = Viewport.Height;
+        }
+
+        // Iterate through all subviews to calculate the maximum height
+        foreach (View subView in InternalSubViews)
+        {
+            if (subView.Height is { })
+            {
+                //if (subView.Height is DimAbsolute)
+                //{
+                //    max = Math.Max (max, subView.Height.GetAnchor (0));
+                //}
+                //else
+                {
+                    max = Math.Max (max, subView.Y.GetAnchor (0) + subView.Height.Calculate (0, max, subView, Dimension.Height));
+                }
+            }
+        }
+
+        // Return the calculated maximum content size
+        return max;
+    }
+
     /// <summary>
     ///     Gets or sets a value indicating whether the view's content size tracks the <see cref="Viewport"/>'s
     ///     size or not.
diff --git a/Terminal.Gui/View/View.Diagnostics.cs b/Terminal.Gui/View/View.Diagnostics.cs
index 4057619d22..d935fe2835 100644
--- a/Terminal.Gui/View/View.Diagnostics.cs
+++ b/Terminal.Gui/View/View.Diagnostics.cs
@@ -8,9 +8,6 @@ public partial class View
     /// <para>
     ///     <see cref="Adornment.Diagnostics"/> gets set to this property by default, enabling <see cref="ViewDiagnosticFlags.Ruler"/> and <see cref="ViewDiagnosticFlags.Thickness"/>.
     /// </para>
-    /// <para>
-    ///     <see cref="ViewDiagnosticFlags.Hover"/> and <see cref="ViewDiagnosticFlags.DrawIndicator"/> are enabled for all Views independently of Adornments.
-    /// </para>
     /// </remarks>
     public static ViewDiagnosticFlags Diagnostics { get; set; }
 }
diff --git a/Terminal.Gui/View/View.Drawing.Attribute.cs b/Terminal.Gui/View/View.Drawing.Attribute.cs
new file mode 100644
index 0000000000..9dcd797192
--- /dev/null
+++ b/Terminal.Gui/View/View.Drawing.Attribute.cs
@@ -0,0 +1,116 @@
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
+
+public partial class View
+{
+    #region Get
+
+    /// <summary>Gets the current <see cref="Attribute"/> used by <see cref="AddRune(System.Text.Rune)"/>.</summary>
+    /// <returns>The current attribute.</returns>
+    public Attribute GetCurrentAttribute () { return Driver?.GetAttribute () ?? Attribute.Default; }
+
+    /// <summary>
+    ///     Gets the <see cref="Attribute"/> associated with a specified <see cref="VisualRole"/>
+    ///     from the <see cref="Scheme"/>.
+    ///     <para>
+    ///         Raises <see cref="OnGettingAttributeForRole"/>/<see cref="GettingAttributeForRole"/>
+    ///         which can cancel the default behavior, and optionally change the attribute in the event args.
+    ///     </para>
+    ///     <para>
+    ///     If <see cref="Enabled"/> is <see langword="false"/>, <see cref="VisualRole.Disabled"/>
+    ///     will be used instead of <paramref name="role"></paramref>.
+    ///     To override this behavior use  <see cref="OnGettingAttributeForRole"/>/<see cref="GettingAttributeForRole"/>
+    ///     to cancel the method, and return a different attribute.
+    ///     </para>
+    ///     <para>
+    ///     If <see cref="HighlightStyle"/> is not <see cref="HighlightStyle.None"/> and <see cref="MouseHovering"/> is <see langword="true"/>,
+    ///     the <see cref="VisualRole.Highlight"/> will be used instead of <paramref name="role"/>.
+    ///     To override this behavior use  <see cref="OnGettingAttributeForRole"/>/<see cref="GettingAttributeForRole"/>
+    ///     to cancel the method, and return a different attribute.
+    ///     </para>
+    /// </summary>
+    /// <param name="role">The semantic <see cref="VisualRole"/> describing the element being rendered.</param>
+    /// <returns>The corresponding <see cref="Attribute"/> from the <see cref="Scheme"/>.</returns>
+    public Attribute GetAttributeForRole (VisualRole role)
+    {
+        Attribute schemeAttribute = GetScheme ()!.GetAttributeForRole (role);
+
+        if (OnGettingAttributeForRole (role, ref schemeAttribute))
+        {
+            // The implementation may have changed the attribute
+            return schemeAttribute;
+        }
+
+        VisualRoleEventArgs args = new (role, newValue: ref schemeAttribute, currentValue: ref schemeAttribute);
+        GettingAttributeForRole?.Invoke (this, args);
+
+        if (args.Cancel)
+        {
+            // A handler may have changed the attribute
+            return args.NewValue;
+        }
+
+        if (HighlightStyle != HighlightStyle.None)
+        {
+            if (MouseHovering && HighlightStyle.HasFlag (HighlightStyle.Hover) && role != VisualRole.Highlight && role != VisualRole.Disabled)
+            {
+                schemeAttribute = GetAttributeForRole (VisualRole.Highlight);
+            }
+        }
+
+        return Enabled || role == VisualRole.Disabled ? schemeAttribute : GetAttributeForRole (VisualRole.Disabled);
+    }
+
+    /// <summary>
+    ///     Called when the Attribute for a <see cref="GetAttributeForRole(Terminal.Gui.VisualRole)"/> is being retrieved.
+    ///     Implementations can
+    ///     return <see langword="true"/> to stop further processing and optionally set the <see cref="Attribute"/> in the
+    ///     event args to a different value.
+    /// </summary>
+    /// <param name="role"></param>
+    /// <param name="currentAttribute">The current value of the Attribute for the VisualRole. This by-ref value can be changed</param>
+    /// <returns></returns>
+    protected virtual bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute) { return false; }
+
+    /// <summary>
+    ///     Raised when the Attribute for a <see cref="GetAttributeForRole(Terminal.Gui.VisualRole)"/> is being retrieved.
+    ///     Handlers should check if <see cref="CancelEventArgs.Cancel"/>
+    ///     has been set to <see langword="true"/> and do nothing if so. If Cancel is <see langword="false"/>
+    ///     a handler can set it to <see langword="true"/> to stop further processing optionally change the
+    ///     `CurrentValue` in the event args to a different value.
+    /// </summary>
+    public event EventHandler<VisualRoleEventArgs>? GettingAttributeForRole;
+
+    #endregion Get
+
+    #region Set
+
+    /// <summary>
+    ///     Selects the specified Attribute
+    ///     as the Attribute to use for subsequent calls to <see cref="AddRune(System.Text.Rune)"/> and <see cref="AddStr"/>.
+    /// </summary>
+    /// <param name="attribute">THe Attribute to set.</param>
+    /// <returns>The previously set Attribute.</returns>
+    public Attribute SetAttribute (Attribute attribute) { return Driver?.SetAttribute (attribute) ?? Attribute.Default; }
+
+    /// <summary>
+    ///     Selects the Attribute associated with the specified <see cref="VisualRole"/>
+    ///     as the Attribute to use for subsequent calls to <see cref="AddRune(System.Text.Rune)"/> and <see cref="AddStr"/>.
+    ///     <para>
+    ///         Calls <see cref="GetAttributeForRole"/> to get the Attribute associated with the specified role, which will
+    ///         raise <see cref="OnGettingAttributeForRole"/>/<see cref="GettingAttributeForRole"/>.
+    ///     </para>
+    /// </summary>
+    /// <param name="role">The semantic <see cref="VisualRole"/> describing the element being rendered.</param>
+    /// <returns>The previously set Attribute.</returns>
+    public Attribute? SetAttributeForRole (VisualRole role)
+    {
+        Attribute schemeAttribute = GetAttributeForRole (role);
+        Attribute currentAttribute = GetCurrentAttribute ();
+        return SetAttribute (schemeAttribute);
+    }
+
+    #endregion Set
+}
diff --git a/Terminal.Gui/View/View.Drawing.Clipping.cs b/Terminal.Gui/View/View.Drawing.Clipping.cs
index 3b131a614c..89b25283e8 100644
--- a/Terminal.Gui/View/View.Drawing.Clipping.cs
+++ b/Terminal.Gui/View/View.Drawing.Clipping.cs
@@ -29,9 +29,9 @@ public partial class View
     /// <param name="region"></param>
     public static void SetClip (Region? region)
     {
-        if (Driver is { } && region is { })
+        if (Application.Driver is { } && region is { })
         {
-            Driver.Clip = region;
+            Application.Driver.Clip = region;
         }
     }
 
@@ -54,9 +54,9 @@ public static void SetClip (Region? region)
     {
         Region? previous = GetClip ();
 
-        if (Driver is { })
+        if (Application.Driver is { })
         {
-            Driver.Clip = new (Application.Screen);
+            Application.Driver.Clip = new (Application.Screen);
         }
 
         return previous;
@@ -71,7 +71,7 @@ public static void SetClip (Region? region)
     ///     </para>
     /// </remarks>
     /// <param name="rectangle"></param>
-    public static void ExcludeFromClip (Rectangle rectangle) { Driver?.Clip?.Exclude (rectangle); }
+    public static void ExcludeFromClip (Rectangle rectangle) { Application.Driver?.Clip?.Exclude (rectangle); }
 
     /// <summary>
     ///     Removes the specified rectangle from the Clip.
@@ -82,7 +82,7 @@ public static void SetClip (Region? region)
     ///     </para>
     /// </remarks>
     /// <param name="region"></param>
-    public static void ExcludeFromClip (Region? region) { Driver?.Clip?.Exclude (region); }
+    public static void ExcludeFromClip (Region? region) { Application.Driver?.Clip?.Exclude (region); }
 
     /// <summary>
     ///     Changes the Clip to the intersection of the current Clip and the <see cref="Frame"/> of this View.
diff --git a/Terminal.Gui/View/View.Drawing.Primitives.cs b/Terminal.Gui/View/View.Drawing.Primitives.cs
index 153f12e644..79a648a5bb 100644
--- a/Terminal.Gui/View/View.Drawing.Primitives.cs
+++ b/Terminal.Gui/View/View.Drawing.Primitives.cs
@@ -103,26 +103,26 @@ public void DrawHotString (string text, Attribute hotColor, Attribute normalColo
     }
 
     /// <summary>
-    ///     Utility function to draw strings that contains a hotkey using a <see cref="ColorScheme"/> and the "focused"
+    ///     Utility function to draw strings that contains a hotkey using a <see cref="Scheme"/> and the "focused"
     ///     state.
     /// </summary>
     /// <param name="text">String to display, the underscore before a letter flags the next letter as the hotkey.</param>
     /// <param name="focused">
-    ///     If set to <see langword="true"/> this uses the focused colors from the color scheme, otherwise
+    ///     If set to <see langword="true"/> this uses the focused colors from the scheme, otherwise
     ///     the regular ones.
     /// </param>
     public void DrawHotString (string text, bool focused)
     {
         if (focused)
         {
-            DrawHotString (text, GetHotFocusColor (), GetFocusColor ());
+            DrawHotString (text, GetAttributeForRole (VisualRole.HotFocus), GetAttributeForRole (VisualRole.Focus));
         }
         else
         {
             DrawHotString (
                            text,
-                           Enabled ? GetHotNormalColor () : ColorScheme!.Disabled,
-                           Enabled ? GetNormalColor () : ColorScheme!.Disabled
+                           Enabled ? GetAttributeForRole (VisualRole.HotNormal) : GetScheme ()!.Disabled,
+                           Enabled ? GetAttributeForRole (VisualRole.Normal) : GetScheme ()!.Disabled
                           );
         }
     }
@@ -139,7 +139,7 @@ public void FillRect (Rectangle rect, Color? color = null)
 
         Region prevClip = AddViewportToClip ();
         Rectangle toClear = ViewportToScreen (rect);
-        Attribute prev = SetAttribute (new (color ?? GetNormalColor ().Background));
+        Attribute prev = SetAttribute (new (color ?? GetAttributeForRole (VisualRole.Normal).Background));
         Driver.FillRect (toClear);
         SetAttribute (prev);
         SetClip (prevClip);
diff --git a/Terminal.Gui/View/View.Drawing.Scheme.cs b/Terminal.Gui/View/View.Drawing.Scheme.cs
new file mode 100644
index 0000000000..14127f9fbc
--- /dev/null
+++ b/Terminal.Gui/View/View.Drawing.Scheme.cs
@@ -0,0 +1,177 @@
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
+
+public partial class View
+{
+    private string? _schemeName;
+
+    /// <summary>
+    ///     Gets or sets the name of the Scheme to use for this View. If set, it will override the scheme inherited from the
+    ///     SuperView. If a Scheme was explicitly set (<see cref="HasScheme"/> is <see langword="true"/>),
+    ///     this property will be ignored.
+    /// </summary>
+    public string? SchemeName
+    {
+        get => _schemeName;
+        set
+        {
+            if (_schemeName == value)
+            {
+                return;
+            }
+
+            if (OnSettingSchemeName (in _schemeName, ref value))
+            {
+                _schemeName = value;
+                return;
+            }
+
+            StringPropertyEventArgs args = new (in _schemeName, ref value);
+            SettingSchemeName?.Invoke (this, args);
+
+            if (args.Cancel)
+            {
+                _schemeName = args.NewString;
+
+                return;
+            }
+
+            _schemeName = value;
+        }
+    }
+
+    /// <summary>
+    ///     Called when the <see cref="Scheme"/> for the View is to be set.
+    /// </summary>
+    /// <param name="currentName"></param>
+    /// <param name="newName"></param>
+    /// <returns><see langword="true"/> to stop default behavior.</returns>
+    protected virtual bool OnSettingSchemeName (in string? currentName, ref string? newName) { return false; }
+
+    /// <summary>Raised when the <see cref="Scheme"/> for the View is to be set.</summary>
+    /// <returns>
+    ///     Set <see cref="CancelEventArgs.Cancel"/> to <see langword="true"/> to stop default behavior.
+    /// </returns>
+    public event EventHandler<StringPropertyEventArgs>? SettingSchemeName;
+
+    // Both holds the set Scheme and is used to determine if a Scheme has been set or not
+    private Scheme? _scheme;
+
+    /// <summary>
+    ///     Gets whether a Scheme has been explicitly set for this View, or if it will inherit the Scheme from its
+    ///     <see cref="SuperView"/>.
+    /// </summary>
+    public bool HasScheme => _scheme is { };
+
+    /// <summary>
+    ///     Gets the Scheme for the View. If the Scheme has not been explicitly set (see <see cref="HasScheme"/>), gets
+    ///     <see cref="SuperView"/>'s Scheme.
+    /// </summary>
+    /// <returns></returns>
+    public Scheme GetScheme ()
+    {
+        if (OnGettingScheme (out Scheme? newScheme))
+        {
+            return newScheme!;
+        }
+
+        var args = new SchemeEventArgs (in _scheme, ref newScheme);
+        GettingScheme?.Invoke (this, args);
+
+        if (args.Cancel)
+        {
+            return args.NewScheme!;
+        }
+
+        if (!HasScheme && !string.IsNullOrEmpty (SchemeName))
+        {
+            return SchemeManager.GetScheme (SchemeName);
+        }
+
+        if (!HasScheme)
+        {
+            return SuperView?.GetScheme () ?? SchemeManager.GetScheme (Schemes.Base);
+        }
+
+        return _scheme!;
+    }
+
+    /// <summary>
+    ///     Called when the <see cref="Scheme"/> for the View is being retrieved. Overrides can return <see langword="true"/>
+    ///     to
+    ///     stop further processing and optionally set <paramref name="scheme"/> to a different value.
+    /// </summary>
+    /// <returns><see langword="true"/> to stop default behavior.</returns>
+    protected virtual bool OnGettingScheme (out Scheme? scheme)
+    {
+        scheme = null;
+
+        return false;
+    }
+
+    /// <summary>
+    ///     Raised when the <see cref="Scheme"/> for the View is being retrieved. Overrides can return <see langword="true"/>
+    ///     to
+    ///     stop further processing and optionally set the <see cref="Scheme"/> in the event args to a different value.
+    /// </summary>
+    /// <returns>
+    ///     Set `Cancel` to <see langword="true"/> to stop default behavior.
+    /// </returns>
+    public event EventHandler<SchemeEventArgs>? GettingScheme;
+
+    /// <summary>
+    ///     Sets the Scheme for the View. Raises <see cref="SettingScheme"/> event before setting the scheme.
+    /// </summary>
+    /// <param name="scheme">
+    ///     The scheme to set. If <see langword="null"/> <see cref="HasScheme"/> will be
+    ///     <see langword="false"/>.
+    /// </param>
+    /// <returns><see langword="true"/> if the scheme was set.</returns>
+    public bool SetScheme (Scheme? scheme)
+    {
+        if (_scheme == scheme)
+        {
+            return false;
+        }
+
+        if (OnSettingScheme (in scheme))
+        {
+            return false;
+        }
+
+        var args = new CancelEventArgs ();
+        SettingScheme?.Invoke (this, args);
+
+        if (args.Cancel)
+        {
+            return false;
+        }
+
+        _scheme = scheme;
+
+        // BUGBUG: This should be in Border.cs somehow
+        if (Border is { } && Border.LineStyle != LineStyle.None && Border.HasScheme)
+        {
+            Border.SetScheme (_scheme);
+        }
+
+        SetNeedsDraw ();
+
+        return true;
+    }
+
+    /// <summary>
+    ///     Called when the <see cref="Scheme"/> for the View is to be set.
+    /// </summary>
+    /// <param name="scheme"></param>
+    /// <returns><see langword="true"/> to stop default behavior.</returns>
+    protected virtual bool OnSettingScheme (in Scheme? scheme) { return false; }
+
+    /// <summary>Raised when the <see cref="Scheme"/> for the View is to be set.</summary>
+    /// <returns>
+    ///     Set <see cref="CancelEventArgs.Cancel"/> to <see langword="true"/> to stop default behavior.
+    /// </returns>
+    public event EventHandler<CancelEventArgs>? SettingScheme;
+}
diff --git a/Terminal.Gui/View/View.Drawing.cs b/Terminal.Gui/View/View.Drawing.cs
index 6929034c27..7cb3bd057d 100644
--- a/Terminal.Gui/View/View.Drawing.cs
+++ b/Terminal.Gui/View/View.Drawing.cs
@@ -28,7 +28,7 @@ internal static void Draw (IEnumerable<View> views, bool force)
             view.Draw (context);
         }
 
-        // Draw the margins (those whith Shadows) last to ensure they are drawn on top of the content.
+        // Draw the margins (those with Shadows) last to ensure they are drawn on top of the content.
         Margin.DrawMargins (viewsArray);
     }
 
@@ -75,26 +75,23 @@ public void Draw (DrawContext? context = null)
             // If no context ...
             context ??= new DrawContext ();
 
-            // TODO: Simplify/optimize SetAttribute system.
-            SetNormalAttribute ();
+            SetAttributeForRole (Enabled ? VisualRole.Normal : VisualRole.Disabled);
             DoClearViewport (context);
 
             // ------------------------------------
             // Draw the subviews first (order matters: SubViews, Text, Content)
             if (SubViewNeedsDraw)
             {
-                SetNormalAttribute ();
                 DoDrawSubViews (context);
             }
 
             // ------------------------------------
             // Draw the text
-            SetNormalAttribute ();
+            SetAttributeForRole (Enabled ? VisualRole.Normal : VisualRole.Disabled);
             DoDrawText (context);
 
             // ------------------------------------
             // Draw the content
-            SetNormalAttribute ();
             DoDrawContent (context);
 
             // ------------------------------------
@@ -234,10 +231,9 @@ public void DrawAdornments ()
             Padding?.Draw ();
         }
 
-
-        if (Margin is { } && Margin.Thickness != Thickness.Empty && Margin.ShadowStyle == ShadowStyle.None)
+        if (Margin is { } && Margin.Thickness != Thickness.Empty/* && Margin.ShadowStyle == ShadowStyle.None*/)
         {
-            Margin?.Draw ();
+           //Margin?.Draw ();
         }
     }
 
@@ -251,7 +247,7 @@ private void ClearFrame ()
         // Get screen-relative coords
         Rectangle toClear = FrameToScreen ();
 
-        Attribute prev = SetAttribute (GetNormalColor ());
+        Attribute prev = SetAttribute (GetAttributeForRole (VisualRole.Normal));
         Driver.FillRect (toClear);
         SetAttribute (prev);
         SetNeedsDraw ();
@@ -347,12 +343,10 @@ public void ClearViewport (DrawContext? context = null)
             toClear = Rectangle.Intersect (toClear, visibleContent);
         }
 
-        Attribute prev = SetAttribute (GetNormalColor ());
         Driver.FillRect (toClear);
 
         // context.AddDrawnRectangle (toClear);
 
-        SetAttribute (prev);
         SetNeedsDraw ();
     }
 
@@ -430,8 +424,8 @@ public void DrawText (DrawContext? context = null)
 
         TextFormatter?.Draw (
                              drawRect,
-                             HasFocus ? GetFocusColor () : GetNormalColor (),
-                             HasFocus ? GetHotFocusColor () : GetHotNormalColor (),
+                             HasFocus ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal),
+                             HasFocus ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal),
                              Rectangle.Empty
                             );
 
@@ -628,7 +622,7 @@ public void RenderLineCanvas ()
                 // Get the entire map
                 if (p.Value is { })
                 {
-                    SetAttribute (p.Value.Value.Attribute ?? GetNormalColor ());
+                    SetAttribute (p.Value.Value.Attribute ?? GetAttributeForRole (VisualRole.Normal));
                     Driver.Move (p.Key.X, p.Key.Y);
 
                     // TODO: #2616 - Support combining sequences that don't normalize
@@ -662,11 +656,11 @@ private void DoDrawComplete (DrawContext? context)
                 ExcludeFromClip (context!.GetDrawnRegion ());
 
                 // Exclude the Border and Padding from the clip
-                ExcludeFromClip (Border?.Thickness.AsRegion (FrameToScreen ()));
-                ExcludeFromClip (Padding?.Thickness.AsRegion (FrameToScreen ()));
+                ExcludeFromClip (Border?.Thickness.AsRegion (Border.FrameToScreen ()));
+                ExcludeFromClip (Padding?.Thickness.AsRegion (Padding.FrameToScreen ()));
 
                 // QUESTION: This makes it so that no nesting of transparent views is possible, but is more correct?
-                //context = new DrawContext ();
+                context = new DrawContext ();
             }
             else
             {
@@ -681,7 +675,6 @@ private void DoDrawComplete (DrawContext? context)
                 // In the non-transparent (typical case), we want to exclude the entire view area (borderFrame) from the clip
                 ExcludeFromClip (borderFrame);
 
-                // BUGBUG: There looks like a bug in Region where this Union call is not adding the rectangle right
                 // Update context.DrawnRegion to include the entire view (borderFrame), but clipped to our SuperView's viewport
                 // This enables the SuperView to know what was drawn by this view.
                 context?.AddDrawnRectangle (borderFrame);
@@ -714,7 +707,7 @@ protected virtual void OnDrawComplete (DrawContext? context) { }
     //      TODO: If Empty, it means no need to redraw
     //      TODO: If not Empty, it means the region that needs to be redrawn
     // The viewport-relative region that needs to be redrawn. Marked internal for unit tests.
-    internal Rectangle _needsDrawRect = Rectangle.Empty;
+    internal Rectangle NeedsDrawRect { get; set; } = Rectangle.Empty;
 
     /// <summary>Gets or sets whether the view needs to be redrawn.</summary>
     /// <remarks>
@@ -729,7 +722,7 @@ protected virtual void OnDrawComplete (DrawContext? context) { }
     public bool NeedsDraw
     {
         // TODO: Figure out if we can decouple NeedsDraw from NeedsLayout.
-        get => Visible && (_needsDrawRect != Rectangle.Empty || NeedsLayout);
+        get => Visible && (NeedsDrawRect != Rectangle.Empty || NeedsLayout);
         set
         {
             if (value)
@@ -755,7 +748,7 @@ public void SetNeedsDraw ()
     {
         Rectangle viewport = Viewport;
 
-        if (!Visible || (_needsDrawRect != Rectangle.Empty && viewport.IsEmpty))
+        if (!Visible || (NeedsDrawRect != Rectangle.Empty && viewport.IsEmpty))
         {
             // This handles the case where the view has not been initialized yet
             return;
@@ -782,9 +775,9 @@ public void SetNeedsDraw (Rectangle viewPortRelativeRegion)
             return;
         }
 
-        if (_needsDrawRect.IsEmpty)
+        if (NeedsDrawRect.IsEmpty)
         {
-            _needsDrawRect = viewPortRelativeRegion;
+            NeedsDrawRect = viewPortRelativeRegion;
         }
         else
         {
@@ -792,7 +785,7 @@ public void SetNeedsDraw (Rectangle viewPortRelativeRegion)
             int y = Math.Min (Viewport.Y, viewPortRelativeRegion.Y);
             int w = Math.Max (Viewport.Width, viewPortRelativeRegion.Width);
             int h = Math.Max (Viewport.Height, viewPortRelativeRegion.Height);
-            _needsDrawRect = new (x, y, w, h);
+            NeedsDrawRect = new (x, y, w, h);
         }
 
         // Do not set on Margin - it will be drawn in a separate pass.
@@ -851,7 +844,7 @@ public void SetSubViewNeedsDraw ()
     /// <summary>Clears <see cref="NeedsDraw"/> and <see cref="SubViewNeedsDraw"/>.</summary>
     protected void ClearNeedsDraw ()
     {
-        _needsDrawRect = Rectangle.Empty;
+        NeedsDrawRect = Rectangle.Empty;
         SubViewNeedsDraw = false;
 
         if (Margin is { } && Margin.Thickness != Thickness.Empty)
diff --git a/Terminal.Gui/View/View.Hierarchy.cs b/Terminal.Gui/View/View.Hierarchy.cs
index ea017ff33b..0d9a8098d9 100644
--- a/Terminal.Gui/View/View.Hierarchy.cs
+++ b/Terminal.Gui/View/View.Hierarchy.cs
@@ -384,11 +384,11 @@ public virtual IReadOnlyCollection<TView> RemoveAll<TView> () where TView : View
     }
 
     /// <summary>
-    ///     Gets whether <paramref name="view"/> is in the SubView hierarchy of <paramref name="start"/>.
+    ///     Gets whether <paramref name="view"/> is in the View hierarchy of <paramref name="start"/>.
     /// </summary>
     /// <param name="start">The View at the start of the hierarchy.</param>
     /// <param name="view">The View to test.</param>
-    /// <param name="includeAdornments">Will search the subview hierarchy of the adornments if true.</param>
+    /// <param name="includeAdornments">Will include all <see cref="Adornment"/>s in addition to Subviews if true.</param>
     /// <returns></returns>
     public static bool IsInHierarchy (View? start, View? view, bool includeAdornments = false)
     {
diff --git a/Terminal.Gui/View/View.Layout.cs b/Terminal.Gui/View/View.Layout.cs
index 988ddeb52f..1fe4f4636e 100644
--- a/Terminal.Gui/View/View.Layout.cs
+++ b/Terminal.Gui/View/View.Layout.cs
@@ -62,7 +62,7 @@ public Rectangle Frame
                 _width = _frame!.Value.Width;
                 _height = _frame!.Value.Height;
 
-                // Implicit layout is ok here because we are setting the Frame directly.
+                // Explicit layout is ok here because we are setting the Frame directly.
                 Layout ();
             }
         }
@@ -103,6 +103,7 @@ private bool SetFrame (in Rectangle frame)
         {
             RaiseViewportChangedEvent (oldViewport);
         }
+
         return true;
     }
 
@@ -758,6 +759,7 @@ public void SetNeedsLayout ()
             Padding.SetNeedsLayout ();
         }
 
+        // TODO: Optimize this - see Setting_Thickness_Causes_Adornment_SubView_Layout
         // Use a stack to avoid recursion
         Stack<View> stack = new (SubViews);
 
@@ -1078,7 +1080,7 @@ out int ny
         }
         else
         {
-            nx = 0;//targetX;
+            nx = 0; //targetX;
         }
 
         //System.Diagnostics.Debug.WriteLine ($"nx:{nx}, rWidth:{rWidth}");
@@ -1147,9 +1149,188 @@ out int ny
             ny = 0;
         }
 
-            //System.Diagnostics.Debug.WriteLine ($"ny:{ny}, rHeight:{rHeight}");
+        //System.Diagnostics.Debug.WriteLine ($"ny:{ny}, rHeight:{rHeight}");
+
+        return superView!;
+    }
+
+    /// <summary>
+    ///     Gets the Views that are under <paramref name="screenLocation"/>, including Adornments. The list is ordered by depth. The
+    ///     deepest
+    ///     View is at the end of the list (the top most View is at element 0).
+    /// </summary>
+    /// <param name="screenLocation">Screen-relative location.</param>
+    /// <param name="excludeViewportSettingsFlags">
+    ///     If set, excludes Views that have the <see cref="ViewportSettings.Transparent"/> or <see cref="ViewportSettings.TransparentMouse"/>
+    ///     flags set in their ViewportSettings.
+    /// </param>
+    public static List<View?> GetViewsUnderLocation (in Point screenLocation, ViewportSettings excludeViewportSettingsFlags)
+    {
+        // PopoverHost - If visible, start with it instead of Top
+        if (Application.Popover?.GetActivePopover () is View { Visible: true } visiblePopover)
+        {
+            // BUGBUG: We do not traverse all visible toplevels if there's an active popover. This may be a bug.
+            List<View?> result = [];
+
+            result.AddRange (GetViewsUnderLocation (visiblePopover, screenLocation, excludeViewportSettingsFlags));
+
+            if (result.Count > 1)
+            {
+                return result;
+            }
+        }
+
+        var checkedTop = false;
+
+        // Traverse all visible toplevels, topmost first (reverse stack order)
+        if (Application.TopLevels.Count > 0)
+        {
+            foreach (Toplevel toplevel in Application.TopLevels)
+            {
+                if (toplevel.Visible && toplevel.Contains (screenLocation))
+                {
+                    List<View?> result = GetViewsUnderLocation (toplevel, screenLocation, excludeViewportSettingsFlags);
+
+                    // Only return if the result is not empty
+                    if (result.Count > 0)
+                    {
+                        return result;
+                    }
+                }
+
+                if (toplevel == Application.Top)
+                {
+                    checkedTop = true;
+                }
+            }
+        }
+
+        // Fallback: If TopLevels is empty or Top is not in TopLevels, check Top directly (for test compatibility)
+        if (!checkedTop && Application.Top is { Visible: true } top)
+        {
+            // For root toplevels, allow hit-testing even if location is outside bounds (for drag/move)
+            List<View?> result = GetViewsUnderLocation (top, screenLocation, excludeViewportSettingsFlags);
+
+            if (result.Count > 0)
+            {
+                return result;
+            }
+        }
+
+        return [];
+    }
+
+    /// <summary>
+    ///     INTERNAL: Helper for GetViewsUnderLocation that starts from a given root view.
+    ///     Gets the Views that are under <paramref name="screenLocation"/>, including Adornments. The list is ordered by depth. The
+    ///     deepest
+    ///     View is at the end of the list (the topmost View is at element 0).
+    /// </summary>
+    /// <param name="root"></param>
+    /// <param name="screenLocation">Screen-relative location.</param>
+    /// <param name="excludeViewportSettingsFlags">
+    ///     If set, excludes Views that have the <see cref="ViewportSettings.Transparent"/> or <see cref="ViewportSettings.TransparentMouse"/>
+    ///     flags set in their ViewportSettings.
+    /// </param>
+    internal static List<View?> GetViewsUnderLocation (View root, in Point screenLocation, ViewportSettings excludeViewportSettingsFlags)
+    {
+        List<View?> viewsUnderLocation = GetViewsAtLocation (root, screenLocation);
+
+        if (!excludeViewportSettingsFlags.HasFlag (ViewportSettings.Transparent) && !excludeViewportSettingsFlags.HasFlag (ViewportSettings.TransparentMouse))
+        {
+            // Only filter views if we are excluding transparent views.
+            return viewsUnderLocation;
+        }
+
+        // Remove all views that have an adornment with ViewportSettings.TransparentMouse; they are in the list
+        // because the point was in their adornment, and if the adornment is transparent, they should be removed.
+        viewsUnderLocation.RemoveAll (
+                                      v =>
+                                      {
+                                          if (v is null or Adornment)
+                                          {
+                                              return false;
+                                          }
+
+                                          bool? ret = null;
+
+                                          if (viewsUnderLocation.Contains (v.Margin)
+                                              && v.Margin!.ViewportSettings.HasFlag (excludeViewportSettingsFlags))
+                                          {
+                                              ret = true;
+                                          }
+
+                                          if (viewsUnderLocation.Contains (v.Border)
+                                              && v.Border!.ViewportSettings.HasFlag (excludeViewportSettingsFlags))
+                                          {
+                                              ret = true;
+                                          }
+
+                                          if (viewsUnderLocation.Contains (v.Padding)
+                                              && v.Padding!.ViewportSettings.HasFlag (excludeViewportSettingsFlags))
+                                          {
+                                              ret = true;
+                                          }
+
+                                          return ret is true;
+                                      });
+
+        // Now remove all views that have ViewportSettings.TransparentMouse set
+        viewsUnderLocation.RemoveAll (v => v!.ViewportSettings.HasFlag (excludeViewportSettingsFlags));
+
+        return viewsUnderLocation;
+    }
+    /// <summary>
+    ///     INTERNAL: Gets ALL Views (Subviews and Adornments) in the of <see cref="SuperView"/> hierarchcy that are at
+    ///     <paramref name="location"/>,
+    ///     regardless of whether they will be drawn or see mouse events or not. Views with <see cref="Visible"/> set to
+    ///     <see langword="false"/> will not be included.
+    ///     The list is ordered by depth. The deepest View is at the end of the list (the topmost View is at element 0).
+    /// </summary>
+    /// <param name="superView">The root view from which the search for subviews begins.</param>
+    /// <param name="location">The screen-relative location where the search for views is focused.</param>
+    /// <returns>A list of views that are located under the specified point.</returns>
+    internal static List<View?> GetViewsAtLocation (View? superView, in Point location)
+    {
+        if (superView is null || !superView.Visible)
+        {
+            return [];
+        }
+
+        List<View?> result = [];
+        Stack<View> viewsToProcess = new ();
+
+        // Start with the superview if it contains the location
+        if (superView.FrameToScreen ().Contains (location))
+        {
+            viewsToProcess.Push (superView);
+        }
+
+        while (viewsToProcess.Count > 0)
+        {
+            View currentView = viewsToProcess.Pop ();
+
+            // Add the current view to the result
+            result.Add (currentView);
 
-            return superView!;
+            // Add adornments for the current view
+            result.AddRange (Adornment.GetViewsAtLocation (currentView.Margin, location));
+            result.AddRange (Adornment.GetViewsAtLocation (currentView.Border, location));
+            result.AddRange (Adornment.GetViewsAtLocation (currentView.Padding, location));
+
+            // Add subviews to the stack in reverse order
+            // This maintains the original depth-first traversal order
+            for (int i = currentView.InternalSubViews.Count - 1; i >= 0; i--)
+            {
+                View subview = currentView.InternalSubViews [i];
+                if (subview.Visible && subview.FrameToScreen ().Contains (location))
+                {
+                    viewsToProcess.Push (subview);
+                }
+            }
+        }
+
+        return result;
     }
 
     #endregion Utilities
diff --git a/Terminal.Gui/View/View.Mouse.cs b/Terminal.Gui/View/View.Mouse.cs
index 2e3ba103c7..4a4b3ca92a 100644
--- a/Terminal.Gui/View/View.Mouse.cs
+++ b/Terminal.Gui/View/View.Mouse.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System.ComponentModel;
-using static Unix.Terminal.Delegates;
 
 namespace Terminal.Gui;
 
@@ -47,8 +46,11 @@ private void SetupMouse ()
 
     #region MouseEnterLeave
 
-    private bool _hovering;
-    private ColorScheme? _savedNonHoverColorScheme;
+    /// <summary>
+    ///     Gets whether the mouse is currently hovering over the View's <see cref="Viewport"/>. Is <see langword="true"/> after
+    ///     <see cref="MouseEnter"/> has been raised, and before <see cref="MouseLeave"/> is raised.
+    /// </summary>
+    public bool MouseHovering { get; internal set; }
 
     /// <summary>
     ///     INTERNAL Called by <see cref="Application.RaiseMouseEvent"/> when the mouse moves over the View's
@@ -79,30 +81,15 @@ private void SetupMouse ()
 
         MouseEnter?.Invoke (this, eventArgs);
 
-        _hovering = !eventArgs.Cancel;
-
         if (eventArgs.Cancel)
         {
             return true;
         }
 
-        // Post-conditions
-        if (HighlightStyle.HasFlag (HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.Hover))
-        {
-            HighlightStyle copy = HighlightStyle;
-            var hover = HighlightStyle.Hover;
-            CancelEventArgs<HighlightStyle> args = new (ref copy, ref hover);
-
-            if (RaiseHighlight (args) || args.Cancel)
-            {
-                return args.Cancel;
-            }
-
-            ColorScheme? cs = _colorScheme;
+        MouseHovering = true;
 
-            _savedNonHoverColorScheme = cs;
-
-            _colorScheme = GetHighlightColorScheme ();
+        if (HighlightStyle != HighlightStyle.None)
+        {
             SetNeedsDraw ();
         }
 
@@ -110,20 +97,32 @@ private void SetupMouse ()
     }
 
     /// <summary>
-    ///     Gets the <see cref="ColorScheme"/> to use when the view is highlighted. The highlight colorscheme
-    ///     is based on the current <see cref="ColorScheme"/>, using <see cref="Color.GetHighlightColor()"/>.
+    ///     Gets the <see cref="Scheme"/> to use when the view is highlighted. The highlight colorscheme
+    ///     is based on the current <see cref="Scheme"/>, using <see cref="Color.GetBrighterColor"/>.
     /// </summary>
-    /// <remarks>The highlight color scheme.</remarks>
-    public ColorScheme? GetHighlightColorScheme ()
+    /// <remarks>The highlight scheme.</remarks>
+    public Scheme GetHighlightScheme ()
     {
-        ColorScheme? cs = _colorScheme ?? SuperView?.ColorScheme ?? new ColorScheme ();
+        Scheme cs = GetScheme ();
 
         return cs with
         {
-            Normal = new (GetNormalColor ().Foreground.GetHighlightColor (), GetNormalColor ().Background),
-            HotNormal = new (GetHotNormalColor ().Foreground.GetHighlightColor (), GetHotNormalColor ().Background),
-            Focus = new (GetFocusColor ().Foreground.GetHighlightColor (), GetFocusColor ().Background),
-            HotFocus = new (GetHotFocusColor ().Foreground.GetHighlightColor (), GetHotFocusColor ().Background)
+            Normal = new (
+                          GetAttributeForRole (VisualRole.Normal).Foreground.GetBrighterColor (),
+                          GetAttributeForRole (VisualRole.Normal).Background,
+                          GetAttributeForRole (VisualRole.Normal).Style),
+            HotNormal = new (
+                             GetAttributeForRole (VisualRole.HotNormal).Foreground.GetBrighterColor (),
+                             GetAttributeForRole (VisualRole.HotNormal).Background,
+                             GetAttributeForRole (VisualRole.HotNormal).Style),
+            Focus = new (
+                         GetAttributeForRole (VisualRole.Focus).Foreground.GetBrighterColor (),
+                         GetAttributeForRole (VisualRole.Focus).Background,
+                         GetAttributeForRole (VisualRole.Focus).Style),
+            HotFocus = new (
+                            GetAttributeForRole (VisualRole.HotFocus).Foreground.GetBrighterColor (),
+                            GetAttributeForRole (VisualRole.HotFocus).Background,
+                            GetAttributeForRole (VisualRole.HotFocus).Style)
         };
     }
 
@@ -205,22 +204,11 @@ internal void NewMouseLeaveEvent ()
 
         MouseLeave?.Invoke (this, EventArgs.Empty);
 
-        // Post-conditions
-        _hovering = false;
+        MouseHovering = false;
 
-        if (HighlightStyle.HasFlag (HighlightStyle.Hover) || Diagnostics.HasFlag (ViewDiagnosticFlags.Hover))
+        if (HighlightStyle != HighlightStyle.None)
         {
-            HighlightStyle copy = HighlightStyle;
-            var hover = HighlightStyle.None;
-            RaiseHighlight (new (ref copy, ref hover));
-
-            // if (_savedNonHoverColorScheme is { })
-            {
-                _colorScheme = _savedNonHoverColorScheme;
-                _savedNonHoverColorScheme = null;
-                SetNeedsDraw ();
-
-            }
+            SetNeedsDraw ();
         }
     }
 
@@ -576,7 +564,6 @@ internal bool WhenGrabbedHandleClicked (MouseEventArgs mouseEvent)
             // If mouse is still in bounds, generate a click
             if (!WantMousePositionReports && Viewport.Contains (mouseEvent.Position))
             {
-
                 return RaiseMouseClickEvent (mouseEvent);
             }
 
@@ -641,8 +628,6 @@ protected bool RaiseMouseWheelEvent (MouseEventArgs args)
 
     #region Highlight Handling
 
-    // Used for Pressed highlighting
-    private ColorScheme? _savedHighlightColorScheme;
 
     /// <summary>
     ///     Gets or sets whether the <see cref="View"/> will be highlighted visually by mouse interaction.
@@ -664,13 +649,6 @@ private bool RaiseHighlight (CancelEventArgs<HighlightStyle> args)
 
         Highlight?.Invoke (this, args);
 
-        //if (args.Cancel)
-        //{
-        //    return true;
-        //}
-
-        //args.Cancel = InvokeCommandsBoundToMouse (args) == true;
-
         return args.Cancel;
     }
 
@@ -728,155 +706,10 @@ internal bool SetPressedHighlight (HighlightStyle newHighlightStyle)
 
         // For 3D Pressed Style - Note we don't care about canceling the event here
         Margin?.RaiseHighlight (args);
-        args.Cancel = false; // Just in case
-
-        if (args.NewValue.HasFlag (HighlightStyle.Pressed) || args.NewValue.HasFlag (HighlightStyle.PressedOutside))
-        {
-            if (_savedHighlightColorScheme is null && _colorScheme is { })
-            {
-                _savedHighlightColorScheme = _colorScheme;
-
-                if (ColorScheme is null)
-                {
-                    return false;
-                }
-
-                if (CanFocus)
-                {
-                    var cs = new ColorScheme (ColorScheme)
-                    {
-                        // Highlight the foreground focus color
-                        Focus = new (ColorScheme.Focus.Foreground.GetHighlightColor (), ColorScheme.Focus.Background.GetHighlightColor ())
-                    };
-                    _colorScheme = cs;
-                }
-                else
-                {
-                    var cs = new ColorScheme (ColorScheme)
-                    {
-                        // Invert Focus color foreground/background. We can do this because we know the view is not going to be focused.
-                        Normal = new (ColorScheme.Focus.Background, ColorScheme.Normal.Foreground)
-                    };
-                    _colorScheme = cs;
-                }
-            }
-
-            // Return false since we don't want to eat the event
-            return false;
-        }
-
-        if (args.NewValue == HighlightStyle.None)
-        {
-            // Unhighlight
-            _colorScheme = _savedHighlightColorScheme;
-            _savedHighlightColorScheme = null;
-            SetNeedsDraw ();
-        }
-
-        return false;
+        return args.Cancel;
     }
 
     #endregion Highlight Handling
 
-    /// <summary>
-    ///     INTERNAL: Gets the Views that are under the mouse at <paramref name="location"/>, including Adornments.
-    /// </summary>
-    /// <param name="location"></param>
-    /// <param name="ignoreTransparent">If <see langword="true"/> any transparent views will be ignored.</param>
-    /// <returns></returns>
-    internal static List<View?> GetViewsUnderMouse (in Point location, bool ignoreTransparent = false)
-    {
-        List<View?> viewsUnderMouse = new ();
-
-        View? start = Application.Top;
-
-        // PopoverHost - If visible, start with it instead of Top
-        if (Application.Popover?.GetActivePopover () is View { Visible: true } visiblePopover && !ignoreTransparent)
-        {
-            start = visiblePopover;
-
-            // Put Top on stack next
-            viewsUnderMouse.Add (Application.Top);
-        }
-
-        Point currentLocation = location;
-
-        while (start is { Visible: true } && start.Contains (currentLocation))
-        {
-            if (!start.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse))
-            {
-                viewsUnderMouse.Add (start);
-            }
-
-            Adornment? found = null;
-
-            if (start is not Adornment)
-            {
-                if (start.Margin is { } && start.Margin.Contains (currentLocation))
-                {
-                    found = start.Margin;
-                }
-                else if (start.Border is { } && start.Border.Contains (currentLocation))
-                {
-                    found = start.Border;
-                }
-                else if (start.Padding is { } && start.Padding.Contains (currentLocation))
-                {
-                    found = start.Padding;
-                }
-            }
-
-            Point viewportOffset = start.GetViewportOffsetFromFrame ();
-
-            if (found is { })
-            {
-                start = found;
-                viewsUnderMouse.Add (start);
-                viewportOffset = found.Parent?.Frame.Location ?? Point.Empty;
-            }
-
-            int startOffsetX = currentLocation.X - (start.Frame.X + viewportOffset.X);
-            int startOffsetY = currentLocation.Y - (start.Frame.Y + viewportOffset.Y);
-
-            View? subview = null;
-
-            for (int i = start.InternalSubViews.Count - 1; i >= 0; i--)
-            {
-                if (start.InternalSubViews [i].Visible
-                    && start.InternalSubViews [i].Contains (new (startOffsetX + start.Viewport.X, startOffsetY + start.Viewport.Y))
-                    && (!ignoreTransparent || !start.InternalSubViews [i].ViewportSettings.HasFlag (ViewportSettings.TransparentMouse)))
-                {
-                    subview = start.InternalSubViews [i];
-                    currentLocation.X = startOffsetX + start.Viewport.X;
-                    currentLocation.Y = startOffsetY + start.Viewport.Y;
-
-                    // start is the deepest subview under the mouse; stop searching the subviews
-                    break;
-                }
-            }
-
-            if (subview is null)
-            {
-                // In the case start is transparent, recursively add all it's subviews etc...
-                if (start.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse))
-                {
-                    viewsUnderMouse.AddRange (View.GetViewsUnderMouse (location, true));
-
-                    // De-dupe viewsUnderMouse
-                    HashSet<View?> hashSet = [.. viewsUnderMouse];
-                    viewsUnderMouse = [.. hashSet];
-                }
-
-                // No subview was found that's under the mouse, so we're done
-                return viewsUnderMouse;
-            }
-
-            // We found a subview of start that's under the mouse, continue...
-            start = subview;
-        }
-
-        return viewsUnderMouse;
-    }
-
     private void DisposeMouse () { }
 }
diff --git a/Terminal.Gui/View/View.cs b/Terminal.Gui/View/View.cs
index 0c78fd873b..71b842add1 100644
--- a/Terminal.Gui/View/View.cs
+++ b/Terminal.Gui/View/View.cs
@@ -71,6 +71,16 @@ protected virtual void Dispose (bool disposing)
             DisposeAdornments ();
             DisposeScrollBars ();
 
+            if (Application.MouseGrabView == this)
+            {
+                Application.UngrabMouse ();
+            }
+
+            if (Application.WantContinuousButtonPressedView == this)
+            {
+                Application.WantContinuousButtonPressedView = null;
+            }
+
             for (int i = InternalSubViews.Count - 1; i >= 0; i--)
             {
                 View subview = InternalSubViews [i];
@@ -103,11 +113,23 @@ protected virtual void Dispose (bool disposing)
     /// <remarks>The id should be unique across all Views that share a SuperView.</remarks>
     public string Id { get; set; } = "";
 
+    private IConsoleDriver? _driver = null;
     /// <summary>
-    ///     Points to the current driver in use by the view, it is a convenience property for simplifying the development
+    ///     INTERNAL: Use <see cref="Application.Driver"/> instead. Points to the current driver in use by the view, it is a convenience property for simplifying the development
     ///     of new views.
     /// </summary>
-    public static IConsoleDriver? Driver => Application.Driver;
+    internal IConsoleDriver? Driver
+    {
+        get
+        {
+            if (_driver is { })
+            {
+                return _driver;
+            }
+            return Application.Driver;
+        }
+        set => _driver = value;
+    }
 
     /// <summary>Initializes a new instance of <see cref="View"/>.</summary>
     /// <remarks>
diff --git a/Terminal.Gui/View/ViewDiagnosticFlags.cs b/Terminal.Gui/View/ViewDiagnosticFlags.cs
index 3c08030a68..fc625d4149 100644
--- a/Terminal.Gui/View/ViewDiagnosticFlags.cs
+++ b/Terminal.Gui/View/ViewDiagnosticFlags.cs
@@ -19,10 +19,10 @@ public enum ViewDiagnosticFlags : uint
     /// </summary>
     Thickness = 0b_0000_0010,
 
-    /// <summary>
-    ///     When enabled the View's colors will be darker when the mouse is hovering over the View (See <see cref="View.MouseEnter"/> and <see cref="View.MouseLeave"/>.
-    /// </summary>
-    Hover = 0b_0000_00100,
+    ///// <summary>
+    /////     When enabled the View's colors will be darker when the mouse is hovering over the View (See <see cref="View.MouseEnter"/> and <see cref="View.MouseLeave"/>.
+    ///// </summary>
+    //Hover = 0b_0000_00100,
 
     /// <summary>
     ///     When enabled a draw indicator will be shown; the indicator will change each time the View's Draw method is called with NeedsDraw set to true.
diff --git a/Terminal.Gui/View/ViewportSettings.cs b/Terminal.Gui/View/ViewportSettings.cs
index 38ab43f810..b77f7c5e51 100644
--- a/Terminal.Gui/View/ViewportSettings.cs
+++ b/Terminal.Gui/View/ViewportSettings.cs
@@ -153,6 +153,8 @@ public enum ViewportSettings
     /// </summary>
     Transparent = 0b_0001_0000_0000,
 
+    // BUGBUG: The API docs here are wrong: If a TransparentMouse View has subviews, those subviews WILL get mouse events. 
+    // BUGBUG: That's an important feature that enables Popovers to work.
     /// <summary>
     ///     If set the View will be transparent to mouse events: Any mouse event that occurs over the View (and it's SubViews) will be passed to the
     ///     Views below it.
diff --git a/Terminal.Gui/Views/AutocompleteFilepathContext.cs b/Terminal.Gui/Views/AutocompleteFilepathContext.cs
index b21724816e..fbdf168fa7 100644
--- a/Terminal.Gui/Views/AutocompleteFilepathContext.cs
+++ b/Terminal.Gui/Views/AutocompleteFilepathContext.cs
@@ -3,15 +3,10 @@
 
 namespace Terminal.Gui;
 
-internal class AutocompleteFilepathContext : AutocompleteContext
+internal class AutocompleteFilepathContext (string currentLine, int cursorPosition, FileDialogState state)
+    : AutocompleteContext (Cell.ToCellList (currentLine), cursorPosition)
 {
-    public AutocompleteFilepathContext (string currentLine, int cursorPosition, FileDialogState state)
-        : base (Cell.ToCellList (currentLine), cursorPosition)
-    {
-        State = state;
-    }
-
-    public FileDialogState State { get; set; }
+    public FileDialogState State { get; set; } = state;
 }
 
 internal class FilepathSuggestionGenerator : ISuggestionGenerator
diff --git a/Terminal.Gui/Views/Bar.cs b/Terminal.Gui/Views/Bar.cs
index 246d9faa6b..7c683ceb5a 100644
--- a/Terminal.Gui/Views/Bar.cs
+++ b/Terminal.Gui/Views/Bar.cs
@@ -198,7 +198,7 @@ private void LayoutBarItems (Size contentSize)
                 {
                     View barItem = SubViews.ElementAt (index);
 
-                    //barItem.ColorScheme = ColorScheme;
+                    //barItem.Scheme = Scheme;
                     barItem.X = Pos.Align (Alignment.Start, AlignmentModes);
                     barItem.Y = 0; //Pos.Center ();
 
@@ -232,7 +232,7 @@ private void LayoutBarItems (Size contentSize)
                         View barItem = SubViews.ElementAt (index);
 
 
-                       // barItem.ColorScheme = ColorScheme;
+                       // barItem.Scheme = Scheme;
 
                         if (!barItem.Visible)
                         {
diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs
index d4f1a186bb..b955f107dd 100644
--- a/Terminal.Gui/Views/Button.cs
+++ b/Terminal.Gui/Views/Button.cs
@@ -31,13 +31,13 @@ public class Button : View, IDesignable
     /// <summary>
     ///     Gets or sets whether <see cref="Button"/>s are shown with a shadow effect by default.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.None;
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.Opaque;
 
     /// <summary>
     ///     Gets or sets the default Highlight Style.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static HighlightStyle DefaultHighlightStyle { get; set; } = HighlightStyle.Pressed | HighlightStyle.Hover;
 
     /// <summary>Initializes a new instance of <see cref="Button"/>.</summary>
diff --git a/Terminal.Gui/Views/CharMap/CharMap.cs b/Terminal.Gui/Views/CharMap/CharMap.cs
index a6753dfa7c..7d162d2a34 100644
--- a/Terminal.Gui/Views/CharMap/CharMap.cs
+++ b/Terminal.Gui/Views/CharMap/CharMap.cs
@@ -25,7 +25,6 @@ public class CharMap : View, IDesignable
     [RequiresDynamicCode ("AOT")]
     public CharMap ()
     {
-        base.ColorScheme = Colors.ColorSchemes ["Dialog"];
         CanFocus = true;
         CursorVisibility = CursorVisibility.Default;
 
@@ -98,6 +97,20 @@ public CharMap ()
         VerticalScrollBar.Visible = false;
         VerticalScrollBar.X = Pos.AnchorEnd ();
         VerticalScrollBar.Y = HEADER_HEIGHT; // Header
+
+        // The scrollbars are in the Padding. VisualRole.Focus/Active are used to draw the
+        // CharMap headers. Override Padding to force it to draw to match.
+        Padding!.GettingAttributeForRole += PaddingOnGettingAttributeForRole;
+    }
+
+    private void PaddingOnGettingAttributeForRole (object? sender, VisualRoleEventArgs e)
+    {
+        if (e.Role != VisualRole.Focus && e.Role != VisualRole.Active)
+        {
+            e.NewValue = GetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
+        }
+
+        e.Cancel = true;
     }
 
     private bool? Move (ICommandContext? commandContext, int cpOffset)
@@ -249,28 +262,40 @@ protected override bool OnDrawingContent ()
             return true;
         }
 
-        int cursorCol = GetCursor (SelectedCodePoint).X + Viewport.X - RowLabelWidth - 1;
-        int cursorRow = GetCursor (SelectedCodePoint).Y + Viewport.Y - 1;
+        int selectedCol = SelectedCodePoint % 16;
+        int selectedRow = SelectedCodePoint / 16;
+
+        // Headers
 
-        SetAttribute (GetHotNormalColor ());
+        // Clear the header area
         Move (0, 0);
-        AddStr (new (' ', RowLabelWidth + 1));
+        SetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
+        AddStr (new (' ', Viewport.Width));
 
         int firstColumnX = RowLabelWidth - Viewport.X;
 
         // Header
+        var x = 0;
+
         for (var hexDigit = 0; hexDigit < 16; hexDigit++)
         {
-            int x = firstColumnX + hexDigit * COLUMN_WIDTH;
+            x = firstColumnX + hexDigit * COLUMN_WIDTH;
 
             if (x > RowLabelWidth - 2)
             {
                 Move (x, 0);
-                SetAttribute (GetHotNormalColor ());
+                SetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
                 AddStr (" ");
-                SetAttribute (HasFocus && cursorCol + firstColumnX == x ? GetHotFocusColor () : GetHotNormalColor ());
+
+                // Swap Active/Focus so the selected column is highlighted
+                if (hexDigit == selectedCol)
+
+                {
+                    SetAttributeForRole (HasFocus ? VisualRole.Active : VisualRole.Focus);
+                }
+
                 AddStr ($"{hexDigit:x}");
-                SetAttribute (GetHotNormalColor ());
+                SetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
                 AddStr (" ");
             }
         }
@@ -280,32 +305,54 @@ protected override bool OnDrawingContent ()
         {
             // What row is this?
             int row = (y + Viewport.Y - 1) / _rowHeight;
-
             int val = row * 16;
 
+            // Draw the row label (U+XXXX_)
+            SetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
+            Move (0, y);
+
+            // Swap Active/Focus so the selected row is highlighted
+            if (y + Viewport.Y - 1 == selectedRow)
+            {
+                SetAttributeForRole (HasFocus ? VisualRole.Active : VisualRole.Focus);
+            }
+
             if (val > MAX_CODE_POINT)
             {
-                break;
+                // No row
+                Move (0, y);
+                AddStr (new (' ', RowLabelWidth));
+
+                continue;
+            }
+
+            if (!ShowGlyphWidths || (y + Viewport.Y) % _rowHeight > 0)
+            {
+                AddStr ($"U+{val / 16:x5}_");
+            }
+            else
+            {
+                AddStr (new (' ', RowLabelWidth));
             }
 
-            Move (firstColumnX + COLUMN_WIDTH, y);
-            SetAttribute (GetNormalColor ());
+            // Draw the row
+            SetAttributeForRole (VisualRole.Normal);
 
             for (var col = 0; col < 16; col++)
             {
-                int x = firstColumnX + COLUMN_WIDTH * col + 1;
+                x = firstColumnX + COLUMN_WIDTH * col + 1;
 
-                if (x < 0 || x > Viewport.Width - 1)
+                if (x < RowLabelWidth || x > Viewport.Width - 1)
                 {
                     continue;
                 }
 
                 Move (x, y);
 
-                // If we're at the cursor position, and we don't have focus, invert the colors.
-                if (row == cursorRow && x == cursorCol && !HasFocus)
+                // If we're at the cursor position highlight the cell
+                if (row == selectedRow && col == selectedCol)
                 {
-                    SetAttribute (GetFocusColor ());
+                    SetAttributeForRole (VisualRole.Active);
                 }
 
                 int scalar = val + col;
@@ -355,31 +402,18 @@ protected override bool OnDrawingContent ()
                 }
                 else
                 {
-                    // Draw the width of the rune
-                    SetAttribute (GetHotNormalColor ());
+                    // Draw the width of the rune faint
+                    Attribute attr = GetAttributeForRole (VisualRole.Normal);
+                    SetAttribute (attr with { Style = attr.Style | TextStyle.Faint });
                     AddStr ($"{width}");
                 }
 
-                // If we're at the cursor position, and we don't have focus, revert the colors to normal
-                if (row == cursorRow && x == cursorCol && !HasFocus)
+                // If we're at the cursor position, and we don't have focus
+                if (row == selectedRow && col == selectedCol)
                 {
-                    SetAttribute (GetNormalColor ());
+                    SetAttributeForRole (VisualRole.Normal);
                 }
             }
-
-            // Draw row label (U+XXXX_)
-            Move (0, y);
-
-            SetAttribute (HasFocus && y + Viewport.Y - 1 == cursorRow ? GetHotFocusColor () : GetHotNormalColor ());
-
-            if (!ShowGlyphWidths || (y + Viewport.Y) % _rowHeight > 0)
-            {
-                AddStr ($"U+{val / 16:x5}_ ");
-            }
-            else
-            {
-                AddStr (new (' ', RowLabelWidth));
-            }
         }
 
         return true;
@@ -523,6 +557,13 @@ public static string ToCamelCase (string str)
 
     private bool TryGetCodePointFromPosition (Point position, out int codePoint)
     {
+        if (position.X < RowLabelWidth || position.Y < 1)
+        {
+            codePoint = 0;
+
+            return false;
+        }
+
         int row = (position.Y - 1 - -Viewport.Y) / _rowHeight; // -1 for header
         int col = (position.X - RowLabelWidth - -Viewport.X) / COLUMN_WIDTH;
 
diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs
index f9889dd5e2..e8d018c739 100644
--- a/Terminal.Gui/Views/CheckBox.cs
+++ b/Terminal.Gui/Views/CheckBox.cs
@@ -12,7 +12,7 @@ public class CheckBox : View
     /// <summary>
     ///     Gets or sets the default Highlight Style.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static HighlightStyle DefaultHighlightStyle { get; set; } = HighlightStyle.PressedOutside | HighlightStyle.Pressed | HighlightStyle.Hover;
 
     /// <summary>
diff --git a/Terminal.Gui/Views/BBar.cs b/Terminal.Gui/Views/Color/BBar.cs
similarity index 100%
rename from Terminal.Gui/Views/BBar.cs
rename to Terminal.Gui/Views/Color/BBar.cs
diff --git a/Terminal.Gui/Views/ColorBar.cs b/Terminal.Gui/Views/Color/ColorBar.cs
similarity index 94%
rename from Terminal.Gui/Views/ColorBar.cs
rename to Terminal.Gui/Views/Color/ColorBar.cs
index 824b499584..ac504847c0 100644
--- a/Terminal.Gui/Views/ColorBar.cs
+++ b/Terminal.Gui/Views/Color/ColorBar.cs
@@ -89,7 +89,7 @@ protected override bool OnDrawingContent ()
         if (!string.IsNullOrWhiteSpace (Text))
         {
             Move (0, 0);
-            SetAttribute (HasFocus ? GetFocusColor () : GetNormalColor ());
+            SetAttribute (HasFocus ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal));
             Driver?.AddStr (Text);
 
             // TODO: is there a better method than this? this is what it is in TableView
@@ -198,7 +198,7 @@ private void DrawBar (int xOffset, int yOffset, int width)
             if (isSelectedCell)
             {
                 // Draw the triangle at the closest position
-                SetAttribute (new (triangleColor, color));
+                SetAttribute (new (triangleColor, color, Enabled ? TextStyle.None : TextStyle.Faint));
                 AddRune (x + xOffset, yOffset, new ('▲'));
 
                 // Record for tests
@@ -206,8 +206,8 @@ private void DrawBar (int xOffset, int yOffset, int width)
             }
             else
             {
-                SetAttribute (new (color, color));
-                AddRune (x + xOffset, yOffset, new ('█'));
+                SetAttribute (new (color, color, Enabled ? TextStyle.None : TextStyle.Faint));
+                AddRune (x + xOffset, yOffset, new (' '));
             }
         }
     }
diff --git a/Terminal.Gui/Views/ColorModelStrategy.cs b/Terminal.Gui/Views/Color/ColorModelStrategy.cs
similarity index 100%
rename from Terminal.Gui/Views/ColorModelStrategy.cs
rename to Terminal.Gui/Views/Color/ColorModelStrategy.cs
diff --git a/Terminal.Gui/Views/ColorPicker.16.cs b/Terminal.Gui/Views/Color/ColorPicker.16.cs
similarity index 94%
rename from Terminal.Gui/Views/ColorPicker.16.cs
rename to Terminal.Gui/Views/Color/ColorPicker.16.cs
index 1c6808bf79..07152caa27 100644
--- a/Terminal.Gui/Views/ColorPicker.16.cs
+++ b/Terminal.Gui/Views/Color/ColorPicker.16.cs
@@ -133,7 +133,7 @@ private bool MoveUp (ICommandContext? commandContext)
     ///<inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        SetAttribute (HasFocus ? GetFocusColor () : GetNormalColor ());
+        SetAttribute (HasFocus ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal));
         var colorIndex = 0;
 
         for (var y = 0; y < Math.Max (2, Viewport.Height / BoxHeight); y++)
@@ -147,7 +147,15 @@ protected override bool OnDrawingContent ()
                     continue;
                 }
 
-                SetAttribute (new ((ColorName16)foregroundColorIndex, (ColorName16)colorIndex));
+                if (Enabled)
+                {
+                    SetAttribute (new ((ColorName16)foregroundColorIndex, (ColorName16)colorIndex));
+                }
+                else
+                {
+                    SetAttribute (new ((ColorName16)foregroundColorIndex, ((Color)(ColorName16)colorIndex).GetDimColor (), TextStyle.Faint));
+                }
+
                 bool selected = x == Cursor.X && y == Cursor.Y;
                 DrawColorBox (x, y, selected);
                 colorIndex++;
diff --git a/Terminal.Gui/Views/ColorPicker.Prompt.cs b/Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
similarity index 100%
rename from Terminal.Gui/Views/ColorPicker.Prompt.cs
rename to Terminal.Gui/Views/Color/ColorPicker.Prompt.cs
diff --git a/Terminal.Gui/Views/ColorPicker.Style.cs b/Terminal.Gui/Views/Color/ColorPicker.Style.cs
similarity index 100%
rename from Terminal.Gui/Views/ColorPicker.Style.cs
rename to Terminal.Gui/Views/Color/ColorPicker.Style.cs
diff --git a/Terminal.Gui/Views/ColorPicker.cs b/Terminal.Gui/Views/Color/ColorPicker.cs
similarity index 95%
rename from Terminal.Gui/Views/ColorPicker.cs
rename to Terminal.Gui/Views/Color/ColorPicker.cs
index 2bd102085c..8934231a2e 100644
--- a/Terminal.Gui/Views/ColorPicker.cs
+++ b/Terminal.Gui/Views/Color/ColorPicker.cs
@@ -5,7 +5,7 @@ namespace Terminal.Gui;
 /// <summary>
 ///     True color picker using HSL
 /// </summary>
-public partial class ColorPicker : View
+public partial class ColorPicker : View, IDesignable
 {
     /// <summary>
     ///     Creates a new instance of <see cref="ColorPicker"/>. Use
@@ -17,7 +17,7 @@ public ColorPicker ()
         CanFocus = true;
         TabStop = TabBehavior.TabStop;
         Height = Dim.Auto ();
-        Width = Dim.Auto ();
+        Width = Dim.Auto (minimumContentDim: 32);
         ApplyStyleChanges ();
     }
 
@@ -99,8 +99,8 @@ public void ApplyStyleChanges ()
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        Attribute normal = GetNormalColor ();
-        SetAttribute (new (SelectedColor, normal.Background));
+        Attribute normal = GetAttributeForRole (VisualRole.Normal);
+        SetAttribute (new (SelectedColor, normal.Background, Enabled ? TextStyle.None : TextStyle.Faint));
         int y = _bars.Count + (Style.ShowColorName ? 1 : 0);
         AddRune (13, y, (Rune)'■');
 
@@ -359,6 +359,14 @@ private void UpdateValueFromTextField ()
         }
     }
 
+    /// <inheritdoc/>
+    public bool EnableForDesign ()
+    {
+        SelectedColor = Color.BrightRed;
+
+        return true;
+    }
+
     /// <inheritdoc />
     protected override void Dispose (bool disposing)
     {
diff --git a/Terminal.Gui/Views/GBar.cs b/Terminal.Gui/Views/Color/GBar.cs
similarity index 100%
rename from Terminal.Gui/Views/GBar.cs
rename to Terminal.Gui/Views/Color/GBar.cs
diff --git a/Terminal.Gui/Views/HueBar.cs b/Terminal.Gui/Views/Color/HueBar.cs
similarity index 100%
rename from Terminal.Gui/Views/HueBar.cs
rename to Terminal.Gui/Views/Color/HueBar.cs
diff --git a/Terminal.Gui/Views/IColorBar.cs b/Terminal.Gui/Views/Color/IColorBar.cs
similarity index 100%
rename from Terminal.Gui/Views/IColorBar.cs
rename to Terminal.Gui/Views/Color/IColorBar.cs
diff --git a/Terminal.Gui/Views/LightnessBar.cs b/Terminal.Gui/Views/Color/LightnessBar.cs
similarity index 100%
rename from Terminal.Gui/Views/LightnessBar.cs
rename to Terminal.Gui/Views/Color/LightnessBar.cs
diff --git a/Terminal.Gui/Views/RBar.cs b/Terminal.Gui/Views/Color/RBar.cs
similarity index 100%
rename from Terminal.Gui/Views/RBar.cs
rename to Terminal.Gui/Views/Color/RBar.cs
diff --git a/Terminal.Gui/Views/SaturationBar.cs b/Terminal.Gui/Views/Color/SaturationBar.cs
similarity index 100%
rename from Terminal.Gui/Views/SaturationBar.cs
rename to Terminal.Gui/Views/Color/SaturationBar.cs
diff --git a/Terminal.Gui/Views/ValueBar.cs b/Terminal.Gui/Views/Color/ValueBar.cs
similarity index 100%
rename from Terminal.Gui/Views/ValueBar.cs
rename to Terminal.Gui/Views/Color/ValueBar.cs
diff --git a/Terminal.Gui/Views/ComboBox.cs b/Terminal.Gui/Views/ComboBox.cs
index 3b13726591..54c2dea48d 100644
--- a/Terminal.Gui/Views/ComboBox.cs
+++ b/Terminal.Gui/Views/ComboBox.cs
@@ -110,16 +110,11 @@ public ComboBox ()
         KeyBindings.Add (Key.U.WithCtrl, Command.UnixEmulation);
     }
 
-    /// <inheritdoc/>
-    public new ColorScheme ColorScheme
+    /// <inheritdoc />
+    protected override bool OnSettingScheme (in Scheme scheme)
     {
-        get => base.ColorScheme;
-        set
-        {
-            _listview.ColorScheme = value;
-            base.ColorScheme = value;
-            SetNeedsDraw ();
-        }
+        _listview.SetScheme(scheme);
+        return base.OnSettingScheme (in scheme);
     }
 
     /// <summary>Gets or sets if the drop-down list can be hide with a button click event.</summary>
@@ -136,18 +131,15 @@ public bool HideDropdownListOnClick
     public bool ReadOnly
     {
         get => _search.ReadOnly;
-        set
-        {
-            _search.ReadOnly = value;
+        set => _search.ReadOnly = value;
 
-            if (_search.ReadOnly)
-            {
-                if (_search.ColorScheme is { })
-                {
-                    _search.ColorScheme = new ColorScheme (_search.ColorScheme) { Normal = _search.ColorScheme.Focus };
-                }
-            }
-        }
+        //if (_search.ReadOnly)
+        //{
+        //    if (_search.Scheme is { })
+        //    {
+        //        _search.Scheme = new Scheme (_search.Scheme) { Normal = _search.Scheme.Focus };
+        //    }
+        //}
     }
 
     /// <summary>Current search text</summary>
@@ -302,10 +294,7 @@ protected override bool OnDrawingContent ()
             return true;
         }
 
-        if (ColorScheme != null)
-        {
-            SetAttribute (ColorScheme.Focus);
-        }
+        SetAttributeForRole (Enabled ? VisualRole.Focus : VisualRole.Disabled);
         AddRune (Viewport.Right - 1, 0, Glyphs.DownArrow);
 
         return true;
@@ -890,7 +879,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
 
         protected override bool OnDrawingContent ()
         {
-            Attribute current = ColorScheme?.Focus ?? Attribute.Default;
+            Attribute current = GetAttributeForRole (VisualRole.Focus);
             SetAttribute (current);
             Move (0, 0);
             Rectangle f = Frame;
@@ -908,15 +897,15 @@ protected override bool OnDrawingContent ()
 
                 if (isHighlighted || (isSelected && !_hideDropdownListOnClick))
                 {
-                    newcolor = focused ? ColorScheme.Focus : ColorScheme.HotNormal;
+                    newcolor = focused ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.HotNormal);
                 }
                 else if (isSelected && _hideDropdownListOnClick)
                 {
-                    newcolor = focused ? ColorScheme.HotFocus : ColorScheme.HotNormal;
+                    newcolor = focused ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal);
                 }
                 else
                 {
-                    newcolor = focused ? GetNormalColor () : GetNormalColor ();
+                    newcolor = GetAttributeForRole (VisualRole.Normal);
                 }
 
                 if (newcolor != current)
diff --git a/Terminal.Gui/Views/Dialog.cs b/Terminal.Gui/Views/Dialog.cs
index 4895de58fa..a5e4f8c52a 100644
--- a/Terminal.Gui/Views/Dialog.cs
+++ b/Terminal.Gui/Views/Dialog.cs
@@ -2,7 +2,7 @@
 
 /// <summary>
 ///     The <see cref="Dialog"/> <see cref="View"/> is a <see cref="Window"/> that by default is centered and contains
-///     one or more <see cref="Button"/>s. It defaults to the <c>Colors.ColorSchemes ["Dialog"]</c> color scheme and has a
+///     one or more <see cref="Button"/>s. It defaults to the <c>Colors.Schemes ["Dialog"]</c> scheme and has a
 ///     1 cell padding around the edges.
 /// </summary>
 /// <remarks>
@@ -16,42 +16,42 @@ public class Dialog : Window
 {
     /// <summary>The default <see cref="Alignment"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.End; // Default is set in config.json
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.End;
 
     /// <summary>The default <see cref="AlignmentModes"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static AlignmentModes DefaultButtonAlignmentModes { get; set; } = AlignmentModes.StartToEnd | AlignmentModes.AddSpaceBetweenItems;
 
     /// <summary>
     ///     Defines the default minimum Dialog width, as a percentage of the container width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static int DefaultMinimumWidth { get; set; } = 80;
 
     /// <summary>
     ///     Defines the default minimum Dialog height, as a percentage of the container width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static int DefaultMinimumHeight { get; set; } = 80;
 
 
     /// <summary>
     /// Gets or sets whether all <see cref="Window"/>s are shown with a shadow effect by default.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public new static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.None; // Default is set in config.json
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public new static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.Transparent;
 
     /// <summary>
     ///     Defines the default border styling for <see cref="Dialog"/>. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
 
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public new static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single; // Default is set in config.json
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public new static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Heavy;
 
     private readonly List<Button> _buttons = new ();
 
@@ -75,27 +75,30 @@ public Dialog ()
         Width = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumWidth), Dim.Percent (90));
         Height = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumHeight), Dim.Percent (90));
 
-        ColorScheme = Colors.ColorSchemes ["Dialog"];
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
         Modal = true;
         ButtonAlignment = DefaultButtonAlignment;
         ButtonAlignmentModes = DefaultButtonAlignmentModes;
     }
 
-    // BUGBUG: We override GetNormal/FocusColor because "Dialog" ColorScheme is goofy.
+    // BUGBUG: We override GetNormal/FocusColor because "Dialog" Scheme is goofy.
     // BUGBUG: By defn, a Dialog is Modal, and thus HasFocus is always true. OnDrawContent
     // BUGBUG: Calls these methods.
     // TODO: Fix this in https://github.com/gui-cs/Terminal.Gui/issues/2381
-    /// <inheritdoc />
-    public override Attribute GetNormalColor ()
-    {
-        return ColorScheme!.Normal;
-    }
 
     /// <inheritdoc />
-    public override Attribute GetFocusColor ()
+    /// <inheritdoc />
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
     {
-        return ColorScheme!.Normal;
+        if (role == VisualRole.Normal || role == VisualRole.Focus)
+        {
+            currentAttribute = GetScheme ().Normal;
+
+            return true;
+        }
+
+        return base.OnGettingAttributeForRole (role, ref currentAttribute);
     }
 
     private bool _canceled;
diff --git a/Terminal.Gui/Views/FileDialog.cs b/Terminal.Gui/Views/FileDialog.cs
index 6bc3b43557..f245f71e79 100644
--- a/Terminal.Gui/Views/FileDialog.cs
+++ b/Terminal.Gui/Views/FileDialog.cs
@@ -74,7 +74,7 @@ internal FileDialog (IFileSystem fileSystem)
         _fileSystem = fileSystem;
         Style = new (fileSystem);
 
-        _btnOk = new()
+        _btnOk = new ()
         {
             X = Pos.Align (Alignment.End, AlignmentModes.AddSpaceBetweenItems, alignmentGroupComplete),
             Y = Pos.AnchorEnd (),
@@ -91,7 +91,7 @@ internal FileDialog (IFileSystem fileSystem)
                                 Accept (true);
                             };
 
-        _btnCancel = new()
+        _btnCancel = new ()
         {
             X = Pos.Align (Alignment.End, AlignmentModes.AddSpaceBetweenItems, alignmentGroupComplete),
             Y = Pos.AnchorEnd (),
@@ -113,7 +113,7 @@ internal FileDialog (IFileSystem fileSystem)
                                     }
                                 };
 
-        _btnUp = new() { X = 0, Y = 1, NoPadding = true };
+        _btnUp = new () { X = 0, Y = 1, NoPadding = true };
         _btnUp.Text = GetUpButtonText ();
         _btnUp.Accepting += (s, e) =>
                             {
@@ -121,7 +121,7 @@ internal FileDialog (IFileSystem fileSystem)
                                 e.Handled = true;
                             };
 
-        _btnBack = new() { X = Pos.Right (_btnUp) + 1, Y = 1, NoPadding = true };
+        _btnBack = new () { X = Pos.Right (_btnUp) + 1, Y = 1, NoPadding = true };
         _btnBack.Text = GetBackButtonText ();
         _btnBack.Accepting += (s, e) =>
                               {
@@ -129,15 +129,15 @@ internal FileDialog (IFileSystem fileSystem)
                                   e.Handled = true;
                               };
 
-        _btnForward = new() { X = Pos.Right (_btnBack) + 1, Y = 1, NoPadding = true };
+        _btnForward = new () { X = Pos.Right (_btnBack) + 1, Y = 1, NoPadding = true };
         _btnForward.Text = GetForwardButtonText ();
         _btnForward.Accepting += (s, e) =>
                                  {
-                                     _history.Forward();
+                                     _history.Forward ();
                                      e.Handled = true;
                                  };
 
-        _tbPath = new() { Width = Dim.Fill (), CaptionColor = new (Color.Black) };
+        _tbPath = new () { Width = Dim.Fill (), CaptionColor = new (Color.Black) };
 
         _tbPath.KeyDown += (s, k) =>
                            {
@@ -151,7 +151,7 @@ internal FileDialog (IFileSystem fileSystem)
         _tbPath.Autocomplete = new AppendAutocomplete (_tbPath);
         _tbPath.Autocomplete.SuggestionGenerator = new FilepathSuggestionGenerator ();
 
-        _splitContainer = new()
+        _splitContainer = new ()
         {
             X = 0,
             Y = Pos.Bottom (_btnBack),
@@ -167,7 +167,7 @@ internal FileDialog (IFileSystem fileSystem)
 
         // this.splitContainer.Border.BorderStyle = BorderStyle.None;
 
-        _tableView = new()
+        _tableView = new ()
         {
             Width = Dim.Fill (),
             Height = Dim.Fill (),
@@ -195,7 +195,7 @@ internal FileDialog (IFileSystem fileSystem)
         typeStyle.MinWidth = 6;
         typeStyle.ColorGetter = ColorGetter;
 
-        _treeView = new() { Width = Dim.Fill (), Height = Dim.Fill () };
+        _treeView = new () { Width = Dim.Fill (), Height = Dim.Fill () };
 
         var fileDialogTreeBuilder = new FileSystemTreeBuilder ();
         _treeView.TreeBuilder = fileDialogTreeBuilder;
@@ -207,7 +207,7 @@ internal FileDialog (IFileSystem fileSystem)
         _splitContainer.Tiles.ElementAt (0).ContentView.Add (_treeView);
         _splitContainer.Tiles.ElementAt (1).ContentView.Add (_tableView);
 
-        _btnToggleSplitterCollapse = new()
+        _btnToggleSplitterCollapse = new ()
         {
             X = Pos.Align (Alignment.Start, AlignmentModes.AddSpaceBetweenItems, alignmentGroupInput),
             Y = Pos.AnchorEnd (), Text = GetToggleSplitterText (false)
@@ -225,7 +225,7 @@ internal FileDialog (IFileSystem fileSystem)
                                                     SetNeedsLayout ();
                                                 };
 
-        _tbFind = new()
+        _tbFind = new ()
         {
             X = Pos.Align (Alignment.Start, AlignmentModes.AddSpaceBetweenItems, alignmentGroupInput),
             CaptionColor = new (Color.Black),
@@ -234,8 +234,8 @@ internal FileDialog (IFileSystem fileSystem)
             HotKey = Key.F.WithAlt
         };
 
-        _spinnerView = new()
-            { X = Pos.Align (Alignment.Start, AlignmentModes.AddSpaceBetweenItems, alignmentGroupInput), Y = Pos.AnchorEnd (1), Visible = false };
+        _spinnerView = new ()
+        { X = Pos.Align (Alignment.Start, AlignmentModes.AddSpaceBetweenItems, alignmentGroupInput), Y = Pos.AnchorEnd (1), Visible = false };
 
         _tbFind.TextChanged += (s, o) => RestartSearch ();
 
@@ -327,7 +327,7 @@ public bool AllowsMultipleSelection
 
     /// <summary>The maximum number of results that will be collected when searching before stopping.</summary>
     /// <remarks>This prevents performance issues e.g. when searching root of file system for a common letter (e.g. 'e').</remarks>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static int MaxSearchResults { get; set; } = 10000;
 
     /// <summary>
@@ -419,7 +419,7 @@ protected override bool OnDrawingContent ()
 
             Move (0, Viewport.Height / 2);
 
-            SetAttribute (new (Color.Red, ColorScheme.Normal.Background));
+            SetAttribute (new (Color.Red, GetAttributeForRole (VisualRole.Normal).Background));
             Driver.AddStr (new (' ', feedbackPadLeft));
             Driver.AddStr (_feedback);
             Driver.AddStr (new (' ', feedbackPadRight));
@@ -451,9 +451,9 @@ public override void OnLoaded ()
         _tbPath.Caption = Style.PathCaption;
         _tbFind.Caption = Style.SearchCaption;
 
-        _tbPath.Autocomplete.ColorScheme = new (_tbPath.ColorScheme)
+        _tbPath.Autocomplete.Scheme = new (_tbPath.GetScheme ())
         {
-            Normal = new (Color.Black, _tbPath.ColorScheme.Normal.Background)
+            Normal = new (Color.Black, _tbPath.GetAttributeForRole (VisualRole.Normal).Background)
         };
 
         _treeRoots = Style.TreeRootGetter ();
@@ -481,7 +481,7 @@ public override void OnLoaded ()
                                                                         .ToArray ()
                                    );
 
-            _allowedTypeMenuBar = new()
+            _allowedTypeMenuBar = new ()
             {
                 Width = width,
                 Y = 1,
@@ -811,20 +811,20 @@ private void CellActivate (object sender, CellActivatedEventArgs obj)
 
     private void ClearFeedback () { _feedback = null; }
 
-    private ColorScheme ColorGetter (CellColorGetterArgs args)
+    private Scheme ColorGetter (CellColorGetterArgs args)
     {
         FileSystemInfoStats stats = RowToStats (args.RowIndex);
 
         if (!Style.UseColors)
         {
-            return _tableView.ColorScheme;
+            return _tableView.GetScheme ();
         }
 
         Color color = Style.ColorProvider.GetColor (stats.FileSystemInfo) ?? new Color (Color.White);
         var black = new Color (Color.Black);
 
         // TODO: Add some kind of cache for this
-        return new()
+        return new ()
         {
             Normal = new (color, black),
             HotNormal = new (color, black),
diff --git a/Terminal.Gui/Views/FlagSelector.cs b/Terminal.Gui/Views/FlagSelector.cs
index 4013dc806c..1640b9c708 100644
--- a/Terminal.Gui/Views/FlagSelector.cs
+++ b/Terminal.Gui/Views/FlagSelector.cs
@@ -185,7 +185,7 @@ internal set
 
             if (_value is null)
             {
-               Value = Convert.ToUInt16 (_flags?.Keys.ElementAt (0));
+                Value = Convert.ToUInt16 (_flags?.Keys.ElementAt (0));
             }
         }
     }
@@ -210,7 +210,7 @@ public bool AssignHotKeysToCheckBoxes
             }
             _assignHotKeysToCheckBoxes = value;
             CreateCheckBoxes ();
-            UpdateChecked();
+            UpdateChecked ();
         }
     }
 
@@ -309,47 +309,52 @@ protected virtual CheckBox CreateCheckBox (string name, uint flag)
             HighlightStyle = HighlightStyle.Hover
         };
 
-        checkbox.GettingNormalColor += (_, e) =>
+        checkbox.GettingAttributeForRole += (_, e) =>
                                        {
-                                           if (SuperView is { HasFocus: true })
+                                           if (SuperView is { HasFocus: false })
                                            {
-                                               e.Cancel = true;
-
-                                               if (!HasFocus)
-                                               {
-                                                   e.NewValue = GetFocusColor ();
-                                               }
-                                               else
-                                               {
-                                                   // If _colorScheme was set, it's because of Hover
-                                                   if (checkbox._colorScheme is { })
+                                               return;
+                                           }
+
+                                           switch (e.Role)
+                                           {
+                                               case VisualRole.Normal:
+                                                   e.Cancel = true;
+
+                                                   if (!HasFocus)
+                                                   {
+                                                       e.NewValue = GetAttributeForRole (VisualRole.Focus);
+                                                   }
+                                                   else
                                                    {
-                                                       e.NewValue = checkbox._colorScheme.Normal;
+                                                       // If _scheme was set, it's because of Hover
+                                                       if (checkbox.HasScheme)
+                                                       {
+                                                           e.NewValue = checkbox.GetAttributeForRole (VisualRole.Normal);
+                                                       }
+                                                       else
+                                                       {
+                                                           e.NewValue = GetAttributeForRole (VisualRole.Normal);
+                                                       }
+                                                   }
+
+                                                   break;
+
+                                               case VisualRole.HotNormal:
+                                                   e.Cancel = true;
+                                                   if (!HasFocus)
+                                                   {
+                                                       e.NewValue = GetAttributeForRole (VisualRole.HotFocus);
                                                    }
                                                    else
                                                    {
-                                                       e.NewValue = GetNormalColor ();
+                                                       e.NewValue = GetAttributeForRole (VisualRole.HotNormal);
                                                    }
-                                               }
+
+                                                   break;
                                            }
                                        };
 
-        checkbox.GettingHotNormalColor += (_, e) =>
-                                          {
-                                              if (SuperView is { HasFocus: true })
-                                              {
-                                                  e.Cancel = true;
-                                                  if (!HasFocus)
-                                                  {
-                                                      e.NewValue = GetHotFocusColor ();
-                                                  }
-                                                  else
-                                                  {
-                                                      e.NewValue = GetHotNormalColor ();
-                                                  }
-                                              }
-                                          };
-
         //checkbox.GettingFocusColor += (_, e) =>
         //                                  {
         //                                      if (SuperView is { HasFocus: true })
@@ -357,11 +362,11 @@ protected virtual CheckBox CreateCheckBox (string name, uint flag)
         //                                          e.Cancel = true;
         //                                          if (!HasFocus)
         //                                          {
-        //                                              e.NewValue = GetNormalColor ();
+        //                                              e.NewValue = GetAttributeForRole (VisualRole.Normal);
         //                                          }
         //                                          else
         //                                          {
-        //                                              e.NewValue = GetFocusColor ();
+        //                                              e.NewValue = GetAttributeForRole (VisualRole.Focus);
         //                                          }
         //                                      }
         //                                  };
@@ -373,7 +378,8 @@ protected virtual CheckBox CreateCheckBox (string name, uint flag)
                                       args.Handled = true;
 
                                       return;
-                                  };
+                                  }
+                                  ;
 
                                   if (RaiseAccepting (args.Context) is true)
                                   {
diff --git a/Terminal.Gui/Views/FrameView.cs b/Terminal.Gui/Views/FrameView.cs
index 9bde35eec6..698d0d3978 100644
--- a/Terminal.Gui/Views/FrameView.cs
+++ b/Terminal.Gui/Views/FrameView.cs
@@ -9,7 +9,7 @@ namespace Terminal.Gui;
 /// <remarks>
 ///     <para>
 ///         FrameView has <see cref="View.BorderStyle"/> set to <see cref="LineStyle.Single"/> and
-///         inherits it's color scheme from the <see cref="View.SuperView"/>.
+///         inherits it's scheme from the <see cref="View.SuperView"/>.
 ///     </para>
 ///     <para>
 ///         
@@ -37,6 +37,6 @@ public FrameView ()
     ///     This property can be set in a Theme to change the default <see cref="LineStyle"/> for all
     ///     <see cref="FrameView"/>s.
     /// </remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single;
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Rounded;
 }
diff --git a/Terminal.Gui/Views/GraphView/Annotations.cs b/Terminal.Gui/Views/GraphView/Annotations.cs
index 7d41ae4f95..f01f1075ce 100644
--- a/Terminal.Gui/Views/GraphView/Annotations.cs
+++ b/Terminal.Gui/Views/GraphView/Annotations.cs
@@ -92,11 +92,11 @@ protected void DrawText (GraphView graph, int x, int y)
 
         if (Text.Length < availableWidth)
         {
-            View.Driver.AddStr (Text);
+            graph.Driver?.AddStr (Text);
         }
         else
         {
-            View.Driver.AddStr (Text.Substring (0, availableWidth));
+            graph.Driver?.AddStr (Text.Substring (0, availableWidth));
         }
     }
 }
@@ -144,7 +144,8 @@ public void Render (GraphView graph)
     {
         if (!IsInitialized)
         {
-            ColorScheme = new ColorScheme { Normal = Application.Driver?.GetAttribute () ?? Attribute.Default};
+            // BUGBUG: We should be getting a visual role here?
+            SetScheme (new Scheme { Normal = Application.Driver?.GetAttribute () ?? Attribute.Default});
             graph.Add (this);
         }
 
@@ -217,7 +218,7 @@ public class PathAnnotation : IAnnotation
     /// <param name="graph"></param>
     public void Render (GraphView graph)
     {
-        graph.SetAttribute (LineColor ?? graph.ColorScheme.Normal);
+        graph.SetAttribute (LineColor ?? graph.GetAttributeForRole(VisualRole.Normal));
 
         foreach (LineF line in PointsToLines ())
         {
diff --git a/Terminal.Gui/Views/GraphView/GraphView.cs b/Terminal.Gui/Views/GraphView/GraphView.cs
index 93dcc1992b..8b83e0f6b0 100644
--- a/Terminal.Gui/Views/GraphView/GraphView.cs
+++ b/Terminal.Gui/Views/GraphView/GraphView.cs
@@ -343,9 +343,9 @@ public void Scroll (float offsetX, float offsetY)
 
     /// <summary>
     ///     Sets the color attribute of <see cref="Application.Driver"/> to the <see cref="GraphColor"/> (if defined) or
-    ///     <see cref="ColorScheme"/> otherwise.
+    ///     <see cref="Scheme"/> otherwise.
     /// </summary>
-    public void SetDriverColorToGraphColor () { SetAttribute (GraphColor ?? GetNormalColor ()); }
+    public void SetDriverColorToGraphColor () { SetAttribute (GraphColor ?? GetAttributeForRole (VisualRole.Normal)); }
 
     bool IDesignable.EnableForDesign ()
     {
diff --git a/Terminal.Gui/Views/HexView.cs b/Terminal.Gui/Views/HexView.cs
index 0045d901a6..9e275614cf 100644
--- a/Terminal.Gui/Views/HexView.cs
+++ b/Terminal.Gui/Views/HexView.cs
@@ -7,6 +7,7 @@
 // TODO: Support shrinking the stream (e.g. del/backspace should work).
 // 
 
+using System;
 using System.Buffers;
 
 namespace Terminal.Gui;
@@ -21,7 +22,7 @@ namespace Terminal.Gui;
 ///     </para>
 ///     <para>Users can switch from one side to the other by using the tab key.</para>
 ///     <para>
-///         To enable editing, set <see cref="AllowEdits"/> to true. When <see cref="AllowEdits"/> is true the user can
+///         To enable editing, set <see cref="ReadOnly"/> to true. When <see cref="ReadOnly"/> is true the user can
 ///         make changes to the hexadecimal values of the <see cref="Stream"/>. Any changes are tracked in the
 ///         <see cref="Edits"/> property (a <see cref="SortedDictionary{TKey, TValue}"/>) indicating the position where the
 ///         changes were made and the new values. A convenience method, <see cref="ApplyEdits"/> will apply the edits to
@@ -70,6 +71,7 @@ public HexView (Stream? source)
         AddCommand (Command.LeftStart, () => MoveLeftStart ());
         AddCommand (Command.RightEnd, () => MoveEndOfLine ());
         AddCommand (Command.StartOfPage, () => MoveUp (BytesPerLine * ((int)(Address - Viewport.Y) / BytesPerLine)));
+
         AddCommand (
                     Command.EndOfPage,
                     () => MoveDown (BytesPerLine * (Viewport.Height - 1 - (int)(Address - Viewport.Y) / BytesPerLine))
@@ -112,7 +114,11 @@ public HexView (Stream? source)
     private void HexViewSubViewsLaidOut (object? sender, LayoutEventArgs e)
     {
         SetBytesPerLine ();
-        SetContentSize (new (GetLeftSideStartColumn () + BytesPerLine / NUM_BYTES_PER_HEX_COLUMN * HEX_COLUMN_WIDTH + BytesPerLine - 1, (int)((GetEditedSize ()) / BytesPerLine) + 1));
+
+        SetContentSize (
+                        new (
+                             GetLeftSideStartColumn () + BytesPerLine / NUM_BYTES_PER_HEX_COLUMN * HEX_COLUMN_WIDTH + BytesPerLine - 1,
+                             (int)(GetEditedSize () / BytesPerLine) + 1));
     }
 
     /// <summary>Initializes a <see cref="HexView"/> class.</summary>
@@ -120,10 +126,9 @@ public HexView () : this (new MemoryStream ()) { }
 
     /// <summary>
     ///     Gets or sets whether this <see cref="HexView"/> allows editing of the <see cref="Stream"/> of the underlying
-    ///     <see cref="Stream"/>.
+    ///     <see cref="Stream"/>. The default is <see langword="false"/>.
     /// </summary>
-    /// <value><c>true</c> to allow edits; otherwise, <c>false</c>.</value>
-    public bool AllowEdits { get; set; } = true;
+    public bool ReadOnly { get; set; } = false;
 
     /// <summary>Gets the current edit position.</summary>
     /// <param name="address"></param>
@@ -134,8 +139,8 @@ public Point GetPosition (long address)
             return Point.Empty;
         }
 
-        var line = address / BytesPerLine;
-        var item = address % BytesPerLine;
+        long line = address / BytesPerLine;
+        long item = address % BytesPerLine;
 
         return new ((int)item, (int)line);
     }
@@ -145,6 +150,7 @@ public Point GetPosition (long address)
     public Point GetCursor (long address)
     {
         Point position = GetPosition (address);
+
         if (_leftSideHasFocus)
         {
             int block = position.X / NUM_BYTES_PER_HEX_COLUMN;
@@ -156,9 +162,11 @@ public Point GetCursor (long address)
         {
             position.X += BytesPerLine / NUM_BYTES_PER_HEX_COLUMN * HEX_COLUMN_WIDTH - 1;
         }
+
         position.X += GetLeftSideStartColumn ();
 
         position.Offset (-Viewport.X, -Viewport.Y);
+
         return position;
     }
 
@@ -199,6 +207,7 @@ private void ScrollToMakeCursorVisible (Point offsetToNewCursor)
 
             return position;
         }
+
         return null;
     }
 
@@ -223,7 +232,6 @@ private long GetEditedSize ()
         return Math.Max (_source!.Length, maxEditAddress + 1);
     }
 
-
     /// <summary>
     ///     Applies and edits made to the <see cref="Stream"/> and resets the contents of the
     ///     <see cref="Edits"/> property.
@@ -417,6 +425,7 @@ public int AddressWidth
             {
                 _firstNibble = true;
             }
+
             SetNeedsDraw ();
         }
 
@@ -431,11 +440,6 @@ protected override bool OnDrawingContent ()
             return true;
         }
 
-        Attribute currentAttribute = Attribute.Default;
-        Attribute current = GetFocusColor ();
-        SetAttribute (current);
-        Move (-Viewport.X, 0);
-
         long addressOfFirstLine = Viewport.Y * BytesPerLine;
 
         int nBlocks = BytesPerLine / NUM_BYTES_PER_HEX_COLUMN;
@@ -443,13 +447,18 @@ protected override bool OnDrawingContent ()
         Source.Position = addressOfFirstLine;
         long bytesRead = Source!.Read (data, 0, data.Length);
 
-        Attribute selectedAttribute = GetHotNormalColor ();
-        Attribute editedAttribute = new Attribute (GetNormalColor ().Foreground.GetHighlightColor (), GetNormalColor ().Background);
-        Attribute editingAttribute = new Attribute (GetFocusColor ().Background, GetFocusColor ().Foreground);
-        Attribute addressAttribute = new Attribute (GetNormalColor ().Foreground.GetHighlightColor (), GetNormalColor ().Background);
+        Attribute selectedAttribute = GetAttributeForRole (VisualRole.Active);
+
+        Attribute editedAttribute = GetAttributeForRole (VisualRole.Editable);
+        editedAttribute = editedAttribute with { Style = editedAttribute.Style | TextStyle.Italic | TextStyle.Underline };
+        Attribute editingAttribute = GetAttributeForRole (ReadOnly ? VisualRole.ReadOnly : VisualRole.Editable);
+        Attribute addressAttribute = GetAttributeForRole (HasFocus ? VisualRole.Focus : VisualRole.Active);
+
         for (var line = 0; line < Viewport.Height; line++)
         {
-            Move (-Viewport.X, line);
+            int max  = -Viewport.X;
+
+            Move (max, line);
             long addressOfLine = addressOfFirstLine + line * nBlocks * NUM_BYTES_PER_HEX_COLUMN;
 
             if (addressOfLine <= GetEditedSize ())
@@ -458,12 +467,14 @@ protected override bool OnDrawingContent ()
             }
             else
             {
-                SetAttribute (new Attribute (GetNormalColor ().Background.GetHighlightColor (), addressAttribute.Background));
+                SetAttributeForRole (VisualRole.Disabled);
             }
+
             var address = $"{addressOfLine:x8}";
             AddStr ($"{address.Substring (8 - AddressWidth)}");
 
-            SetAttribute (GetNormalColor ());
+            SetAttribute (editingAttribute);
+
             if (AddressWidth > 0)
             {
                 AddStr (" ");
@@ -479,15 +490,15 @@ protected override bool OnDrawingContent ()
                     if (offset + addressOfFirstLine == Address)
                     {
                         // Selected
-                        SetAttribute (_leftSideHasFocus ? editingAttribute : (edited ? editedAttribute : selectedAttribute));
+                        SetAttribute (_leftSideHasFocus ? editingAttribute : edited ? editedAttribute : GetAttributeForRole (VisualRole.Focus));
                     }
                     else
                     {
-                        SetAttribute (edited ? editedAttribute : GetNormalColor ());
+                        SetAttribute (edited ? editedAttribute : editingAttribute);
                     }
 
                     AddStr (offset >= bytesRead && !edited ? "  " : $"{value:x2}");
-                    SetAttribute (GetNormalColor ());
+                    SetAttribute (editingAttribute);
                     AddRune (_spaceCharRune);
                 }
 
@@ -516,7 +527,7 @@ protected override bool OnDrawingContent ()
                         //    break;
                         case > 127:
                             {
-                                var utf8 = GetData (data, offset, 4, out bool _);
+                                byte [] utf8 = GetData (data, offset, 4, out bool _);
 
                                 OperationStatus status = Rune.DecodeFromUtf8 (utf8, out c, out utf8BytesConsumed);
 
@@ -537,11 +548,11 @@ protected override bool OnDrawingContent ()
                 if (offset + Source.Position == Address)
                 {
                     // Selected
-                    SetAttribute (_leftSideHasFocus ? editingAttribute : (edited ? editedAttribute : selectedAttribute));
+                    SetAttribute (_leftSideHasFocus ? editingAttribute : edited ? editedAttribute : selectedAttribute);
                 }
                 else
                 {
-                    SetAttribute (edited ? editedAttribute : GetNormalColor ());
+                    SetAttribute (edited ? editedAttribute : editingAttribute);
                 }
 
                 AddRune (c);
@@ -552,6 +563,13 @@ protected override bool OnDrawingContent ()
                     AddRune (_periodCharRune);
                 }
             }
+
+            SetAttribute (editingAttribute);
+            // Fill rest of line
+            for (int x = max; x < Viewport.Width; x++)
+            {
+                AddRune (new Rune (' '));
+            }
         }
 
         return true;
@@ -594,7 +612,7 @@ protected virtual void OnPositionChanged (HexViewEventArgs e) { }
     /// <inheritdoc/>
     protected override bool OnKeyDownNotHandled (Key keyEvent)
     {
-        if (!AllowEdits || _source is null)
+        if (ReadOnly || _source is null)
         {
             return false;
         }
@@ -719,6 +737,7 @@ private byte [] GetData (byte [] buffer, int offset, int count, out bool edited)
         edited = false;
 
         long pos = Viewport.Y + offset;
+
         for (long i = pos; i < pos + count; i++)
         {
             if (_edits.TryGetValue (i, out byte v))
@@ -780,6 +799,7 @@ private bool MoveEnd ()
     {
         // This lets address go past the end of the stream one, enabling adding to the stream.
         Address = GetEditedSize ();
+
         return true;
     }
 
@@ -787,12 +807,14 @@ private bool MoveEndOfLine ()
     {
         // This lets address go past the end of the stream one, enabling adding to the stream.
         Address = Math.Min (Address / BytesPerLine * BytesPerLine + BytesPerLine - 1, GetEditedSize ());
+
         return true;
     }
 
     private bool MoveHome ()
     {
         Address = 0;
+
         return true;
     }
 
@@ -843,7 +865,6 @@ private bool MoveRight ()
         return true;
     }
 
-
     private bool MoveLeftStart ()
     {
         Address = Address / BytesPerLine * BytesPerLine;
@@ -858,7 +879,7 @@ private bool MoveUp (int bytes)
         return true;
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override bool OnAdvancingFocus (NavigationDirection direction, TabBehavior? behavior)
     {
         if (behavior is { } && behavior != TabStop)
diff --git a/Terminal.Gui/Views/HistoryTextItemEventArgs.cs b/Terminal.Gui/Views/HistoryTextItemEventArgs.cs
deleted file mode 100644
index c75f4a5e8b..0000000000
--- a/Terminal.Gui/Views/HistoryTextItemEventArgs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// TextView.cs: multi-line text editing
-
-namespace Terminal.Gui;
-
-internal partial class HistoryText
-{
-    public class HistoryTextItemEventArgs : EventArgs
-    {
-        public Point CursorPosition;
-        public Point FinalCursorPosition;
-        public bool IsUndoing;
-        public List<List<Cell>> Lines;
-        public LineStatus LineStatus;
-        public HistoryTextItemEventArgs RemovedOnAdded;
-
-        public HistoryTextItemEventArgs (List<List<Cell>> lines, Point curPos, LineStatus linesStatus)
-        {
-            Lines = lines;
-            CursorPosition = curPos;
-            LineStatus = linesStatus;
-        }
-
-        public HistoryTextItemEventArgs (HistoryTextItemEventArgs historyTextItem)
-        {
-            Lines = new List<List<Cell>> (historyTextItem.Lines);
-            CursorPosition = new Point (historyTextItem.CursorPosition.X, historyTextItem.CursorPosition.Y);
-            LineStatus = historyTextItem.LineStatus;
-        }
-
-        public override string ToString () { return $"(Count: {Lines.Count}, Cursor: {CursorPosition}, Status: {LineStatus})"; }
-    }
-}
diff --git a/Terminal.Gui/Views/LineView.cs b/Terminal.Gui/Views/LineView.cs
index ccb65d3fd2..77cbfed96c 100644
--- a/Terminal.Gui/Views/LineView.cs
+++ b/Terminal.Gui/Views/LineView.cs
@@ -57,7 +57,7 @@ public LineView (Orientation orientation)
     protected override bool OnDrawingContent ()
     {
         Move (0, 0);
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
 
         int hLineWidth = Math.Max (1, Glyphs.HLine.GetColumns ());
 
diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs
index 9a041963bc..a48be3d89b 100644
--- a/Terminal.Gui/Views/ListView.cs
+++ b/Terminal.Gui/Views/ListView.cs
@@ -723,8 +723,7 @@ public virtual bool MoveUp ()
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        Attribute current = ColorScheme?.Focus ?? Attribute.Default;
-        SetAttribute (current);
+        Attribute current = Attribute.Default;
         Move (0, 0);
         Rectangle f = Viewport;
         int item = Viewport.Y;
@@ -736,13 +735,13 @@ protected override bool OnDrawingContent ()
         {
             bool isSelected = item == _selected;
 
-            Attribute newcolor = focused ? isSelected ? ColorScheme.Focus : GetNormalColor () :
-                                 isSelected ? ColorScheme.HotNormal : GetNormalColor ();
+            Attribute newAttribute = focused ? isSelected ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal) :
+                                 isSelected ? GetAttributeForRole (VisualRole.Active) : GetAttributeForRole (VisualRole.Normal);
 
-            if (newcolor != current)
+            if (newAttribute != current)
             {
-                SetAttribute (newcolor);
-                current = newcolor;
+                SetAttribute (newAttribute);
+                current = newAttribute;
             }
 
             Move (0, row);
@@ -856,24 +855,9 @@ public virtual bool OnSelectedChanged ()
         return false;
     }
 
-    /// <summary>This event is raised when the user Double Clicks on an item or presses ENTER to open the selected item.</summary>
+    /// <summary>This event is raised when the user Double-Clicks on an item or presses ENTER to open the selected item.</summary>
     public event EventHandler<ListViewItemEventArgs> OpenSelectedItem;
 
-    ///// <inheritdoc/>
-    //public override Point? PositionCursor ()
-    //{
-    //    int x = 0;
-    //    int y = _selected - Viewport.Y;
-    //    if (!_allowsMarking)
-    //    {
-    //        x = Viewport.Width - 1;
-    //    }
-
-    //    Move (x, y);
-
-    //    return null; // Don't show the cursor
-    //}
-
     /// <summary>This event is invoked when this <see cref="ListView"/> is being drawn before rendering.</summary>
     public event EventHandler<ListViewRowEventArgs> RowRender;
 
diff --git a/Terminal.Gui/Views/Menu/MenuBarItemv2.cs b/Terminal.Gui/Views/Menu/MenuBarItemv2.cs
index 325a3d3d3a..8130dae0c9 100644
--- a/Terminal.Gui/Views/Menu/MenuBarItemv2.cs
+++ b/Terminal.Gui/Views/Menu/MenuBarItemv2.cs
@@ -121,13 +121,13 @@ public PopoverMenu? PopoverMenu
 
             void OnPopoverVisibleChanged (object? sender, EventArgs args)
             {
-                Logging.Debug ($"OnPopoverVisibleChanged - {Title} - Visible = {_popoverMenu?.Visible} ");
+                // Logging.Debug ($"OnPopoverVisibleChanged - {Title} - Visible = {_popoverMenu?.Visible} ");
                 PopoverMenuOpen = _popoverMenu?.Visible ?? false;
             }
 
             void OnPopoverMenuOnAccepted (object? sender, CommandEventArgs args)
             {
-                Logging.Debug ($"OnPopoverMenuOnAccepted - {Title} - {args.Context?.Source?.Title} - {args.Context?.Command}");
+                // Logging.Debug ($"OnPopoverMenuOnAccepted - {Title} - {args.Context?.Source?.Title} - {args.Context?.Command}");
                 RaiseAccepted (args.Context);
             }
         }
@@ -186,7 +186,7 @@ protected override bool OnKeyDownNotHandled (Key key)
     /// <inheritdoc/>
     protected override void OnHasFocusChanged (bool newHasFocus, View? previousFocusedView, View? focusedView)
     {
-        Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+        // Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
     }
 
     /// <inheritdoc/>
diff --git a/Terminal.Gui/Views/Menu/MenuBarv2.cs b/Terminal.Gui/Views/Menu/MenuBarv2.cs
index 7dcc40c012..90eb15b7e4 100644
--- a/Terminal.Gui/Views/Menu/MenuBarv2.cs
+++ b/Terminal.Gui/Views/Menu/MenuBarv2.cs
@@ -33,7 +33,8 @@ public MenuBarv2 (IEnumerable<MenuBarItemv2> menuBarItems) : base (menuBarItems)
                     Command.HotKey,
                     () =>
                     {
-                        Logging.Debug ($"{Title} - Command.HotKey");
+                        // Logging.Debug ($"{Title} - Command.HotKey");
+
                         if (RaiseHandlingHotKey () is true)
                         {
                             return true;
@@ -65,7 +66,8 @@ public MenuBarv2 (IEnumerable<MenuBarItemv2> menuBarItems) : base (menuBarItems)
                     Command.Quit,
                     ctx =>
                     {
-                        Logging.Debug ($"{Title} - Command.Quit");
+                        // Logging.Debug ($"{Title} - Command.Quit");
+
                         if (HideActiveItem ())
                         {
                             return true;
@@ -90,7 +92,7 @@ public MenuBarv2 (IEnumerable<MenuBarItemv2> menuBarItems) : base (menuBarItems)
 
         BorderStyle = DefaultBorderStyle;
 
-        Applied += OnConfigurationManagerApplied;
+        ConfigurationManager.Applied += OnConfigurationManagerApplied;
         SuperViewChanged += OnSuperViewChanged;
 
         return;
@@ -108,7 +110,7 @@ private void OnSuperViewChanged (object? sender, SuperViewChangedEventArgs e)
             // BUGBUG: For some reason in some unit tests, when Top is disposed, MenuBar.Dispose does not get called.
             // BUGBUG: Yet, the MenuBar does get Removed from Top (and it's SuperView set to null).
             // BUGBUG: Related: https://github.com/gui-cs/Terminal.Gui/issues/4021
-            Applied -= OnConfigurationManagerApplied;
+            ConfigurationManager.Applied -= OnConfigurationManagerApplied;
         }
     }
 
@@ -125,7 +127,7 @@ protected override bool OnBorderStyleChanged ()
     /// <summary>
     ///     Gets or sets the default Border Style for the MenuBar. The default is <see cref="LineStyle.None"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public new static LineStyle DefaultBorderStyle { get; set; } = LineStyle.None;
 
     private Key _key = DefaultKey;
@@ -168,7 +170,7 @@ public MenuBarItemv2 []? Menus
         }
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override void OnSubViewAdded (View view)
     {
         base.OnSubViewAdded (view);
@@ -180,10 +182,11 @@ protected override void OnSubViewAdded (View view)
         }
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override void OnSubViewRemoved (View view)
     {
         base.OnSubViewRemoved (view);
+
         if (view is MenuBarItemv2 mbi)
         {
             mbi.Accepted -= OnMenuBarItemAccepted;
@@ -199,17 +202,12 @@ private void OnMenuBarItemPopoverMenuOpenChanged (object? sender, EventArgs<bool
             {
                 Active = true;
             }
-            else
-            {
-
-
-            }
         }
     }
 
     private void OnMenuBarItemAccepted (object? sender, CommandEventArgs e)
     {
-        Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command}");
+        // Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command}");
 
         RaiseAccepted (e.Context);
     }
@@ -218,14 +216,14 @@ private void OnMenuBarItemAccepted (object? sender, CommandEventArgs e)
     public event EventHandler<KeyChangedEventArgs>? KeyChanged;
 
     /// <summary>The default key for activating menu bars.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key DefaultKey { get; set; } = Key.F9;
 
     /// <summary>
     ///     Gets whether any of the menu bar items have a visible <see cref="PopoverMenu"/>.
     /// </summary>
     /// <exception cref="NotImplementedException"></exception>
-    public bool IsOpen () { return SubViews.OfType<MenuBarItemv2>().Count (sv => sv is { PopoverMenuOpen: true }) > 0; }
+    public bool IsOpen () { return SubViews.OfType<MenuBarItemv2> ().Count (sv => sv is { PopoverMenuOpen: true }) > 0; }
 
     private bool _active;
 
@@ -246,7 +244,7 @@ internal set
             }
 
             _active = value;
-            Logging.Debug ($"Active set to {_active} - CanFocus: {CanFocus}, HasFocus: {HasFocus}");
+            // Logging.Debug ($"Active set to {_active} - CanFocus: {CanFocus}, HasFocus: {HasFocus}");
 
             if (!_active)
             {
@@ -255,8 +253,7 @@ internal set
             }
 
             CanFocus = value;
-            Logging.Debug ($"Set CanFocus: {CanFocus}, HasFocus: {HasFocus}");
-
+            // Logging.Debug ($"Set CanFocus: {CanFocus}, HasFocus: {HasFocus}");
         }
     }
 
@@ -265,7 +262,8 @@ protected override bool OnMouseEnter (CancelEventArgs eventArgs)
     {
         // If the MenuBar does not have focus and the mouse enters: Enable CanFocus
         // But do NOT show a Popover unless the user clicks or presses a hotkey
-        Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+        // Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+
         if (!HasFocus)
         {
             Active = true;
@@ -277,7 +275,8 @@ protected override bool OnMouseEnter (CancelEventArgs eventArgs)
     /// <inheritdoc/>
     protected override void OnMouseLeave ()
     {
-        Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+        // Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+
         if (!IsOpen ())
         {
             Active = false;
@@ -289,7 +288,8 @@ protected override void OnMouseLeave ()
     /// <inheritdoc/>
     protected override void OnHasFocusChanged (bool newHasFocus, View? previousFocusedView, View? focusedView)
     {
-        Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+        // Logging.Debug ($"CanFocus = {CanFocus}, HasFocus = {HasFocus}");
+
         if (!newHasFocus)
         {
             Active = false;
@@ -299,7 +299,7 @@ protected override void OnHasFocusChanged (bool newHasFocus, View? previousFocus
     /// <inheritdoc/>
     protected override void OnSelectedMenuItemChanged (MenuItemv2? selected)
     {
-        Logging.Debug ($"{Title} ({selected?.Title}) - IsOpen: {IsOpen ()}");
+        // Logging.Debug ($"{Title} ({selected?.Title}) - IsOpen: {IsOpen ()}");
 
         if (IsOpen () && selected is MenuBarItemv2 { PopoverMenuOpen: false } selectedMenuBarItem)
         {
@@ -328,7 +328,7 @@ public override void EndInit ()
     /// <inheritdoc/>
     protected override bool OnAccepting (CommandEventArgs args)
     {
-        Logging.Debug ($"{Title} ({args.Context?.Source?.Title})");
+        // Logging.Debug ($"{Title} ({args.Context?.Source?.Title})");
 
         // TODO: Ensure sourceMenuBar is actually one of our bar items
         if (Visible && Enabled && args.Context?.Source is MenuBarItemv2 { PopoverMenuOpen: false } sourceMenuBarItem)
@@ -340,7 +340,7 @@ protected override bool OnAccepting (CommandEventArgs args)
                 // We are not Active; change that
                 Active = true;
 
-                ShowItem(sourceMenuBarItem);
+                ShowItem (sourceMenuBarItem);
 
                 if (!sourceMenuBarItem.HasFocus)
                 {
@@ -359,10 +359,10 @@ protected override bool OnAccepting (CommandEventArgs args)
         return false;
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override void OnAccepted (CommandEventArgs args)
     {
-        Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command}");
+        // Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command}");
         base.OnAccepted (args);
 
         if (SubViews.OfType<MenuBarItemv2> ().Contains (args.Context?.Source))
@@ -379,11 +379,12 @@ protected override void OnAccepted (CommandEventArgs args)
     /// <param name="menuBarItem"></param>
     private void ShowItem (MenuBarItemv2? menuBarItem)
     {
-        Logging.Debug ($"{Title} - {menuBarItem?.Id}");
+        // Logging.Debug ($"{Title} - {menuBarItem?.Id}");
 
         if (!Active || !Visible)
         {
-            Logging.Debug ($"{Title} - {menuBarItem?.Id} - Not Active, not showing.");
+            // Logging.Debug ($"{Title} - {menuBarItem?.Id} - Not Active, not showing.");
+
             return;
         }
 
@@ -398,13 +399,13 @@ private void ShowItem (MenuBarItemv2? menuBarItem)
         if (Application.Popover?.GetActivePopover () is PopoverMenu popoverMenu
             && popoverMenu?.Root?.SuperMenuItem?.SuperView == this)
         {
-            Logging.Debug ($"{Title} - Calling Application.Popover?.Hide ({popoverMenu.Title})");
+            // Logging.Debug ($"{Title} - Calling Application.Popover?.Hide ({popoverMenu.Title})");
             Application.Popover?.Hide (popoverMenu);
         }
 
         if (menuBarItem is null)
         {
-            Logging.Debug ($"{Title} - menuBarItem is null.");
+            // Logging.Debug ($"{Title} - menuBarItem is null.");
 
             return;
         }
@@ -417,16 +418,18 @@ private void ShowItem (MenuBarItemv2? menuBarItem)
             menuBarItem.PopoverMenu.Root.SuperMenuItem = menuBarItem;
         }
 
-        Logging.Debug ($"{Title} - \"{menuBarItem.PopoverMenu?.Title}\".MakeVisible");
+        // Logging.Debug ($"{Title} - \"{menuBarItem.PopoverMenu?.Title}\".MakeVisible");
         menuBarItem.PopoverMenu?.MakeVisible (new Point (menuBarItem.FrameToScreen ().X, menuBarItem.FrameToScreen ().Bottom));
 
         menuBarItem.Accepting += OnMenuItemAccepted;
 
+        menuBarItem.PopoverMenu!.Root.SchemeName = SchemeName;
+
         return;
 
         void OnMenuItemAccepted (object? sender, EventArgs args)
         {
-            Logging.Debug ($"{Title} - OnMenuItemAccepted");
+            // Logging.Debug ($"{Title} - OnMenuItemAccepted");
             menuBarItem.PopoverMenu!.VisibleChanged -= OnMenuItemAccepted;
 
             if (Active && menuBarItem.PopoverMenu is { Visible: false })
@@ -452,11 +455,11 @@ void OnMenuItemAccepted (object? sender, EventArgs args)
     /// <returns><see langword="true"/> if the popover was hidden</returns>
     public bool HideItem (MenuBarItemv2? activeItem)
     {
-        Logging.Debug ($"{Title} ({activeItem?.Title}) - Active: {Active}, CanFocus: {CanFocus}, HasFocus: {HasFocus}");
+        // Logging.Debug ($"{Title} ({activeItem?.Title}) - Active: {Active}, CanFocus: {CanFocus}, HasFocus: {HasFocus}");
 
         if (activeItem is null || !activeItem.PopoverMenu!.Visible)
         {
-            Logging.Debug ($"{Title} No active item.");
+            // Logging.Debug ($"{Title} No active item.");
 
             return false;
         }
@@ -478,10 +481,12 @@ public bool HideItem (MenuBarItemv2? activeItem)
     public IEnumerable<MenuItemv2> GetMenuItemsWithTitle (string title)
     {
         List<MenuItemv2> menuItems = new ();
+
         if (string.IsNullOrEmpty (title))
         {
             return menuItems;
         }
+
         foreach (MenuBarItemv2 mbi in SubViews.OfType<MenuBarItemv2> ())
         {
             if (mbi.PopoverMenu is { })
@@ -489,6 +494,7 @@ public IEnumerable<MenuItemv2> GetMenuItemsWithTitle (string title)
                 menuItems.AddRange (mbi.PopoverMenu.GetMenuItemsOfAllSubMenus ());
             }
         }
+
         return menuItems.Where (mi => mi.Title == title);
     }
 
@@ -498,7 +504,7 @@ public bool EnableForDesign<TContext> (ref TContext context) where TContext : no
         // Note: This menu is used by unit tests. If you modify it, you'll likely have to update
         // unit tests.
 
-        Id = "DemonuBar";
+        Id = "DemoBar";
 
         var bordersCb = new CheckBox
         {
@@ -513,7 +519,7 @@ public bool EnableForDesign<TContext> (ref TContext context) where TContext : no
 
         var enableOverwriteCb = new CheckBox
         {
-            Title = "Enable _Overwrite",
+            Title = "Enable _Overwrite"
         };
 
         var mutuallyExclusiveOptionsSelector = new OptionSelector
@@ -522,100 +528,105 @@ public bool EnableForDesign<TContext> (ref TContext context) where TContext : no
             SelectedItem = 0
         };
 
-        var menuBgColorCp = new ColorPicker ()
+        var menuBgColorCp = new ColorPicker
         {
             Width = 30
         };
 
         menuBgColorCp.ColorChanged += (sender, args) =>
                                       {
-                                          ColorScheme = ColorScheme! with
-                                          {
-                                              Normal = new (ColorScheme.Normal.Foreground, args.CurrentValue)
-                                          };
+                                          // BUGBUG: This is weird.
+                                          SetScheme (
+                                                     GetScheme () with
+                                                     {
+                                                         Normal = new (
+                                                                       GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                       args.CurrentValue,
+                                                                       GetAttributeForRole (VisualRole.Normal).Style)
+                                                     });
                                       };
 
         Add (
-                        new MenuBarItemv2 (
-                                           "_File",
-                                           [
-                                               new MenuItemv2 (context as View, Command.New),
-                                               new MenuItemv2 (context as View, Command.Open),
-                                               new MenuItemv2 (context as View, Command.Save),
-                                               new MenuItemv2 (context as View, Command.SaveAs),
-                                               new Line (),
-                                               new MenuItemv2
-                                               {
-                                                   Title = "_File Options",
-                                                   SubMenu = new (
-                                                                  [
-                                                                      new ()
-                                                                      {
-                                                                          Id = "AutoSave",
-                                                                          Text = "(no Command)",
-                                                                          Key = Key.F10,
-                                                                          CommandView = autoSaveCb
-                                                                      },
-                                                                      new ()
-                                                                      {
-                                                                          Text = "Overwrite",
-                                                                          Id = "Overwrite",
-                                                                          Key = Key.W.WithCtrl,
-                                                                          CommandView = enableOverwriteCb,
-                                                                          Command = Command.EnableOverwrite,
-                                                                          TargetView = context as View
-                                                                      },
-                                                                      new ()
-                                                                      {
-                                                                          Title = "_File Settings...",
-                                                                          HelpText = "More file settings",
-                                                                          Action = () => MessageBox.Query (
-                                                                                    "File Settings",
-                                                                                    "This is the File Settings Dialog\n",
-                                                                                    "_Ok",
-                                                                                    "_Cancel")
-                                                                      }
-                                                                  ]
-                                                                 )
-                                               },
-                                               new Line (),
-                                               new MenuItemv2
-                                               {
-                                                   Title = "_Preferences",
-                                                   SubMenu = new (
-                                                                  [
-                                                                      new MenuItemv2 ()
-                                                                      {
-                                                                          CommandView = bordersCb,
-                                                                          HelpText = "Toggle Menu Borders",
-                                                                          Action = ToggleMenuBorders
-                                                                      },
-                                                                      new MenuItemv2 ()
-                                                                      {
-                                                                          HelpText = "3 Mutually Exclusive Options",
-                                                                          CommandView = mutuallyExclusiveOptionsSelector,
-                                                                          Key = Key.F7
-                                                                      },
-                                                                      new Line (),
-                                                                      new MenuItemv2 ()
-                                                                      {
-                                                                          HelpText = "MenuBar BG Color",
-                                                                          CommandView = menuBgColorCp,
-                                                                          Key = Key.F8,
-                                                                      }
-                                                                  ]
-                                                                 )
-                                               },
-                                               new Line (),
-                                               new MenuItemv2 ()
-                                               {
-                                                   TargetView = context as View,
-                                                   Key = Application.QuitKey,
-                                                   Command = Command.Quit
-                                               }
-                                           ]
-                                          )
-                       );
+             new MenuBarItemv2 (
+                                "_File",
+                                [
+                                    new MenuItemv2 (context as View, Command.New),
+                                    new MenuItemv2 (context as View, Command.Open),
+                                    new MenuItemv2 (context as View, Command.Save),
+                                    new MenuItemv2 (context as View, Command.SaveAs),
+                                    new Line (),
+                                    new MenuItemv2
+                                    {
+                                        Title = "_File Options",
+                                        SubMenu = new (
+                                                       [
+                                                           new ()
+                                                           {
+                                                               Id = "AutoSave",
+                                                               Text = "(no Command)",
+                                                               Key = Key.F10,
+                                                               CommandView = autoSaveCb
+                                                           },
+                                                           new ()
+                                                           {
+                                                               Text = "Overwrite",
+                                                               Id = "Overwrite",
+                                                               Key = Key.W.WithCtrl,
+                                                               CommandView = enableOverwriteCb,
+                                                               Command = Command.EnableOverwrite,
+                                                               TargetView = context as View
+                                                           },
+                                                           new ()
+                                                           {
+                                                               Title = "_File Settings...",
+                                                               HelpText = "More file settings",
+                                                               Action = () => MessageBox.Query (
+                                                                                                "File Settings",
+                                                                                                "This is the File Settings Dialog\n",
+                                                                                                "_Ok",
+                                                                                                "_Cancel")
+                                                           }
+                                                       ]
+                                                      )
+                                    },
+                                    new Line (),
+                                    new MenuItemv2
+                                    {
+                                        Title = "_Preferences",
+                                        SubMenu = new (
+                                                       [
+                                                           new MenuItemv2
+                                                           {
+                                                               CommandView = bordersCb,
+                                                               HelpText = "Toggle Menu Borders",
+                                                               Action = ToggleMenuBorders
+                                                           },
+                                                           new MenuItemv2
+                                                           {
+                                                               HelpText = "3 Mutually Exclusive Options",
+                                                               CommandView = mutuallyExclusiveOptionsSelector,
+                                                               Key = Key.F7
+                                                           },
+                                                           new Line (),
+                                                           new MenuItemv2
+                                                           {
+                                                               HelpText = "MenuBar BG Color",
+                                                               CommandView = menuBgColorCp,
+                                                               Key = Key.F8
+                                                           }
+                                                       ]
+                                                      )
+                                    },
+                                    new Line (),
+                                    new MenuItemv2
+                                    {
+                                        TargetView = context as View,
+                                        Key = Application.QuitKey,
+                                        Command = Command.Quit
+                                    }
+                                ]
+                               )
+            );
 
         Add (
              new MenuBarItemv2 (
@@ -627,11 +638,11 @@ public bool EnableForDesign<TContext> (ref TContext context) where TContext : no
                                     new Line (),
                                     new MenuItemv2 (context as View, Command.SelectAll),
                                     new Line (),
-                                    new MenuItemv2 ()
+                                    new MenuItemv2
                                     {
                                         Title = "_Details",
                                         SubMenu = new (ConfigureDetailsSubMenu ())
-                                    },
+                                    }
                                 ]
                                )
             );
@@ -690,7 +701,7 @@ MenuItemv2 [] ConfigureDetailsSubMenu ()
             var nestedSubMenu = new MenuItemv2
             {
                 Title = "_Moar Details",
-                SubMenu = new (ConfigureMoreDetailsSubMenu ()),
+                SubMenu = new (ConfigureMoreDetailsSubMenu ())
             };
 
             var editMode = new MenuItemv2
@@ -700,7 +711,7 @@ MenuItemv2 [] ConfigureDetailsSubMenu ()
                 Command = Command.Edit,
                 CommandView = new CheckBox
                 {
-                    Title = "E_dit Mode",
+                    Title = "E_dit Mode"
                 }
             };
 
@@ -727,17 +738,17 @@ View [] ConfigureMoreDetailsSubMenu ()
                 return [deeperDetail, new Line (), belowLineDetail];
             }
         }
-
     }
 
     /// <inheritdoc/>
     protected override void Dispose (bool disposing)
     {
         base.Dispose (disposing);
+
         if (disposing)
         {
             SuperViewChanged += OnSuperViewChanged;
-            Applied -= OnConfigurationManagerApplied;
+            ConfigurationManager.Applied -= OnConfigurationManagerApplied;
         }
     }
 }
diff --git a/Terminal.Gui/Views/Menu/MenuItemv2.cs b/Terminal.Gui/Views/Menu/MenuItemv2.cs
index ca7cbf578c..06f69b99bc 100644
--- a/Terminal.Gui/Views/Menu/MenuItemv2.cs
+++ b/Terminal.Gui/Views/Menu/MenuItemv2.cs
@@ -104,7 +104,7 @@ public Command Command
 
     internal override bool? DispatchCommand (ICommandContext? commandContext)
     {
-        Logging.Debug ($"{Title} - {commandContext?.Source?.Title} Command: {commandContext?.Command}");
+        // Logging.Debug ($"{Title} - {commandContext?.Source?.Title} Command: {commandContext?.Command}");
         bool? ret = null;
 
         bool quit = false;
@@ -114,7 +114,7 @@ public Command Command
             if (keyCommandContext.Binding.Key is { } && keyCommandContext.Binding.Key == Application.QuitKey && SuperView is { Visible: true })
             {
                 // This supports a MenuItem with Key = Application.QuitKey/Command = Command.Quit
-                Logging.Debug ($"{Title} - Ignoring Key = Application.QuitKey/Command = Command.Quit");
+                // Logging.Debug ($"{Title} - Ignoring Key = Application.QuitKey/Command = Command.Quit");
                 quit = true;
                 //ret = true;
             }
@@ -130,27 +130,27 @@ public Command Command
         {
             if (TargetView is { })
             {
-                Logging.Debug ($"{Title} - InvokeCommand on TargetView ({TargetView.Title})...");
+                // Logging.Debug ($"{Title} - InvokeCommand on TargetView ({TargetView.Title})...");
                 ret = TargetView.InvokeCommand (Command, commandContext);
             }
             else
             {
                 // Is this an Application-bound command?
-                Logging.Debug ($"{Title} - Application.InvokeCommandsBoundToKey ({Key})...");
+                // Logging.Debug ($"{Title} - Application.InvokeCommandsBoundToKey ({Key})...");
                 ret = Application.InvokeCommandsBoundToKey (Key);
             }
         }
 
         if (ret is not true)
         {
-            Logging.Debug ($"{Title} - calling base.DispatchCommand...");
+            // Logging.Debug ($"{Title} - calling base.DispatchCommand...");
             // Base will Raise Selected, then Accepting, then invoke the Action, if any
             ret = base.DispatchCommand (commandContext);
         }
 
         if (ret is true)
         {
-            Logging.Debug ($"{Title} - Calling RaiseAccepted");
+            // Logging.Debug ($"{Title} - Calling RaiseAccepted");
             RaiseAccepted (commandContext);
         }
 
@@ -160,7 +160,7 @@ public Command Command
     ///// <inheritdoc />
     //protected override bool OnAccepting (CommandEventArgs e)
     //{
-    //    Logging.Debug ($"{Title} - calling base.OnAccepting: {e.Context?.Command}");
+    //    // Logging.Debug ($"{Title} - calling base.OnAccepting: {e.Context?.Command}");
     //    bool? ret = base.OnAccepting (e);
 
     //    if (ret is true || e.Cancel)
diff --git a/Terminal.Gui/Views/Menu/Menuv2.cs b/Terminal.Gui/Views/Menu/Menuv2.cs
index 9bebb7603b..b3ddd120b0 100644
--- a/Terminal.Gui/Views/Menu/Menuv2.cs
+++ b/Terminal.Gui/Views/Menu/Menuv2.cs
@@ -21,7 +21,7 @@ public Menuv2 (IEnumerable<View>? shortcuts) : base (shortcuts)
         Orientation = Orientation.Vertical;
         Width = Dim.Auto ();
         Height = Dim.Auto (DimAutoStyle.Content, 1);
-        base.ColorScheme = Colors.ColorSchemes ["Menu"];
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Menu);
 
         if (Border is { })
         {
@@ -30,7 +30,7 @@ public Menuv2 (IEnumerable<View>? shortcuts) : base (shortcuts)
 
         BorderStyle = DefaultBorderStyle;
 
-        Applied += OnConfigurationManagerApplied;
+        ConfigurationManager.Applied += OnConfigurationManagerApplied;
     }
 
     private void OnConfigurationManagerApplied (object? sender, ConfigurationManagerEventArgs e)
@@ -42,10 +42,10 @@ private void OnConfigurationManagerApplied (object? sender, ConfigurationManager
     }
 
     /// <summary>
-    ///     Gets or sets the default Border Style for Menus. The default is <see cref="LineStyle.Single"/>.
+    ///     Gets or sets the default Border Style for Menus. The default is <see cref="LineStyle.None"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Rounded;
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.None;
 
     /// <summary>
     ///     Gets or sets the menu item that opened this menu as a sub-menu.
@@ -86,7 +86,7 @@ protected override void OnSubViewAdded (View view)
 
                     void MenuItemOnAccepted (object? sender, CommandEventArgs e)
                     {
-                        Logging.Debug ($"MenuItemOnAccepted: Calling RaiseAccepted {e.Context?.Source?.Title}");
+                        // Logging.Debug ($"MenuItemOnAccepted: Calling RaiseAccepted {e.Context?.Source?.Title}");
                         RaiseAccepted (e.Context);
                     }
                 }
@@ -105,23 +105,23 @@ protected override bool OnAccepting (CommandEventArgs args)
     {
         // When the user accepts a menuItem, Menu.RaiseAccepting is called, and we intercept that here.
 
-        Logging.Debug ($"{Title} - {args.Context?.Source?.Title} Command: {args.Context?.Command}");
+        // Logging.Debug ($"{Title} - {args.Context?.Source?.Title} Command: {args.Context?.Command}");
 
         // TODO: Consider having PopoverMenu subscribe to Accepting instead of us overriding OnAccepting here
         // TODO: Doing so would be better encapsulation and might allow us to remove the SuperMenuItem property.
         if (SuperView is { })
         {
-            Logging.Debug ($"{Title} - SuperView is null");
+            // Logging.Debug ($"{Title} - SuperView is null");
             //return false;
         }
 
-        Logging.Debug ($"{Title} - {args.Context}");
+        // Logging.Debug ($"{Title} - {args.Context}");
 
         if (args.Context is CommandContext<KeyBinding> { Binding.Key: { } } keyCommandContext && keyCommandContext.Binding.Key == Application.QuitKey)
         {
             // Special case QuitKey if we are Visible - This supports a MenuItem with Key = Application.QuitKey/Command = Command.Quit
             // And causes just the menu to quit.
-            Logging.Debug ($"{Title} - Returning true - Application.QuitKey/Command = Command.Quit");
+            // Logging.Debug ($"{Title} - Returning true - Application.QuitKey/Command = Command.Quit");
             return true;
         }
 
@@ -129,7 +129,7 @@ protected override bool OnAccepting (CommandEventArgs args)
         // Command.Accept to the SuperMenuItem if it exists.
         if (SuperView is null && SuperMenuItem is { })
         {
-            Logging.Debug ($"{Title} - Invoking Accept on SuperMenuItem: {SuperMenuItem?.Title}...");
+            // Logging.Debug ($"{Title} - Invoking Accept on SuperMenuItem: {SuperMenuItem?.Title}...");
             return SuperMenuItem?.InvokeCommand (Command.Accept, args.Context) is true;
         }
         return false;
@@ -199,7 +199,7 @@ public MenuItemv2? SelectedMenuItem
 
     internal void RaiseSelectedMenuItemChanged (MenuItemv2? selected)
     {
-        Logging.Debug ($"{Title} ({selected?.Title})");
+        // Logging.Debug ($"{Title} ({selected?.Title})");
 
         OnSelectedMenuItemChanged (selected);
         SelectedMenuItemChanged?.Invoke (this, selected);
@@ -225,7 +225,7 @@ protected override void Dispose (bool disposing)
 
         if (disposing)
         {
-            Applied -= OnConfigurationManagerApplied;
+            ConfigurationManager.Applied -= OnConfigurationManagerApplied;
         }
     }
 }
\ No newline at end of file
diff --git a/Terminal.Gui/Views/Menu/PopoverMenu.cs b/Terminal.Gui/Views/Menu/PopoverMenu.cs
index 80629b56eb..3a97e842b9 100644
--- a/Terminal.Gui/Views/Menu/PopoverMenu.cs
+++ b/Terminal.Gui/Views/Menu/PopoverMenu.cs
@@ -70,7 +70,7 @@ public PopoverMenu (Menuv2? root)
 
         bool? Quit (ICommandContext? ctx)
         {
-            Logging.Debug ($"{Title} Command.Quit - {ctx?.Source?.Title}");
+            // Logging.Debug ($"{Title} Command.Quit - {ctx?.Source?.Title}");
 
             if (!Visible)
             {
@@ -82,7 +82,7 @@ public PopoverMenu (Menuv2? root)
             // This is important for MenuBarItems to ensure the MenuBar loses focus when
             // the user presses QuitKey to cause the menu to close.
             // Note, we override OnAccepting, which will set Visible to false
-            Logging.Debug ($"{Title} Command.Quit - Calling RaiseAccepting {ctx?.Source?.Title}");
+            // Logging.Debug ($"{Title} Command.Quit - Calling RaiseAccepting {ctx?.Source?.Title}");
             bool? ret = RaiseAccepting (ctx);
 
             if (Visible && ret is not true)
@@ -145,7 +145,7 @@ public Key Key
     public event EventHandler<KeyChangedEventArgs>? KeyChanged;
 
     /// <summary>The default key for activating popover menus.</summary>
-    [SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+    [ConfigurationProperty (Scope = typeof (SettingsScope))]
     public static Key DefaultKey { get; set; } = Key.F10.WithShift;
 
     /// <summary>
@@ -166,7 +166,7 @@ public void MakeVisible (Point? idealScreenPosition = null)
     {
         if (Visible)
         {
-            Logging.Debug ($"{Title} - Already Visible");
+            // Logging.Debug ($"{Title} - Already Visible");
 
             return;
         }
@@ -210,7 +210,7 @@ public void SetPosition (Point? idealScreenPosition = null)
     /// <inheritdoc/>
     protected override void OnVisibleChanged ()
     {
-        Logging.Debug ($"{Title} - Visible: {Visible}");
+        // Logging.Debug ($"{Title} - Visible: {Visible}");
         base.OnVisibleChanged ();
 
         if (Visible)
@@ -291,7 +291,7 @@ private void UpdateKeyBindings ()
 
             menuItem.Key = key;
 
-            Logging.Debug ($"{Title} - HotKey: {menuItem.Key}->{menuItem.Command}");
+            // Logging.Debug ($"{Title} - HotKey: {menuItem.Key}->{menuItem.Command}");
         }
     }
 
@@ -305,7 +305,7 @@ protected override bool OnKeyDownNotHandled (Key key)
         {
             if (key != Application.QuitKey && menuItem.Key == key)
             {
-                Logging.Debug ($"{Title} - key: {key}");
+                // Logging.Debug ($"{Title} - key: {key}");
 
                 return menuItem.NewKeyDownEvent (key);
             }
@@ -377,7 +377,7 @@ internal void ShowSubMenu (MenuItemv2? menuItem)
     {
         var menu = menuItem?.SuperView as Menuv2;
 
-        Logging.Debug ($"{Title} - menuItem: {menuItem?.Title}, menu: {menu?.Title}");
+        // Logging.Debug ($"{Title} - menuItem: {menuItem?.Title}, menu: {menu?.Title}");
 
         menu?.Layout ();
 
@@ -430,7 +430,7 @@ private void AddAndShowSubMenu (Menuv2? menu)
     {
         if (menu is { SuperView: null, Visible: false })
         {
-            Logging.Debug ($"{Title} ({menu?.Title}) - menu.Visible: {menu?.Visible}");
+            // Logging.Debug ($"{Title} ({menu?.Title}) - menu.Visible: {menu?.Visible}");
 
             // TODO: Find the menu item below the mouse, if any, and select it
 
@@ -455,7 +455,7 @@ private void HideAndRemoveSubMenu (Menuv2? menu)
     {
         if (menu is { Visible: true })
         {
-            Logging.Debug ($"{Title} ({menu?.Title}) - menu.Visible: {menu?.Visible}");
+            // Logging.Debug ($"{Title} ({menu?.Title}) - menu.Visible: {menu?.Visible}");
 
             // If there's a visible submenu, remove / hide it
             if (menu.SubViews.FirstOrDefault (v => v is MenuItemv2 { SubMenu.Visible: true }) is MenuItemv2 visiblePeer)
@@ -478,11 +478,11 @@ private void HideAndRemoveSubMenu (Menuv2? menu)
     private void MenuOnAccepting (object? sender, CommandEventArgs e)
     {
         var senderView = sender as View;
-        Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command} - Sender: {senderView?.GetType ().Name}");
+        // Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command} - Sender: {senderView?.GetType ().Name}");
 
         if (e.Context?.Command != Command.HotKey)
         {
-            Logging.Debug ($"{Title} - Setting Visible = false");
+            // Logging.Debug ($"{Title} - Setting Visible = false");
             Visible = false;
         }
 
@@ -490,7 +490,7 @@ private void MenuOnAccepting (object? sender, CommandEventArgs e)
         {
             if (keyCommandContext.Binding.Key is { } && keyCommandContext.Binding.Key == Application.QuitKey && SuperView is { Visible: true })
             {
-                Logging.Debug ($"{Title} - Setting e.Handled = true - Application.QuitKey/Command = Command.Quit");
+                // Logging.Debug ($"{Title} - Setting e.Handled = true - Application.QuitKey/Command = Command.Quit");
                 e.Handled = true;
             }
         }
@@ -498,7 +498,7 @@ private void MenuOnAccepting (object? sender, CommandEventArgs e)
 
     private void MenuAccepted (object? sender, CommandEventArgs e)
     {
-        Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command}");
+        // Logging.Debug ($"{Title} ({e.Context?.Source?.Title}) Command: {e.Context?.Command}");
 
         if (e.Context?.Source is MenuItemv2 { SubMenu: null })
         {
@@ -515,7 +515,7 @@ private void MenuAccepted (object? sender, CommandEventArgs e)
     /// <inheritdoc/>
     protected override bool OnAccepting (CommandEventArgs args)
     {
-        Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command}");
+        // Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command}");
 
         // If we're not visible, ignore any keys that are not hotkeys
         CommandContext<KeyBinding>? keyCommandContext = args.Context as CommandContext<KeyBinding>? ?? default (CommandContext<KeyBinding>);
@@ -524,13 +524,13 @@ protected override bool OnAccepting (CommandEventArgs args)
         {
             if (GetMenuItemsOfAllSubMenus ().All (i => i.Key != keyCommandContext.Value.Binding.Key))
             {
-                Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command} - ignore any keys that are not hotkeys");
+                // Logging.Debug ($"{Title} ({args.Context?.Source?.Title}) Command: {args.Context?.Command} - ignore any keys that are not hotkeys");
 
                 return false;
             }
         }
 
-        Logging.Debug ($"{Title} - calling base.OnAccepting: {args.Context?.Command}");
+        // Logging.Debug ($"{Title} - calling base.OnAccepting: {args.Context?.Command}");
         bool? ret = base.OnAccepting (args);
 
         if (ret is true || args.Handled)
@@ -541,7 +541,7 @@ protected override bool OnAccepting (CommandEventArgs args)
         // Only raise Accepted if the command came from one of our MenuItems
         //if (GetMenuItemsOfAllSubMenus ().Contains (args.Context?.Source))
         {
-            Logging.Debug ($"{Title} - Calling RaiseAccepted {args.Context?.Command}");
+            // Logging.Debug ($"{Title} - Calling RaiseAccepted {args.Context?.Command}");
             RaiseAccepted (args.Context);
         }
 
@@ -557,7 +557,7 @@ protected override bool OnAccepting (CommandEventArgs args)
     /// <returns></returns>
     protected void RaiseAccepted (ICommandContext? ctx)
     {
-        Logging.Debug ($"{Title} - RaiseAccepted: {ctx}");
+        // Logging.Debug ($"{Title} - RaiseAccepted: {ctx}");
         CommandEventArgs args = new () { Context = ctx };
 
         OnAccepted (args);
@@ -586,7 +586,7 @@ protected virtual void OnAccepted (CommandEventArgs args) { }
 
     private void MenuOnSelectedMenuItemChanged (object? sender, MenuItemv2? e)
     {
-        Logging.Debug ($"{Title} - e.Title: {e?.Title}");
+        // Logging.Debug ($"{Title} - e.Title: {e?.Title}");
         ShowSubMenu (e);
     }
 
diff --git a/Terminal.Gui/Views/Menuv1/Menu.cs b/Terminal.Gui/Views/Menuv1/Menu.cs
index 441eedf16f..44d4313661 100644
--- a/Terminal.Gui/Views/Menuv1/Menu.cs
+++ b/Terminal.Gui/Views/Menuv1/Menu.cs
@@ -145,7 +145,7 @@ public override void BeginInit ()
         if (_barItems is { IsTopLevel: true })
         {
             // This is a standalone MenuItem on a MenuBar
-            ColorScheme = _host.ColorScheme;
+            SetScheme (_host.GetScheme ());
             CanFocus = true;
         }
         else
@@ -162,7 +162,7 @@ public override void BeginInit ()
                 }
             }
 
-            ColorScheme = _host.ColorScheme;
+            SetScheme (_host.GetScheme ());
             CanFocus = true;
             WantMousePositionReports = _host.WantMousePositionReports;
         }
@@ -418,19 +418,19 @@ internal bool CheckSubMenu ()
         return true;
     }
 
-    internal Attribute DetermineColorSchemeFor (MenuItem? item, int index)
+    internal Attribute DetermineSchemeFor (MenuItem? item, int index)
     {
         if (item is null)
         {
-            return GetNormalColor ();
+            return GetAttributeForRole (VisualRole.Normal);
         }
 
         if (index == _currentChild)
         {
-            return GetFocusColor ();
+            return GetAttributeForRole (VisualRole.Focus);
         }
 
-        return !item.IsEnabled () ? ColorScheme!.Disabled : GetNormalColor ();
+        return !item.IsEnabled () ? GetAttributeForRole (VisualRole.Disabled) : GetAttributeForRole (VisualRole.Normal);
     }
 
     internal required MenuBar Host
@@ -456,14 +456,14 @@ internal static Rectangle MakeFrame (int x, int y, MenuItem? []? items, Menu? pa
         int maxW = (items.Max (z => z?.Width) ?? 0) + borderOffset;
         int maxH = items.Length + borderOffset;
 
-        if (parent is { } && x + maxW > Driver.Cols)
+        if (parent is { } && x + maxW > Application.Screen.Width)
         {
             minX = Math.Max (parent.Frame.Right - parent.Frame.Width - maxW, 0);
         }
 
-        if (y + maxH > Driver.Rows)
+        if (y + maxH > Application.Screen.Height)
         {
-            minY = Math.Max (Driver.Rows - maxH, 0);
+            minY = Math.Max (Application.Screen.Height - maxH, 0);
         }
 
         return new (minX, minY, maxW, maxH);
@@ -837,7 +837,7 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
         // BUGBUG: Views should not change the clip. Doing so is an indcation of poor design or a bug in the framework.
         Region? savedClip = SetClipToScreen ();
 
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
 
         for (int i = Viewport.Y; i < _barItems!.Children.Length; i++)
         {
@@ -856,8 +856,8 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
             SetAttribute (
 
                           // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-                          item is null ? GetNormalColor () :
-                          i == _currentChild ? GetFocusColor () : GetNormalColor ()
+                          item is null ? GetAttributeForRole (VisualRole.Normal) :
+                          i == _currentChild ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal)
                          );
 
             if (item is null && BorderStyle != LineStyle.None)
@@ -871,7 +871,7 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
                 Move (0, i);
             }
 
-            SetAttribute (DetermineColorSchemeFor (item, i));
+            SetAttribute (DetermineSchemeFor (item, i));
 
             for (int p = Viewport.X; p < Frame.Width - 2; p++)
             {
@@ -955,7 +955,7 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
 
                 if (!item.IsEnabled ())
                 {
-                    DrawHotString (textToDraw, ColorScheme!.Disabled, ColorScheme.Disabled);
+                    DrawHotString (textToDraw, GetAttributeForRole (VisualRole.Disabled), GetAttributeForRole (VisualRole.Disabled));
                 }
                 else if (i == 0 && _host.UseSubMenusSingleFrame && item.Parent!.Parent is { })
                 {
@@ -969,8 +969,8 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
                     // The -3 is left/right border + one space (not sure what for)
                     tf.Draw (
                              ViewportToScreen (new Rectangle (1, i, Frame.Width - 3, 1)),
-                             i == _currentChild ? GetFocusColor () : GetNormalColor (),
-                             i == _currentChild ? ColorScheme!.HotFocus : ColorScheme!.HotNormal,
+                             i == _currentChild ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal),
+                             i == _currentChild ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal),
                              SuperView?.ViewportToScreen (SuperView.Viewport) ?? Rectangle.Empty
                             );
                 }
@@ -978,8 +978,8 @@ private void Top_DrawComplete (object? sender, DrawEventArgs e)
                 {
                     DrawHotString (
                                    textToDraw,
-                                   i == _currentChild ? ColorScheme!.HotFocus : ColorScheme!.HotNormal,
-                                   i == _currentChild ? GetFocusColor () : GetNormalColor ()
+                                   i == _currentChild ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal),
+                                   i == _currentChild ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal)
                                   );
                 }
 
diff --git a/Terminal.Gui/Views/Menuv1/MenuBar.cs b/Terminal.Gui/Views/Menuv1/MenuBar.cs
index 80543388bd..f376aef0ea 100644
--- a/Terminal.Gui/Views/Menuv1/MenuBar.cs
+++ b/Terminal.Gui/Views/Menuv1/MenuBar.cs
@@ -78,9 +78,7 @@ public MenuBar ()
         //CanFocus = true;
         _selected = -1;
         _selectedSub = -1;
-        // ReSharper disable once VirtualMemberCallInConstructor
-        ColorScheme = Colors.ColorSchemes ["Menu"];
-        // ReSharper disable once VirtualMemberCallInConstructor
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Menu);
         WantMousePositionReports = true;
         IsMenuOpen = false;
 
@@ -148,7 +146,7 @@ public MenuBar ()
                                     {
                                         if (ctx is not CommandContext<KeyBinding> keyCommandContext)
                                         {
-                                            return false ;
+                                            return false;
                                         }
                                         if (keyCommandContext.Binding.Data is MouseEventArgs)
                                         {
@@ -322,13 +320,13 @@ protected override bool OnDrawingContent ()
 
             if (i == _selected && IsMenuOpen)
             {
-                hotColor = i == _selected ? ColorScheme!.HotFocus : GetHotNormalColor ();
-                normalColor = i == _selected ? GetFocusColor () : GetNormalColor ();
+                hotColor = i == _selected ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal);
+                normalColor = i == _selected ? GetAttributeForRole (VisualRole.Focus) : GetAttributeForRole (VisualRole.Normal);
             }
             else
             {
-                hotColor = GetHotNormalColor ();
-                normalColor = GetNormalColor ();
+                hotColor = GetAttributeForRole (VisualRole.HotNormal);
+                normalColor = GetAttributeForRole (VisualRole.Normal);
             }
 
             // Note Help on MenuBar is drawn with parens around it
@@ -391,7 +389,7 @@ public virtual void OnMenuOpened ()
                 mi = parent?.Children?.Length > 0 ? parent.Children [_openMenu!._currentChild] : null;
             }
         }
-        
+
         MenuOpened?.Invoke (this, new (parent, mi));
     }
 
@@ -625,7 +623,7 @@ internal bool CloseMenu (bool reopen, bool isSubMenu, bool ignoreUseSubMenusSing
 
                 if (Application.MouseGrabView == _openMenu)
                 {
-                    Application.UngrabMouse();
+                    Application.UngrabMouse ();
                 }
                 _openMenu?.Dispose ();
                 _openMenu = null;
@@ -878,7 +876,7 @@ internal void OpenMenu (int index, int sIndex = -1, MenuBarItem? subMenu = null!
                 if (SuperView is { })
                 {
                     SuperView.Add (_openMenu);
-                   // _openMenu.SetRelativeLayout (Application.Screen.Size);
+                    // _openMenu.SetRelativeLayout (Application.Screen.Size);
                 }
                 else
                 {
diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs
index 80be7d4713..3c52b2bd59 100644
--- a/Terminal.Gui/Views/MessageBox.cs
+++ b/Terminal.Gui/Views/MessageBox.cs
@@ -28,26 +28,26 @@ public static class MessageBox
     ///     Defines the default border styling for <see cref="MessageBox"/>. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single; // Default is set in config.json
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Heavy;
 
     /// <summary>The default <see cref="Alignment"/> for <see cref="Dialog"/>.</summary>
     /// <remarks>This property can be set in a Theme.</remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.Center; // Default is set in config.json
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static Alignment DefaultButtonAlignment { get; set; } = Alignment.Center;
 
     /// <summary>
     ///     Defines the default minimum MessageBox width, as a percentage of the screen width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static int DefaultMinimumWidth { get; set; } = 0;
 
     /// <summary>
     ///     Defines the default minimum Dialog height, as a percentage of the screen width. Can be configured via
     ///     <see cref="ConfigurationManager"/>.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static int DefaultMinimumHeight { get; set; } = 0;
     /// <summary>
     ///     The index of the selected button, or -1 if the user pressed <see cref="Application.QuitKey"/> to close the MessageBox. This is useful for web
@@ -411,7 +411,7 @@ params string [] buttons
             d.Height = height;
         }
 
-        d.ColorScheme = useErrorColors ? Colors.ColorSchemes ["Error"] : Colors.ColorSchemes ["Dialog"];
+        d.SchemeName = useErrorColors ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
         d.HotKeySpecifier = new Rune ('\xFFFF');
         d.Text = message;
diff --git a/Terminal.Gui/Views/OptionSelector.cs b/Terminal.Gui/Views/OptionSelector.cs
index 87817298b9..2142f89a6e 100644
--- a/Terminal.Gui/Views/OptionSelector.cs
+++ b/Terminal.Gui/Views/OptionSelector.cs
@@ -1,4 +1,6 @@
 #nullable enable
+using System.Diagnostics;
+
 namespace Terminal.Gui;
 
 /// <summary>
@@ -31,13 +33,18 @@ public OptionSelector ()
     private int? _selectedItem;
 
     /// <summary>
-    /// Gets or sets the index of the selected item.
+    /// Gets or sets the index of the selected item. Will be <see langword="null"/> if no item is selected.
     /// </summary>
     public int? SelectedItem
     {
         get => _selectedItem;
         set
         {
+            if (value < 0 || value >= SubViews.OfType<CheckBox> ().Count ())
+            {
+                throw new ArgumentOutOfRangeException (nameof (value), @$"SelectedItem must be between 0 and {SubViews.OfType<CheckBox> ().Count ()-1}");
+
+            }
             if (_selectedItem == value)
             {
                 return;
@@ -172,58 +179,57 @@ protected virtual CheckBox CreateCheckBox (string name, int index)
             Title = nameWithHotKey,
             Id = name,
             Data = index,
-            HighlightStyle = HighlightStyle.Hover,
+            //HighlightStyle = HighlightStyle.Hover,
             RadioStyle = true
         };
 
-        checkbox.GettingNormalColor += (_, e) =>
+        checkbox.GettingAttributeForRole += (_, e) =>
         {
-            if (SuperView is { HasFocus: true })
+            if (SuperView is { HasFocus: false })
             {
-                e.Cancel = true;
+                return;
+            }
 
-                if (!HasFocus)
-                {
-                    e.NewValue = GetFocusColor ();
-                }
-                else
-                {
-                    // If _colorScheme was set, it's because of Hover
-                    if (checkbox._colorScheme is { })
+            switch (e.Role)
+            {
+                case VisualRole.Normal:
+                    e.Cancel = true;
+
+                    if (!HasFocus)
                     {
-                        e.NewValue = checkbox._colorScheme.Normal;
+                        e.NewValue = GetAttributeForRole (VisualRole.Focus);
                     }
                     else
                     {
-                        e.NewValue = GetNormalColor ();
+                        // If _scheme was set, it's because of Hover
+                        if (checkbox.HasScheme)
+                        {
+                            e.NewValue = checkbox.GetAttributeForRole(VisualRole.Normal);
+                        }
+                        else
+                        {
+                            e.NewValue = GetAttributeForRole (VisualRole.Normal);
+                        }
                     }
-                }
-            }
-        };
 
-        checkbox.GettingHotNormalColor += (_, e) =>
-        {
-            if (SuperView is { HasFocus: true })
-            {
-                e.Cancel = true;
-                if (!HasFocus)
-                {
-                    e.NewValue = GetHotFocusColor ();
-                }
-                else
-                {
-                    // If _colorScheme was set, it's because of Hover
-                    if (checkbox._colorScheme is { })
+                    break;
+
+                case VisualRole.HotNormal:
+                    e.Cancel = true;
+
+                    if (!HasFocus)
                     {
-                        e.NewValue = checkbox._colorScheme.Normal;
+                        e.NewValue = GetAttributeForRole (VisualRole.HotFocus);
                     }
                     else
                     {
-                        e.NewValue = GetNormalColor ();
+                        e.NewValue = GetAttributeForRole (VisualRole.HotNormal);
                     }
-                }
+
+                    break;
             }
         };
+
         checkbox.Selecting += (sender, args) =>
         {
             if (RaiseSelecting (args.Context) is true)
diff --git a/Terminal.Gui/Views/ProgressBar.cs b/Terminal.Gui/Views/ProgressBar.cs
index e86d99d2c3..07e2164b50 100644
--- a/Terminal.Gui/Views/ProgressBar.cs
+++ b/Terminal.Gui/Views/ProgressBar.cs
@@ -133,7 +133,7 @@ public override string Text
     ///<inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        SetAttribute (GetHotNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Active));
 
         Move (0, 0);
 
@@ -170,17 +170,24 @@ protected override bool OnDrawingContent ()
         if (ProgressBarFormat != ProgressBarFormat.Simple && !_isActivity)
         {
             var tf = new TextFormatter { Alignment = Alignment.Center, Text = Text };
-            var attr = new Attribute (ColorScheme!.HotNormal.Foreground, ColorScheme.HotNormal.Background);
+
+            var attr = new Attribute (
+                                      GetAttributeForRole (VisualRole.Active).Foreground,
+                                      GetAttributeForRole (VisualRole.Active).Background,
+                                      GetAttributeForRole (VisualRole.Active).Style);
 
             if (_fraction > .5)
             {
-                attr = new (ColorScheme.HotNormal.Background, ColorScheme.HotNormal.Foreground);
+                attr = new (
+                            GetAttributeForRole (VisualRole.Active).Background,
+                            GetAttributeForRole (VisualRole.Active).Foreground,
+                            GetAttributeForRole (VisualRole.Active).Style);
             }
 
-            tf.Draw (
+            tf.Draw (   
                      ViewportToScreen (Viewport),
                      attr,
-                     ColorScheme.Normal,
+                     GetAttributeForRole (VisualRole.Normal),
                      SuperView?.ViewportToScreen (SuperView.Viewport) ?? default (Rectangle)
                     );
         }
diff --git a/Terminal.Gui/Views/RadioGroup.cs b/Terminal.Gui/Views/RadioGroup.cs
index 9ff442ec01..53205bf3df 100644
--- a/Terminal.Gui/Views/RadioGroup.cs
+++ b/Terminal.Gui/Views/RadioGroup.cs
@@ -356,7 +356,7 @@ private bool ChangeSelectedItem (int value)
     /// <inheritdoc/>
     protected override bool OnDrawingContent ()
     {
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
 
         for (var i = 0; i < _radioLabels.Count; i++)
         {
@@ -373,7 +373,7 @@ protected override bool OnDrawingContent ()
             }
 
             string rl = _radioLabels [i];
-            SetAttribute (GetNormalColor ());
+            SetAttribute (GetAttributeForRole (VisualRole.Normal));
             Driver?.AddStr ($"{(i == _selected ? Glyphs.Selected : Glyphs.UnSelected)} ");
             TextFormatter.FindHotKey (rl, HotKeySpecifier, out int hotPos, out Key hotKey);
 
@@ -387,15 +387,15 @@ protected override bool OnDrawingContent ()
 
                     if (j == hotPos && i == Cursor)
                     {
-                        SetAttribute (HasFocus ? GetHotFocusColor () : GetHotNormalColor ());
+                        SetAttribute (HasFocus ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal));
                     }
                     else if (j == hotPos && i != Cursor)
                     {
-                        SetAttribute (GetHotNormalColor ());
+                        SetAttribute (GetAttributeForRole (VisualRole.HotNormal));
                     }
                     else if (HasFocus && i == Cursor)
                     {
-                        SetAttribute (GetFocusColor ());
+                        SetAttribute (GetAttributeForRole (VisualRole.Focus));
                     }
 
                     if (rune == HotKeySpecifier && j + 1 < rlRunes.Length)
@@ -405,16 +405,16 @@ protected override bool OnDrawingContent ()
 
                         if (i == Cursor)
                         {
-                            SetAttribute (HasFocus ? GetHotFocusColor () : GetHotNormalColor ());
+                            SetAttribute (HasFocus ? GetAttributeForRole (VisualRole.HotFocus) : GetAttributeForRole (VisualRole.HotNormal));
                         }
                         else if (i != Cursor)
                         {
-                            SetAttribute (GetHotNormalColor ());
+                            SetAttribute (GetAttributeForRole (VisualRole.HotNormal));
                         }
                     }
 
                     Application.Driver?.AddRune (rune);
-                    SetAttribute (GetNormalColor ());
+                    SetAttribute (GetAttributeForRole (VisualRole.Normal));
                 }
             }
             else
diff --git a/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs b/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
index 28f02fdcfc..da5314eabe 100644
--- a/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
+++ b/Terminal.Gui/Views/ScrollBar/ScrollSlider.cs
@@ -267,10 +267,19 @@ protected virtual void OnScrolled (int distance) { }
     /// <summary>Raised when the <see cref="Position"/> has changed. Indicates how much to scroll.</summary>
     public event EventHandler<EventArgs<int>>? Scrolled;
 
-    /// <inheritdoc/>
-    public override Attribute GetNormalColor () { return base.GetHotNormalColor (); }
+    /// <inheritdoc />
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
+    {
+        if (role == VisualRole.Normal)
+        {
+            currentAttribute = GetAttributeForRole (VisualRole.HotNormal);
+
+            return true;
+        }
+
+        return base.OnGettingAttributeForRole (role, ref currentAttribute);
+    }
 
-    ///// <inheritdoc/>
     private int _lastLocation = -1;
 
     /// <summary>
diff --git a/Terminal.Gui/Views/Shortcut.cs b/Terminal.Gui/Views/Shortcut.cs
index 13a59bcbfc..10dddc318b 100644
--- a/Terminal.Gui/Views/Shortcut.cs
+++ b/Terminal.Gui/Views/Shortcut.cs
@@ -472,6 +472,8 @@ private void SetCommandViewDefaultLayout ()
         if (CommandView.Margin is { })
         {
             CommandView.Margin.Thickness = GetMarginThickness ();
+            // strip off ViewportSettings.TransparentMouse
+            CommandView.Margin.ViewportSettings &= ~ViewportSettings.TransparentMouse;
         }
 
         CommandView.X = Pos.Align (Alignment.End, AlignmentModes);
@@ -480,26 +482,28 @@ private void SetCommandViewDefaultLayout ()
         CommandView.TextAlignment = Alignment.Start;
         CommandView.TextFormatter.WordWrap = false;
         //CommandView.HighlightStyle = HighlightStyle.None;
-        CommandView.GettingNormalColor += CommandViewOnGettingNormalColor;
-        CommandView.GettingHotNormalColor += CommandViewOnGettingHotNormalColor;
-
+        CommandView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
     }
 
-    private void CommandViewOnGettingNormalColor (object? sender, CancelEventArgs<Attribute> e)
+    private void SubViewOnGettingAttributeForRole (object? sender, VisualRoleEventArgs e)
     {
-        if (HasFocus)
+        switch (e.Role)
         {
-            e.Cancel = true;
-            e.NewValue = GetFocusColor ();
-        }
-    }
+            case VisualRole.Normal:
+                if (HasFocus)
+                {
+                    e.Cancel = true;
+                    e.NewValue = GetAttributeForRole (VisualRole.Focus);
+                }
+                break;
 
-    private void CommandViewOnGettingHotNormalColor (object? sender, CancelEventArgs<Attribute> e)
-    {
-        if (HasFocus && e is { })
-        {
-            e.Cancel = true;
-            e.NewValue = GetHotFocusColor ();
+            case VisualRole.HotNormal:
+                if (HasFocus)
+                {
+                    e.Cancel = true;
+                    e.NewValue = GetAttributeForRole (VisualRole.HotFocus);
+                }
+                break;
         }
     }
 
@@ -530,6 +534,8 @@ private void SetHelpViewDefaultLayout ()
         if (HelpView.Margin is { })
         {
             HelpView.Margin.Thickness = GetMarginThickness ();
+            // strip off ViewportSettings.TransparentMouse
+            HelpView.Margin.ViewportSettings &= ~ViewportSettings.TransparentMouse;
         }
 
         HelpView.X = Pos.Align (Alignment.End, AlignmentModes);
@@ -543,8 +549,7 @@ private void SetHelpViewDefaultLayout ()
         HelpView.TextFormatter.WordWrap = false;
         HelpView.HighlightStyle = HighlightStyle.None;
 
-        HelpView.GettingNormalColor += CommandViewOnGettingNormalColor;
-        HelpView.GettingHotNormalColor += CommandViewOnGettingHotNormalColor;
+        HelpView.GettingAttributeForRole += SubViewOnGettingAttributeForRole;
     }
 
     /// <summary>
@@ -634,7 +639,7 @@ public bool BindKeyToApplication
     ///     Gets the subview that displays the key. Is drawn with Normal and HotNormal colors reversed.
     /// </summary>
 
-    public ShortcutKeyView KeyView { get; } = new ();
+    public View KeyView { get; } = new ();
 
     private int _minimumKeyTextSize;
 
@@ -662,6 +667,8 @@ private void SetKeyViewDefaultLayout ()
         if (KeyView.Margin is { })
         {
             KeyView.Margin.Thickness = GetMarginThickness ();
+            // strip off ViewportSettings.TransparentMouse
+            KeyView.Margin.ViewportSettings &= ~ViewportSettings.TransparentMouse;
         }
 
         KeyView.X = Pos.Align (Alignment.End, AlignmentModes);
@@ -674,7 +681,21 @@ private void SetKeyViewDefaultLayout ()
         KeyView.TextAlignment = Alignment.End;
         KeyView.VerticalTextAlignment = Alignment.Center;
         KeyView.KeyBindings.Clear ();
-        HelpView.HighlightStyle = HighlightStyle.None;
+        KeyView.HighlightStyle = HighlightStyle.None;
+
+        KeyView.GettingAttributeForRole += (sender, args) =>
+                                           {
+                                               if (args.Role == VisualRole.Normal)
+                                               {
+                                                   args.NewValue = SuperView?.GetAttributeForRole (HasFocus ? VisualRole.HotFocus : VisualRole.HotNormal) ?? Attribute.Default;
+                                                   args.Cancel = true;
+                                               }
+                                           };
+        KeyView.ClearingViewport += (sender, args) =>
+                                          {
+                                              // Do not clear; otherwise spaces will be printed with underlines
+                                              args.Cancel = true;
+                                          };
     }
 
     private void UpdateKeyBindings (Key oldKey)
@@ -726,26 +747,27 @@ public bool ForceFocusColors
     }
 
     /// <inheritdoc />
-    public override Attribute GetNormalColor ()
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
     {
-        if (HasFocus)
+        if (!HasFocus)
         {
-            return base.GetFocusColor ();
+            return base.OnGettingAttributeForRole (role, ref currentAttribute);
         }
 
-        return base.GetNormalColor ();
-    }
-
-    /// <inheritdoc />
-    public override Attribute GetHotNormalColor ()
-    {
-        if (HasFocus)
+        if (role == VisualRole.Normal)
+        {
+            currentAttribute = GetAttributeForRole (VisualRole.Focus);
 
+            return true;
+        }
+        if (role == VisualRole.HotNormal)
         {
-            return base.GetHotFocusColor ();
+            currentAttribute = GetAttributeForRole (VisualRole.HotFocus);
+
+            return true;
         }
 
-        return base.GetHotNormalColor ();
+        return base.OnGettingAttributeForRole (role, ref currentAttribute);
     }
 
     #endregion Focus
@@ -785,22 +807,4 @@ protected override void Dispose (bool disposing)
 
         base.Dispose (disposing);
     }
-}
-
-/// <summary>
-///     A helper class used by <see cref="Shortcut"/> to display the key. Reverses the Normal and HotNormal colors.
-/// </summary>
-public class ShortcutKeyView : View
-{
-    /// <inheritdoc />
-    public override Attribute GetNormalColor ()
-    {
-        if (SuperView is { HasFocus: true })
-
-        {
-            return base.GetHotFocusColor ();
-        }
-
-        return base.GetHotNormalColor ();
-    }
-}
+}
\ No newline at end of file
diff --git a/Terminal.Gui/Views/Slider.cs b/Terminal.Gui/Views/Slider.cs
index ff7ea9b70d..83ff446705 100644
--- a/Terminal.Gui/Views/Slider.cs
+++ b/Terminal.Gui/Views/Slider.cs
@@ -850,8 +850,8 @@ private void DrawSlider ()
 
         if (IsInitialized)
         {
-            normalAttr = GetNormalColor ();
-            setAttr = Style.SetChar.Attribute ?? GetHotNormalColor ();
+            normalAttr = GetAttributeForRole (VisualRole.Normal);
+            setAttr = Style.SetChar.Attribute ?? GetAttributeForRole (VisualRole.HotNormal);
         }
 
         bool isVertical = _config._sliderOrientation == Orientation.Vertical;
@@ -1058,8 +1058,8 @@ private void DrawLegends ()
 
         if (IsInitialized)
         {
-            normalAttr = Style.LegendAttributes.NormalAttribute ?? GetNormalColor ();
-            setAttr = Style.LegendAttributes.SetAttribute ?? GetHotNormalColor ();
+            normalAttr = Style.LegendAttributes.NormalAttribute ?? GetAttributeForRole (VisualRole.Normal);
+            setAttr = Style.LegendAttributes.SetAttribute ?? GetAttributeForRole (VisualRole.HotNormal);
             spaceAttr = Style.LegendAttributes.EmptyAttribute ?? normalAttr;
         }
 
diff --git a/Terminal.Gui/Views/StatusBar.cs b/Terminal.Gui/Views/StatusBar.cs
index bf78dcdb5f..5118ffc2dd 100644
--- a/Terminal.Gui/Views/StatusBar.cs
+++ b/Terminal.Gui/Views/StatusBar.cs
@@ -28,9 +28,9 @@ public StatusBar (IEnumerable<Shortcut> shortcuts) : base (shortcuts)
             Border.LineStyle = DefaultSeparatorLineStyle;
         }
 
-        base.ColorScheme = Colors.ColorSchemes ["Menu"];
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Menu);
 
-        Applied += OnConfigurationManagerApplied;
+        ConfigurationManager.Applied += OnConfigurationManagerApplied;
         SuperViewChanged += OnSuperViewChanged;
     }
 
@@ -42,7 +42,7 @@ private void OnSuperViewChanged (object? sender, SuperViewChangedEventArgs e)
             // BUGBUG: For some reason in some unit tests, when Top is disposed, MenuBar.Dispose does not get called.
             // BUGBUG: Yet, the MenuBar does get Removed from Top (and it's SuperView set to null).
             // BUGBUG: Related: https://github.com/gui-cs/Terminal.Gui/issues/4021
-            Applied -= OnConfigurationManagerApplied;
+            ConfigurationManager.Applied -= OnConfigurationManagerApplied;
         }
     }
     private void OnConfigurationManagerApplied (object? sender, ConfigurationManagerEventArgs e)
@@ -56,8 +56,8 @@ private void OnConfigurationManagerApplied (object? sender, ConfigurationManager
     /// <summary>
     ///     Gets or sets the default Line Style for the separators between the shortcuts of the StatusBar.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
-    public static LineStyle DefaultSeparatorLineStyle { get; set; } = LineStyle.Dashed;
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static LineStyle DefaultSeparatorLineStyle { get; set; } = LineStyle.Single;
 
     /// <inheritdoc />
     protected override void OnSubViewLayout (LayoutEventArgs args)
@@ -169,6 +169,6 @@ protected override void Dispose (bool disposing)
         base.Dispose (disposing);
 
         SuperViewChanged -= OnSuperViewChanged;
-        Applied -= OnConfigurationManagerApplied;
+        ConfigurationManager.Applied -= OnConfigurationManagerApplied;
     }
 }
diff --git a/Terminal.Gui/Views/TableView/CellColorGetterArgs.cs b/Terminal.Gui/Views/TableView/CellColorGetterArgs.cs
index 1644e1d97f..1fd78d6ca2 100644
--- a/Terminal.Gui/Views/TableView/CellColorGetterArgs.cs
+++ b/Terminal.Gui/Views/TableView/CellColorGetterArgs.cs
@@ -2,7 +2,7 @@
 
 /// <summary>
 ///     Arguments for a <see cref="CellColorGetterDelegate"/>.  Describes a cell for which a rendering
-///     <see cref="ColorScheme"/> is being sought
+///     <see cref="Scheme"/> is being sought
 /// </summary>
 public class CellColorGetterArgs
 {
@@ -12,7 +12,7 @@ internal CellColorGetterArgs (
         int colIdx,
         object cellValue,
         string representation,
-        ColorScheme rowScheme
+        Scheme rowScheme
     )
     {
         Table = table;
@@ -35,8 +35,8 @@ ColorScheme rowScheme
     /// <summary>The index of the row in <see cref="Table"/> for which color is needed</summary>
     public int RowIndex { get; }
 
-    /// <summary>the color scheme that is going to be used to render the cell if no cell specific color scheme is returned</summary>
-    public ColorScheme RowScheme { get; }
+    /// <summary>the scheme that is going to be used to render the cell if no cell specific scheme is returned</summary>
+    public Scheme RowScheme { get; }
 
     /// <summary>The data table hosted by the <see cref="TableView"/> control.</summary>
     public ITableSource Table { get; }
diff --git a/Terminal.Gui/Views/TableView/ColumnStyle.cs b/Terminal.Gui/Views/TableView/ColumnStyle.cs
index 2d277abd91..fa56292a27 100644
--- a/Terminal.Gui/Views/TableView/ColumnStyle.cs
+++ b/Terminal.Gui/Views/TableView/ColumnStyle.cs
@@ -14,7 +14,7 @@ public class ColumnStyle
     public Func<object, Alignment> AlignmentGetter;
 
     /// <summary>
-    ///     Defines a delegate for returning a custom color scheme per cell based on cell values. Return null for the
+    ///     Defines a delegate for returning a custom scheme per cell based on cell values. Return null for the
     ///     default
     /// </summary>
     public CellColorGetterDelegate ColorGetter;
diff --git a/Terminal.Gui/Views/TableView/RowColorGetterArgs.cs b/Terminal.Gui/Views/TableView/RowColorGetterArgs.cs
index 633aafa229..15b3ffa75e 100644
--- a/Terminal.Gui/Views/TableView/RowColorGetterArgs.cs
+++ b/Terminal.Gui/Views/TableView/RowColorGetterArgs.cs
@@ -2,7 +2,7 @@
 
 /// <summary>
 ///     Arguments for <see cref="RowColorGetterDelegate"/>. Describes a row of data in a <see cref="ITableSource"/>
-///     for which <see cref="ColorScheme"/> is sought.
+///     for which <see cref="Scheme"/> is sought.
 /// </summary>
 public class RowColorGetterArgs
 {
diff --git a/Terminal.Gui/Views/TableView/TableStyle.cs b/Terminal.Gui/Views/TableView/TableStyle.cs
index ffc8068805..b23c6ea5f7 100644
--- a/Terminal.Gui/Views/TableView/TableStyle.cs
+++ b/Terminal.Gui/Views/TableView/TableStyle.cs
@@ -10,7 +10,7 @@ public class TableStyle
     public bool AlwaysShowHeaders { get; set; } = false;
 
     /// <summary>
-    ///     Gets or sets a flag indicating whether to force <see cref="ColorScheme.Normal"/> use when rendering vertical
+    ///     Gets or sets a flag indicating whether to force <see cref="Scheme.Normal"/> use when rendering vertical
     ///     cell lines (even when <see cref="TableView.FullRowSelect"/> is on).
     /// </summary>
     public bool AlwaysUseNormalColorForVerticalCellLines { get; set; } = false;
diff --git a/Terminal.Gui/Views/TableView/TableView.cs b/Terminal.Gui/Views/TableView/TableView.cs
index e1017e66a2..ac8220b6be 100644
--- a/Terminal.Gui/Views/TableView/TableView.cs
+++ b/Terminal.Gui/Views/TableView/TableView.cs
@@ -6,12 +6,12 @@ namespace Terminal.Gui;
 /// <summary>Delegate for providing color to <see cref="TableView"/> cells based on the value being rendered</summary>
 /// <param name="args">Contains information about the cell for which color is needed</param>
 /// <returns></returns>
-public delegate ColorScheme CellColorGetterDelegate (CellColorGetterArgs args);
+public delegate Scheme CellColorGetterDelegate (CellColorGetterArgs args);
 
 /// <summary>Delegate for providing color for a whole row of a <see cref="TableView"/></summary>
 /// <param name="args"></param>
 /// <returns></returns>
-public delegate ColorScheme RowColorGetterDelegate (RowColorGetterArgs args);
+public delegate Scheme RowColorGetterDelegate (RowColorGetterArgs args);
 
 /// <summary>
 ///     View for tabular data based on a <see cref="ITableSource"/>.
@@ -239,11 +239,11 @@ public TableView ()
                     }
                    );
 
-        AddCommand (Command.Accept, () => OnCellActivated (new CellActivatedEventArgs (Table, SelectedColumn, SelectedRow)));
+        AddCommand (Command.Accept, () => OnCellActivated (new (Table, SelectedColumn, SelectedRow)));
 
         AddCommand (
                     Command.Select, // was Command.ToggleChecked
-                    (ctx) =>
+                    ctx =>
                     {
                         if (ToggleCurrentCellSelection () is true)
                         {
@@ -389,13 +389,13 @@ public int SelectedColumn
             if (oldValue != selectedColumn)
             {
                 OnSelectedCellChanged (
-                                       new SelectedCellChangedEventArgs (
-                                                                         Table,
-                                                                         oldValue,
-                                                                         SelectedColumn,
-                                                                         SelectedRow,
-                                                                         SelectedRow
-                                                                        )
+                                       new (
+                                            Table,
+                                            oldValue,
+                                            SelectedColumn,
+                                            SelectedRow,
+                                            SelectedRow
+                                           )
                                       );
             }
         }
@@ -414,13 +414,13 @@ public int SelectedRow
             if (oldValue != selectedRow)
             {
                 OnSelectedCellChanged (
-                                       new SelectedCellChangedEventArgs (
-                                                                         Table,
-                                                                         SelectedColumn,
-                                                                         SelectedColumn,
-                                                                         oldValue,
-                                                                         selectedRow
-                                                                        )
+                                       new (
+                                            Table,
+                                            SelectedColumn,
+                                            SelectedColumn,
+                                            oldValue,
+                                            selectedRow
+                                           )
                                       );
             }
         }
@@ -505,16 +505,16 @@ public ITableSource Table
     }
 
     /// <summary>
-    /// Private override of <see cref="ChangeSelectionByOffset"/> that returns true if the selection has
-    /// changed as a result of moving the selection. Used by key handling logic to determine whether e.g.
-    /// the cursor right resulted in a change or should be forwarded on to toggle logic handling.
+    ///     Private override of <see cref="ChangeSelectionByOffset"/> that returns true if the selection has
+    ///     changed as a result of moving the selection. Used by key handling logic to determine whether e.g.
+    ///     the cursor right resulted in a change or should be forwarded on to toggle logic handling.
     /// </summary>
     /// <param name="offsetX"></param>
     /// <param name="offsetY"></param>
     /// <returns></returns>
     private bool ChangeSelectionByOffsetWithReturn (int offsetX, int offsetY)
     {
-        var oldSelection = GetSelectionSnapshot ();
+        TableViewSelectionSnapshot oldSelection = GetSelectionSnapshot ();
         SetSelection (SelectedColumn + offsetX, SelectedRow + offsetY, false);
         Update ();
 
@@ -531,12 +531,13 @@ private TableViewSelectionSnapshot GetSelectionSnapshot ()
 
     private bool SelectionIsSame (TableViewSelectionSnapshot oldSelection)
     {
-        var newSelection = GetSelectionSnapshot ();
+        TableViewSelectionSnapshot newSelection = GetSelectionSnapshot ();
 
         return oldSelection.SelectedColumn == newSelection.SelectedColumn
                && oldSelection.SelectedRow == newSelection.SelectedRow
                && oldSelection.multiSelection.SequenceEqual (newSelection.multiSelection);
     }
+
     private record TableViewSelectionSnapshot (int SelectedColumn, int SelectedRow, Rectangle [] multiSelection);
 
     /// <summary>
@@ -715,18 +716,18 @@ public void EnsureValidSelection ()
             }
 
             // ensure region's origin exists
-            region.Origin = new Point (
-                                       Math.Max (Math.Min (region.Origin.X, Table.Columns - 1), 0),
-                                       Math.Max (Math.Min (region.Origin.Y, Table.Rows - 1), 0)
-                                      );
+            region.Origin = new (
+                                 Math.Max (Math.Min (region.Origin.X, Table.Columns - 1), 0),
+                                 Math.Max (Math.Min (region.Origin.Y, Table.Rows - 1), 0)
+                                );
 
             // ensure regions do not go over edge of table bounds
             region.Rectangle = Rectangle.FromLTRB (
-                                         region.Rectangle.Left,
-                                         region.Rectangle.Top,
-                                         Math.Max (Math.Min (region.Rectangle.Right, Table.Columns), 0),
-                                         Math.Max (Math.Min (region.Rectangle.Bottom, Table.Rows), 0)
-                                        );
+                                                   region.Rectangle.Left,
+                                                   region.Rectangle.Top,
+                                                   Math.Max (Math.Min (region.Rectangle.Right, Table.Columns), 0),
+                                                   Math.Max (Math.Min (region.Rectangle.Bottom, Table.Rows), 0)
+                                                  );
 
             MultiSelectedRegions.Push (region);
         }
@@ -764,7 +765,7 @@ public IEnumerable<Point> GetAllSelectedCells ()
                 {
                     if (IsSelected (x, y))
                     {
-                        toReturn.Add (new Point (x, y));
+                        toReturn.Add (new (x, y));
                     }
                 }
             }
@@ -778,13 +779,13 @@ public IEnumerable<Point> GetAllSelectedCells ()
             // all cells in active row are selected
             for (var x = 0; x < Table.Columns; x++)
             {
-                toReturn.Add (new Point (x, SelectedRow));
+                toReturn.Add (new (x, SelectedRow));
             }
         }
         else
         {
             // Not full row select and no multi selections
-            toReturn.Add (new Point (SelectedColumn, SelectedRow));
+            toReturn.Add (new (SelectedColumn, SelectedRow));
         }
 
         return toReturn;
@@ -844,6 +845,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             case MouseFlags.WheeledDown:
                 RowOffset++;
                 EnsureValidScrollOffsets ();
+
                 //SetNeedsDraw ();
 
                 return true;
@@ -851,6 +853,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             case MouseFlags.WheeledUp:
                 RowOffset--;
                 EnsureValidScrollOffsets ();
+
                 //SetNeedsDraw ();
 
                 return true;
@@ -858,6 +861,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             case MouseFlags.WheeledRight:
                 ColumnOffset++;
                 EnsureValidScrollOffsets ();
+
                 //SetNeedsDraw ();
 
                 return true;
@@ -865,6 +869,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             case MouseFlags.WheeledLeft:
                 ColumnOffset--;
                 EnsureValidScrollOffsets ();
+
                 //SetNeedsDraw ();
 
                 return true;
@@ -917,7 +922,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
 
             if (hit is { })
             {
-                return OnCellActivated (new CellActivatedEventArgs (Table, hit.Value.X, hit.Value.Y));
+                return OnCellActivated (new (Table, hit.Value.X, hit.Value.Y));
             }
         }
 
@@ -935,10 +940,10 @@ protected override bool OnDrawingContent ()
         // What columns to render at what X offset in viewport
         ColumnToRender [] columnsToRender = CalculateViewport (Viewport).ToArray ();
 
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
 
         //invalidate current row (prevents scrolling around leaving old characters in the frame
-        Driver?.AddStr (new string (' ', Viewport.Width));
+        Driver?.AddStr (new (' ', Viewport.Width));
 
         var line = 0;
 
@@ -1066,7 +1071,7 @@ public void PageUp (bool extend)
         {
             Move (screenPoint.Value.X, screenPoint.Value.Y);
 
-            return null;//screenPoint;
+            return null; //screenPoint;
         }
 
         return null;
@@ -1191,10 +1196,10 @@ public void SelectAll ()
 
         // Create a single region over entire table, set the origin of the selection to the active cell so that a followup spread selection e.g. shift-right behaves properly
         MultiSelectedRegions.Push (
-                                   new TableSelection (
-                                                       new (SelectedColumn, SelectedRow),
-                                                       new (0, 0, Table.Columns, table.Rows)
-                                                      )
+                                   new (
+                                        new (SelectedColumn, SelectedRow),
+                                        new (0, 0, Table.Columns, table.Rows)
+                                       )
                                   );
         Update ();
     }
@@ -1272,6 +1277,7 @@ public void Update ()
     protected virtual bool OnCellActivated (CellActivatedEventArgs args)
     {
         CellActivated?.Invoke (this, args);
+
         return CellActivated is { };
     }
 
@@ -1284,15 +1290,16 @@ protected virtual bool OnCellActivated (CellActivatedEventArgs args)
 
     /// <summary>
     ///     Override to provide custom multi colouring to cells.  Use <see cref="View.Driver"/> to with
-    ///     <see cref="IConsoleDriver.AddStr(string)"/>.  The driver will already be in the correct place when rendering and you
+    ///     <see cref="IConsoleDriver.AddStr(string)"/>.  The driver will already be in the correct place when rendering and
+    ///     you
     ///     must render the full <paramref name="render"/> or the view will not look right.  For simpler provision of color use
     ///     <see cref="ColumnStyle.ColorGetter"/> For changing the content that is rendered use
     ///     <see cref="ColumnStyle.RepresentationGetter"/>
     /// </summary>
-    /// <param name="cellColor"></param>
+    /// <param name="cellAttribute"></param>
     /// <param name="render"></param>
     /// <param name="isPrimaryCell"></param>
-    protected virtual void RenderCell (Attribute cellColor, string render, bool isPrimaryCell)
+    protected virtual void RenderCell (Attribute cellAttribute, string render, bool isPrimaryCell)
     {
         // If the cell is the selected col/row then draw the first rune in inverted colors
         // this allows the user to track which cell is the active one during a multi cell
@@ -1302,19 +1309,19 @@ protected virtual void RenderCell (Attribute cellColor, string render, bool isPr
             if (render.Length > 0)
             {
                 // invert the color of the current cell for the first character
-                SetAttribute (new Attribute (cellColor.Background, cellColor.Foreground));
+                SetAttribute (new (cellAttribute.Foreground, cellAttribute.Background, TextStyle.Reverse));
                 Driver?.AddRune ((Rune)render [0]);
 
                 if (render.Length > 1)
                 {
-                    SetAttribute (cellColor);
+                    SetAttribute (cellAttribute);
                     Driver?.AddStr (render.Substring (1));
                 }
             }
         }
         else
         {
-            SetAttribute (cellColor);
+            SetAttribute (cellAttribute);
             Driver?.AddStr (render);
         }
     }
@@ -1509,7 +1516,7 @@ private IEnumerable<ColumnToRender> CalculateViewport (Rectangle bounds, int pad
             bool isVeryLast = lastColumn == col;
 
             // there is space
-            toReturn.Add (new ColumnToRender (col, startingIdxForCurrentHeader, colWidth, isVeryLast));
+            toReturn.Add (new (col, startingIdxForCurrentHeader, colWidth, isVeryLast));
             first = false;
         }
 
@@ -1531,9 +1538,10 @@ private void ClearLine (int row, int width)
         {
             return;
         }
+
         Move (0, row);
-        SetAttribute (GetNormalColor ());
-        Driver.AddStr (new string (' ', width));
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
+        Driver.AddStr (new (' ', width));
     }
 
     private void ClearMultiSelectedRegions (bool keepToggledSelections)
@@ -1577,7 +1585,7 @@ private TableSelection CreateTableSelection (int pt1X, int pt1Y, int pt2X, int p
         int right = Math.Max (Math.Max (pt1X, pt2X), 0);
 
         // Rect class is inclusive of Top Left but exclusive of Bottom Right so extend by 1
-        return new TableSelection (new (pt1X, pt1Y), new (left, top, right - left + 1, bot - top + 1))
+        return new (new (pt1X, pt1Y), new (left, top, right - left + 1, bot - top + 1))
         {
             IsToggled = toggle
         };
@@ -1906,30 +1914,27 @@ private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRen
     {
         bool focused = HasFocus;
 
-        ColorScheme rowScheme = Style.RowColorGetter?.Invoke (
-                                                              new RowColorGetterArgs (Table, rowToRender)
-                                                             )
-                                ?? ColorScheme;
+        Scheme rowScheme = Style.RowColorGetter?.Invoke (
+                                                         new (Table, rowToRender)
+                                                        )
+                           ?? GetScheme ();
 
         //start by clearing the entire line
         Move (0, row);
 
-        Attribute? color;
+        Attribute? attribute;
 
         if (FullRowSelect && IsSelected (0, rowToRender))
         {
-            color = focused ? rowScheme?.Focus : rowScheme?.HotNormal;
+            attribute = focused ? rowScheme?.Focus : rowScheme?.Active;
         }
         else
         {
-            color = Enabled ? rowScheme?.Normal : rowScheme?.Disabled;
+            attribute = Enabled ? rowScheme?.Normal : rowScheme?.Active;
         }
 
-        if (color is { })
-        {
-            SetAttribute (color.Value);
-        }
-        Driver?.AddStr (new string (' ', Viewport.Width));
+        SetAttribute (attribute.Value);
+        Driver?.AddStr (new (' ', Viewport.Width));
 
         // Render cells for each visible header for the current row
         for (var i = 0; i < columnsToRender.Length; i++)
@@ -1941,7 +1946,7 @@ private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRen
             // move to start of cell (in line with header positions)
             Move (current.X, row);
 
-            // Set color scheme based on whether the current cell is the selected one
+            // Set scheme based on whether the current cell is the selected one
             bool isSelectedCell = IsSelected (current.Column, rowToRender);
 
             object val = Table [rowToRender, current.Column];
@@ -1950,23 +1955,23 @@ private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRen
             string representation = GetRepresentation (val, colStyle);
 
             // to get the colour scheme
-            CellColorGetterDelegate colorSchemeGetter = colStyle?.ColorGetter;
+            CellColorGetterDelegate schemeGetter = colStyle?.ColorGetter;
 
-            ColorScheme scheme;
+            Scheme scheme;
 
-            if (colorSchemeGetter is { })
+            if (schemeGetter is { })
             {
                 // user has a delegate for defining row color per cell, call it
-                scheme = colorSchemeGetter (
-                                            new CellColorGetterArgs (
-                                                                     Table,
-                                                                     rowToRender,
-                                                                     current.Column,
-                                                                     val,
-                                                                     representation,
-                                                                     rowScheme
-                                                                    )
-                                           );
+                scheme = schemeGetter (
+                                       new (
+                                            Table,
+                                            rowToRender,
+                                            current.Column,
+                                            val,
+                                            representation,
+                                            rowScheme
+                                           )
+                                      );
 
                 // if users custom color getter returned null, use the row scheme
                 if (scheme is null)
@@ -1984,7 +1989,7 @@ private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRen
 
             if (isSelectedCell)
             {
-                cellColor = focused ? scheme?.Focus : scheme?.HotNormal;
+                cellColor = focused ? scheme?.Focus : scheme?.Active;
             }
             else
             {
@@ -2001,22 +2006,22 @@ private void RenderRow (int row, int rowToRender, ColumnToRender [] columnsToRen
                 RenderCell (cellColor.Value, render, isPrimaryCell);
             }
 
-            // Reset color scheme to normal for drawing separators if we drew text with custom scheme
+            // Reset scheme to normal for drawing separators if we drew text with custom scheme
             if (scheme != rowScheme)
             {
                 if (isSelectedCell)
                 {
-                    color = focused ? rowScheme.Focus : rowScheme.HotNormal;
+                    attribute = focused ? rowScheme.Focus : rowScheme.Active;
                 }
                 else
                 {
-                    color = Enabled ? rowScheme.Normal : rowScheme.Disabled;
+                    attribute = Enabled ? rowScheme.Normal : rowScheme.Disabled;
                 }
 
-                SetAttribute (color.Value);
+                SetAttribute (attribute.Value);
             }
 
-            // If not in full row select mode always, reset color scheme to normal and render the vertical line (or space) at the end of the cell
+            // If not in full row select mode always, reset scheme to normal and render the vertical line (or space) at the end of the cell
             if (!FullRowSelect)
             {
                 if (rowScheme is { })
@@ -2172,7 +2177,7 @@ ColumnStyle colStyle
     {
         if (string.IsNullOrEmpty (representation))
         {
-            return new string (' ', availableHorizontalSpace);
+            return new (' ', availableHorizontalSpace);
         }
 
         // if value is not wide enough
@@ -2202,10 +2207,10 @@ ColumnStyle colStyle
         }
 
         // value is too wide
-        return new string (
-                           representation.TakeWhile (c => (availableHorizontalSpace -= ((Rune)c).GetColumns ()) > 0)
-                                         .ToArray ()
-                          );
+        return new (
+                    representation.TakeWhile (c => (availableHorizontalSpace -= ((Rune)c).GetColumns ()) > 0)
+                                  .ToArray ()
+                   );
     }
 
     private bool TryGetNearestVisibleColumn (
@@ -2344,8 +2349,9 @@ public ColumnToRender (int col, int x, int width, bool isVeryLast)
 
     bool IDesignable.EnableForDesign ()
     {
-        var dt = BuildDemoDataTable (5, 5);
+        DataTable dt = BuildDemoDataTable (5, 5);
         Table = new DataTableSource (dt);
+
         return true;
     }
 
diff --git a/Terminal.Gui/Views/ContentsChangedEventArgs.cs b/Terminal.Gui/Views/TextInput/ContentsChangedEventArgs.cs
similarity index 100%
rename from Terminal.Gui/Views/ContentsChangedEventArgs.cs
rename to Terminal.Gui/Views/TextInput/ContentsChangedEventArgs.cs
diff --git a/Terminal.Gui/Views/DateField.cs b/Terminal.Gui/Views/TextInput/DateField.cs
similarity index 100%
rename from Terminal.Gui/Views/DateField.cs
rename to Terminal.Gui/Views/TextInput/DateField.cs
diff --git a/Terminal.Gui/Views/TextInput/HistoryText.cs b/Terminal.Gui/Views/TextInput/HistoryText.cs
new file mode 100644
index 0000000000..8670a8f669
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/HistoryText.cs
@@ -0,0 +1,248 @@
+#nullable enable
+namespace Terminal.Gui;
+
+internal class HistoryText
+{
+    private readonly List<HistoryTextItemEventArgs> _historyTextItems = [];
+    private int _idxHistoryText = -1;
+    private readonly List<List<Cell>> _originalCellsList = [];
+    public bool HasHistoryChanges => _idxHistoryText > -1;
+    public bool IsFromHistory { get; private set; }
+
+    public void Add (List<List<Cell>> lines, Point curPos, TextEditingLineStatus lineStatus = TextEditingLineStatus.Original)
+    {
+        if (lineStatus == TextEditingLineStatus.Original && _historyTextItems.Count > 0 && _historyTextItems.Last ().LineStatus == TextEditingLineStatus.Original)
+        {
+            return;
+        }
+
+        if (lineStatus == TextEditingLineStatus.Replaced && _historyTextItems.Count > 0 && _historyTextItems.Last ().LineStatus == TextEditingLineStatus.Replaced)
+        {
+            return;
+        }
+
+        if (_historyTextItems.Count == 0 && lineStatus != TextEditingLineStatus.Original)
+        {
+            throw new ArgumentException ("The first item must be the original.");
+        }
+
+        if (_idxHistoryText >= 0 && _idxHistoryText + 1 < _historyTextItems.Count)
+        {
+            _historyTextItems.RemoveRange (
+                                           _idxHistoryText + 1,
+                                           _historyTextItems.Count - _idxHistoryText - 1
+                                          );
+        }
+
+        _historyTextItems.Add (new (lines, curPos, lineStatus));
+        _idxHistoryText++;
+    }
+
+    public event EventHandler<HistoryTextItemEventArgs>? ChangeText;
+
+    public void Clear (List<List<Cell>> cellsList)
+    {
+        _historyTextItems.Clear ();
+        _idxHistoryText = -1;
+        _originalCellsList.Clear ();
+
+        // Save a copy of the original, not the reference
+        foreach (List<Cell> cells in cellsList)
+        {
+            _originalCellsList.Add ([.. cells]);
+        }
+
+        OnChangeText (null);
+    }
+
+    public bool IsDirty (List<List<Cell>> cellsList)
+    {
+        if (cellsList.Count != _originalCellsList.Count)
+        {
+            return true;
+        }
+
+        for (var r = 0; r < cellsList.Count; r++)
+        {
+            List<Cell> cells = cellsList [r];
+            List<Cell> originalCells = _originalCellsList [r];
+
+            if (cells.Count != originalCells.Count)
+            {
+                return true;
+            }
+
+            for (var c = 0; c < cells.Count; c++)
+            {
+                Cell cell = cells [c];
+                Cell originalCell = originalCells [c];
+
+                if (!cell.Equals (originalCell))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public void Redo ()
+    {
+        if (_historyTextItems?.Count > 0 && _idxHistoryText < _historyTextItems.Count - 1)
+        {
+            IsFromHistory = true;
+
+            _idxHistoryText++;
+
+            var historyTextItem = new HistoryTextItemEventArgs (_historyTextItems [_idxHistoryText]) { IsUndoing = false };
+
+            ProcessChanges (ref historyTextItem);
+
+            IsFromHistory = false;
+        }
+    }
+
+    public void ReplaceLast (List<List<Cell>> lines, Point curPos, TextEditingLineStatus lineStatus)
+    {
+        HistoryTextItemEventArgs? found = _historyTextItems.FindLast (x => x.LineStatus == lineStatus);
+
+        if (found is { })
+        {
+            found.Lines = lines;
+            found.CursorPosition = curPos;
+        }
+    }
+
+    public void Undo ()
+    {
+        if (_historyTextItems?.Count > 0 && _idxHistoryText > 0)
+        {
+            IsFromHistory = true;
+
+            _idxHistoryText--;
+
+            var historyTextItem = new HistoryTextItemEventArgs (_historyTextItems [_idxHistoryText]) { IsUndoing = true };
+
+            ProcessChanges (ref historyTextItem);
+
+            IsFromHistory = false;
+        }
+    }
+
+    private void OnChangeText (HistoryTextItemEventArgs? lines) { ChangeText?.Invoke (this, lines!); }
+
+    private void ProcessChanges (ref HistoryTextItemEventArgs historyTextItem)
+    {
+        if (historyTextItem.IsUndoing)
+        {
+            if (_idxHistoryText - 1 > -1
+                && (_historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Added
+                    || _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Removed
+                    || (historyTextItem.LineStatus == TextEditingLineStatus.Replaced && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Original)
+                    || (historyTextItem.LineStatus == TextEditingLineStatus.Attribute && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Original)))
+            {
+                _idxHistoryText--;
+
+                while (_historyTextItems [_idxHistoryText].LineStatus == TextEditingLineStatus.Added
+                       && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Removed)
+                {
+                    _idxHistoryText--;
+                }
+
+                historyTextItem = new (_historyTextItems [_idxHistoryText]);
+                historyTextItem.IsUndoing = true;
+                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
+            }
+
+            if (historyTextItem.LineStatus == TextEditingLineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Added)
+            {
+                historyTextItem.RemovedOnAdded =
+                    new (_historyTextItems [_idxHistoryText + 1]);
+            }
+
+            if ((historyTextItem.LineStatus == TextEditingLineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Original)
+                || (historyTextItem.LineStatus == TextEditingLineStatus.Removed && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Original)
+                || (historyTextItem.LineStatus == TextEditingLineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Removed))
+            {
+                if (!historyTextItem.Lines [0]
+                                    .SequenceEqual (_historyTextItems [_idxHistoryText - 1].Lines [0])
+                    && historyTextItem.CursorPosition == _historyTextItems [_idxHistoryText - 1].CursorPosition)
+                {
+                    historyTextItem.Lines [0] =
+                        new (_historyTextItems [_idxHistoryText - 1].Lines [0]);
+                }
+
+                if (historyTextItem.LineStatus == TextEditingLineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Removed)
+                {
+                    historyTextItem.FinalCursorPosition =
+                        _historyTextItems [_idxHistoryText - 2].CursorPosition;
+                }
+                else
+                {
+                    historyTextItem.FinalCursorPosition =
+                        _historyTextItems [_idxHistoryText - 1].CursorPosition;
+                }
+            }
+            else
+            {
+                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
+            }
+
+            OnChangeText (historyTextItem);
+
+            while (_historyTextItems [_idxHistoryText].LineStatus == TextEditingLineStatus.Removed
+                   || _historyTextItems [_idxHistoryText].LineStatus == TextEditingLineStatus.Added)
+            {
+                _idxHistoryText--;
+            }
+        }
+        else if (!historyTextItem.IsUndoing)
+        {
+            if (_idxHistoryText + 1 < _historyTextItems.Count
+                && (historyTextItem.LineStatus == TextEditingLineStatus.Original
+                    || _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Added
+                    || _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Removed))
+            {
+                _idxHistoryText++;
+                historyTextItem = new (_historyTextItems [_idxHistoryText]);
+                historyTextItem.IsUndoing = false;
+                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
+            }
+
+            if (historyTextItem.LineStatus == TextEditingLineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == TextEditingLineStatus.Removed)
+            {
+                historyTextItem.RemovedOnAdded =
+                    new (_historyTextItems [_idxHistoryText - 1]);
+            }
+
+            if ((historyTextItem.LineStatus == TextEditingLineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Replaced)
+                || (historyTextItem.LineStatus == TextEditingLineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Original)
+                || (historyTextItem.LineStatus == TextEditingLineStatus.Added && _historyTextItems [_idxHistoryText + 1].LineStatus == TextEditingLineStatus.Replaced))
+            {
+                if (historyTextItem.LineStatus == TextEditingLineStatus.Removed
+                    && !historyTextItem.Lines [0]
+                                       .SequenceEqual (_historyTextItems [_idxHistoryText + 1].Lines [0]))
+                {
+                    historyTextItem.Lines [0] =
+                        new (_historyTextItems [_idxHistoryText + 1].Lines [0]);
+                }
+
+                historyTextItem.FinalCursorPosition =
+                    _historyTextItems [_idxHistoryText + 1].CursorPosition;
+            }
+            else
+            {
+                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
+            }
+
+            OnChangeText (historyTextItem);
+
+            while (_historyTextItems [_idxHistoryText].LineStatus == TextEditingLineStatus.Removed
+                   || _historyTextItems [_idxHistoryText].LineStatus == TextEditingLineStatus.Added)
+            {
+                _idxHistoryText++;
+            }
+        }
+    }
+}
diff --git a/Terminal.Gui/Views/TextInput/HistoryTextItemEventArgs.cs b/Terminal.Gui/Views/TextInput/HistoryTextItemEventArgs.cs
new file mode 100644
index 0000000000..f8c4937a9b
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/HistoryTextItemEventArgs.cs
@@ -0,0 +1,112 @@
+#nullable enable
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     Event arguments for <see cref="HistoryText"/> item events. Used by <see cref="TextField"/> and <see cref="TextView"/>.
+/// </summary>
+/// <remarks>
+///     This class encapsulates information about changes to text, such as the affected lines, cursor positions, and the type of change.
+///     It is primarily used to support undo/redo functionality in text editing controls like <see cref="TextView"/> and <see cref="TextField"/>.
+/// </remarks>
+public class HistoryTextItemEventArgs : EventArgs
+{
+    // TODO: these should all be properties
+    /// <summary>
+    ///     Gets or sets the cursor position at the time of the change.
+    /// </summary>
+    public Point CursorPosition;
+
+    /// <summary>
+    ///     Gets or sets the final cursor position after the change is applied.
+    /// </summary>
+    public Point FinalCursorPosition;
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether the change is part of an undo operation.
+    /// </summary>
+    public bool IsUndoing;
+
+    /// <summary>
+    ///     Gets or sets the lines of text affected by the change.
+    /// </summary>
+    /// <remarks>
+    ///     Each line is represented as a list of <see cref="Cell"/> objects, which include the text and its attributes.
+    /// </remarks>
+    public List<List<Cell>> Lines;
+
+    /// <summary>
+    ///     Gets or sets the status of the line(s) affected by the change.
+    /// </summary>
+    /// <seealso cref="TextEditingLineStatus"/>
+    public TextEditingLineStatus LineStatus;
+
+    /// <summary>
+    ///     Gets or sets the associated <see cref="HistoryTextItemEventArgs"/> for a removed line when an added line replaces it.
+    /// </summary>
+    /// <remarks>
+    ///     This property is used to track the relationship between added and removed lines during undo/redo operations.
+    /// </remarks>
+    public HistoryTextItemEventArgs? RemovedOnAdded;
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="HistoryTextItemEventArgs"/> class with the specified lines, cursor position, line status, and associated removed line.
+    /// </summary>
+    /// <param name="lines">The lines of text affected by the change.</param>
+    /// <param name="curPos">The cursor position at the time of the change.</param>
+    /// <param name="linesStatus">The status of the line(s) affected by the change.</param>
+    /// <param name="removedOnAdded">The associated <see cref="HistoryTextItemEventArgs"/> for a removed line when an added line replaces it.</param>
+    public HistoryTextItemEventArgs (List<List<Cell>> lines, Point curPos, TextEditingLineStatus linesStatus, HistoryTextItemEventArgs removedOnAdded)
+    {
+        Lines = lines;
+        CursorPosition = curPos;
+        LineStatus = linesStatus;
+        RemovedOnAdded = removedOnAdded;
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="HistoryTextItemEventArgs"/> class by copying an existing instance and associating it with a removed line.
+    /// </summary>
+    /// <param name="historyTextItem">The existing <see cref="HistoryTextItemEventArgs"/> to copy.</param>
+    /// <param name="removedOnAdded">The associated <see cref="HistoryTextItemEventArgs"/> for a removed line when an added line replaces it.</param>
+    public HistoryTextItemEventArgs (HistoryTextItemEventArgs historyTextItem, HistoryTextItemEventArgs removedOnAdded)
+    {
+        RemovedOnAdded = removedOnAdded;
+        Lines = [.. historyTextItem.Lines];
+        CursorPosition = new Point (historyTextItem.CursorPosition.X, historyTextItem.CursorPosition.Y);
+        LineStatus = historyTextItem.LineStatus;
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="HistoryTextItemEventArgs"/> class with the specified lines, cursor position, and line status.
+    /// </summary>
+    /// <param name="lines">The lines of text affected by the change.</param>
+    /// <param name="curPos">The cursor position at the time of the change.</param>
+    /// <param name="linesStatus">The status of the line(s) affected by the change.</param>
+    public HistoryTextItemEventArgs (List<List<Cell>> lines, Point curPos, TextEditingLineStatus linesStatus)
+    {
+        Lines = lines;
+        CursorPosition = curPos;
+        LineStatus = linesStatus;
+    }
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="HistoryTextItemEventArgs"/> class by copying an existing instance.
+    /// </summary>
+    /// <param name="historyTextItem">The existing <see cref="HistoryTextItemEventArgs"/> to copy.</param>
+    public HistoryTextItemEventArgs (HistoryTextItemEventArgs historyTextItem)
+    {
+        Lines = [.. historyTextItem.Lines];
+        CursorPosition = new Point (historyTextItem.CursorPosition.X, historyTextItem.CursorPosition.Y);
+        LineStatus = historyTextItem.LineStatus;
+    }
+
+    /// <summary>
+    ///     Returns a string representation of the <see cref="HistoryTextItemEventArgs"/> instance.
+    /// </summary>
+    /// <returns>A string containing the count of lines, cursor position, and line status.</returns>
+    public override string ToString ()
+    {
+        return $"(Count: {Lines.Count}, Cursor: {CursorPosition}, Status: {LineStatus})";
+    }
+}
diff --git a/Terminal.Gui/Views/TextInput/ITextValidateProvider.cs b/Terminal.Gui/Views/TextInput/ITextValidateProvider.cs
new file mode 100644
index 0000000000..496d6c7a5b
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/ITextValidateProvider.cs
@@ -0,0 +1,66 @@
+#nullable enable
+namespace Terminal.Gui;
+
+/// <summary>TextValidateField Providers Interface. All TextValidateField are created with a ITextValidateProvider.</summary>
+public interface ITextValidateProvider
+{
+    /// <summary>Gets the formatted string for display.</summary>
+    string DisplayText { get; }
+
+    /// <summary>Set that this provider uses a fixed width. e.g. Masked ones are fixed.</summary>
+    bool Fixed { get; }
+
+    /// <summary>True if the input is valid, otherwise false.</summary>
+    bool IsValid { get; }
+
+    /// <summary>Set the input text and get the current value.</summary>
+    string Text { get; set; }
+
+    /// <summary>Set Cursor position to <paramref name="pos"/>.</summary>
+    /// <param name="pos"></param>
+    /// <returns>Return first valid position.</returns>
+    int Cursor (int pos);
+
+    /// <summary>Find the last valid character position.</summary>
+    /// <returns>New cursor position.</returns>
+    int CursorEnd ();
+
+    /// <summary>First valid position before <paramref name="pos"/>.</summary>
+    /// <param name="pos"></param>
+    /// <returns>New cursor position if any, otherwise returns <paramref name="pos"/></returns>
+    int CursorLeft (int pos);
+
+    /// <summary>First valid position after <paramref name="pos"/>.</summary>
+    /// <param name="pos">Current position.</param>
+    /// <returns>New cursor position if any, otherwise returns <paramref name="pos"/></returns>
+    int CursorRight (int pos);
+
+    /// <summary>Find the first valid character position.</summary>
+    /// <returns>New cursor position.</returns>
+    int CursorStart ();
+
+    /// <summary>Deletes the current character in <paramref name="pos"/>.</summary>
+    /// <param name="pos"></param>
+    /// <returns>true if the character was successfully removed, otherwise false.</returns>
+    bool Delete (int pos);
+
+    /// <summary>Insert character <paramref name="ch"/> in position <paramref name="pos"/>.</summary>
+    /// <param name="ch"></param>
+    /// <param name="pos"></param>
+    /// <returns>true if the character was successfully inserted, otherwise false.</returns>
+    bool InsertAt (char ch, int pos);
+
+    /// <summary>Method that invoke the <see cref="TextChanged"/> event if it's defined.</summary>
+    /// <param name="oldValue">The previous text before replaced.</param>
+    /// <returns>Returns the <see cref="EventArgs{T}"/></returns>
+    void OnTextChanged (EventArgs<string> oldValue);
+
+    /// <summary>
+    ///     Changed event, raised when the text has changed.
+    ///     <remarks>
+    ///         This event is raised when the <see cref="Text"/> changes. The passed <see cref="EventArgs"/> is a
+    ///         <see cref="string"/> containing the old value.
+    ///     </remarks>
+    /// </summary>
+    event EventHandler<EventArgs<string>> TextChanged;
+}
diff --git a/Terminal.Gui/Views/TextInput/NetMaskedTextProvider.cs b/Terminal.Gui/Views/TextInput/NetMaskedTextProvider.cs
new file mode 100644
index 0000000000..b45da3d602
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/NetMaskedTextProvider.cs
@@ -0,0 +1,151 @@
+#nullable enable
+using System.ComponentModel;
+
+namespace Terminal.Gui;
+
+/// <summary>
+///     .Net MaskedTextProvider Provider for TextValidateField.
+///     <para></para>
+///     <para>
+///         <a
+///             href="https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.maskedtextprovider?view=net-5.0">
+///             Wrapper around MaskedTextProvider
+///         </a>
+///     </para>
+///     <para>
+///         <a
+///             href="https://docs.microsoft.com/en-us/dotnet/api/system.windows.forms.maskedtextbox.mask?view=net-5.0">
+///             Masking elements
+///         </a>
+///     </para>
+/// </summary>
+public class NetMaskedTextProvider : ITextValidateProvider
+{
+    private MaskedTextProvider? _provider;
+
+    /// <summary>Empty Constructor</summary>
+    public NetMaskedTextProvider (string mask) { Mask = mask; }
+
+    /// <summary>Mask property</summary>
+    public string Mask
+    {
+        get => _provider!.Mask;
+        set
+        {
+            string current = _provider != null
+                                 ? _provider.ToString (false, false)
+                                 : string.Empty;
+            _provider = new (value == string.Empty ? "&&&&&&" : value);
+
+            if (!string.IsNullOrEmpty (current))
+            {
+                _provider.Set (current);
+            }
+        }
+    }
+
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<string>>? TextChanged;
+
+    /// <inheritdoc/>
+    public string Text
+    {
+        get => _provider!.ToString ();
+        set => _provider!.Set (value);
+    }
+
+    /// <inheritdoc/>
+    public bool IsValid => _provider!.MaskCompleted;
+
+    /// <inheritdoc/>
+    public bool Fixed => true;
+
+    /// <inheritdoc/>
+    public string DisplayText => _provider.ToDisplayString ();
+
+    /// <inheritdoc/>
+    public int Cursor (int pos)
+    {
+        if (pos < 0)
+        {
+            return CursorStart ();
+        }
+
+        if (pos > _provider!.Length)
+        {
+            return CursorEnd ();
+        }
+
+        int p = _provider.FindEditPositionFrom (pos, false);
+
+        if (p == -1)
+        {
+            p = _provider.FindEditPositionFrom (pos, true);
+        }
+
+        return p;
+    }
+
+    /// <inheritdoc/>
+    public int CursorStart ()
+    {
+        return _provider!.IsEditPosition (0)
+                   ? 0
+                   : _provider.FindEditPositionFrom (0, true);
+    }
+
+    /// <inheritdoc/>
+    public int CursorEnd ()
+    {
+        return _provider!.IsEditPosition (_provider.Length - 1)
+                   ? _provider.Length - 1
+                   : _provider.FindEditPositionFrom (_provider.Length, false);
+    }
+
+    /// <inheritdoc/>
+    public int CursorLeft (int pos)
+    {
+        int c = _provider!.FindEditPositionFrom (pos - 1, false);
+
+        return c == -1 ? pos : c;
+    }
+
+    /// <inheritdoc/>
+    public int CursorRight (int pos)
+    {
+        int c = _provider!.FindEditPositionFrom (pos + 1, true);
+
+        return c == -1 ? pos : c;
+    }
+
+    /// <inheritdoc/>
+    public bool Delete (int pos)
+    {
+        string oldValue = Text;
+        bool result = _provider!.Replace (' ', pos); // .RemoveAt (pos);
+
+        if (result)
+        {
+            OnTextChanged (new (in oldValue));
+        }
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public bool InsertAt (char ch, int pos)
+    {
+        string oldValue = Text;
+        bool result = _provider!.Replace (ch, pos);
+
+        if (result)
+        {
+            OnTextChanged (new (in oldValue));
+        }
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public void OnTextChanged (EventArgs<string> args) { TextChanged?.Invoke (this, args); }
+}
diff --git a/Terminal.Gui/Views/TextInput/TextEditingLineStatus.cs b/Terminal.Gui/Views/TextInput/TextEditingLineStatus.cs
new file mode 100644
index 0000000000..4f31ffac7b
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/TextEditingLineStatus.cs
@@ -0,0 +1,39 @@
+using Terminal.Gui;
+
+/// <summary>
+///     Represents the status of a line during text editing operations in a <see cref="TextView"/>.
+/// </summary>
+/// <remarks>
+///     This enum is used to track changes to text lines in the <see cref="HistoryText"/> class, enabling undo/redo
+///     functionality
+///     and maintaining the state of text modifications. Each value describes a specific type of change or state for a
+///     line.
+/// </remarks>
+// ReSharper disable once CheckNamespace
+public enum TextEditingLineStatus
+{
+    /// <summary>
+    ///     Indicates that the line is in its original, unmodified state.
+    /// </summary>
+    Original,
+
+    /// <summary>
+    ///     Indicates that the line has been replaced with new content.
+    /// </summary>
+    Replaced,
+
+    /// <summary>
+    ///     Indicates that the line has been removed.
+    /// </summary>
+    Removed,
+
+    /// <summary>
+    ///     Indicates that a new line has been added.
+    /// </summary>
+    Added,
+
+    /// <summary>
+    ///     Indicates that the line's attributes (e.g., formatting or styling) have been modified.
+    /// </summary>
+    Attribute
+}
diff --git a/Terminal.Gui/Views/TextField.cs b/Terminal.Gui/Views/TextInput/TextField.cs
similarity index 92%
rename from Terminal.Gui/Views/TextField.cs
rename to Terminal.Gui/Views/TextInput/TextField.cs
index 97c7154cd9..f8432650c7 100644
--- a/Terminal.Gui/Views/TextField.cs
+++ b/Terminal.Gui/Views/TextInput/TextField.cs
@@ -5,7 +5,7 @@ namespace Terminal.Gui;
 
 /// <summary>Single-line text entry <see cref="View"/></summary>
 /// <remarks>The <see cref="TextField"/> <see cref="View"/> provides editing functionality and mouse support.</remarks>
-public class TextField : View
+public class TextField : View, IDesignable
 {
     private readonly HistoryText _historyText;
     private CultureInfo _currentCulture;
@@ -28,7 +28,10 @@ public TextField ()
         _isButtonReleased = true;
         _selectedStart = -1;
         _text = new ();
-        CaptionColor = new (Color.DarkGray);
+
+        // TODO: Determine if this is a good choice. Previously this was hard coded to 
+        // TODO: DarkGray which was NOT a good choice.
+        CaptionColor = GetAttributeForRole (VisualRole.Normal).Foreground.GetBrighterColor();
         ReadOnly = false;
         Autocomplete = new TextFieldAutocomplete ();
         Height = Dim.Auto (DimAutoStyle.Text, 1);
@@ -316,7 +319,7 @@ public TextField ()
                     Command.Context,
                     () =>
                     {
-                        ShowContextMenu (keyboard: true);
+                        ShowContextMenu (true);
 
                         return true;
                     }
@@ -537,14 +540,14 @@ public string SelectedText
             if (!Secret && !_historyText.IsFromHistory)
             {
                 _historyText.Add (
-                                  new () { Cell.ToCellList (oldText) },
+                                  [Cell.ToCellList (oldText)],
                                   new (_cursorPosition, 0)
                                  );
 
                 _historyText.Add (
-                                  new () { Cell.ToCells (_text) },
+                                  [Cell.ToCells (_text)],
                                   new (_cursorPosition, 0),
-                                  HistoryText.LineStatus.Replaced
+                                  TextEditingLineStatus.Replaced
                                  );
             }
 
@@ -584,7 +587,7 @@ public void ClearAllSelection ()
         SetNeedsDraw ();
     }
 
-    /// <summary>Allows clearing the <see cref="HistoryText.HistoryTextItemEventArgs"/> items updating the original text.</summary>
+    /// <summary>Clears the history.</summary>
     public void ClearHistoryChanges () { _historyText.Clear ([Cell.StringToCells (Text)]); }
 
     /// <summary>Copy the selected text to the clipboard.</summary>
@@ -719,7 +722,17 @@ public virtual void DeleteCharRight ()
     }
 
     /// <inheritdoc/>
-    public override Attribute GetNormalColor () { return GetFocusColor (); }
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
+    {
+        if (role == VisualRole.Normal)
+        {
+            currentAttribute = GetAttributeForRole (VisualRole.Focus);
+
+            return true;
+        }
+
+        return base.OnGettingAttributeForRole (role, ref currentAttribute);
+    }
 
     /// <summary>
     ///     Inserts the given <paramref name="toAdd"/> text at the current cursor position exactly as if the user had just
@@ -922,50 +935,56 @@ protected override bool OnDrawingContent ()
     {
         _isDrawing = true;
 
-        var selColor = new Attribute (GetFocusColor ().Background, GetFocusColor ().Foreground);
+        // Cache attributes as GetAttributeForRole might raise events
+        Attribute selectedAttribute = new Attribute (GetAttributeForRole (VisualRole.Active));
+        Attribute readonlyAttribute = GetAttributeForRole (VisualRole.ReadOnly);
+        Attribute normalAttribute = GetAttributeForRole (VisualRole.Editable);
+
         SetSelectedStartSelectedLength ();
 
-        SetAttribute (GetNormalColor ());
+        SetAttribute (GetAttributeForRole (VisualRole.Normal));
         Move (0, 0);
 
         int p = ScrollOffset;
         var col = 0;
         int width = Viewport.Width + OffSetBackground ();
         int tcount = _text.Count;
-        Attribute roc = GetReadOnlyColor ();
 
         for (int idx = p; idx < tcount; idx++)
         {
             Rune rune = _text [idx];
             int cols = rune.GetColumns ();
 
-            if (idx == _cursorPosition && HasFocus && !Used && SelectedLength == 0 && !ReadOnly)
+            if (!Enabled)
             {
-                SetAttribute (selColor);
+                // Disabled
+                SetAttributeForRole (VisualRole.Disabled);
+            } 
+            else if (idx == _cursorPosition && HasFocus && !Used && SelectedLength == 0 && !ReadOnly)
+            {
+                // Selected text
+                SetAttribute (selectedAttribute);
             }
             else if (ReadOnly)
             {
                 SetAttribute (
-                                      idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength
-                                          ? selColor
-                                          : roc
-                                     );
+                              idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength
+                                  ? selectedAttribute
+                                  : readonlyAttribute
+                             );
             }
             else if (!HasFocus && Enabled)
             {
-                SetAttribute (GetFocusColor ());
-            }
-            else if (!Enabled)
-            {
-                SetAttribute (roc);
+                // Normal text
+                SetAttribute (normalAttribute);
             }
             else
             {
                 SetAttribute (
-                                      idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength
-                                          ? selColor
-                                          : ColorScheme.Focus
-                                     );
+                              idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength
+                                  ? selectedAttribute
+                                  : normalAttribute
+                             );
             }
 
             if (col + cols <= width)
@@ -984,8 +1003,9 @@ protected override bool OnDrawingContent ()
             }
         }
 
-        SetAttribute (GetFocusColor ());
+        SetAttribute (normalAttribute);
 
+        // Fill rest of line with spaces
         for (int i = col; i < width; i++)
         {
             Driver?.AddRune ((Rune)' ');
@@ -1025,7 +1045,7 @@ protected override bool OnKeyDown (Key key)
         return false;
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc/>
     protected override bool OnKeyDownNotHandled (Key a)
     {
         // Remember the cursor position because the new calculated cursor position is needed
@@ -1222,16 +1242,18 @@ private void Adjust ()
     private void CreateContextMenu ()
     {
         DisposeContextMenu ();
-        PopoverMenu menu = new (new List<MenuItemv2> ()
-        {
-            new (this, Command.SelectAll, Strings.ctxSelectAll),
-            new (this, Command.DeleteAll, Strings.ctxDeleteAll),
-            new (this, Command.Copy, Strings.ctxCopy),
-            new (this, Command.Cut, Strings.ctxCut),
-            new (this, Command.Paste, Strings.ctxPaste),
-            new (this, Command.Undo, Strings.ctxUndo),
-            new (this, Command.Redo, Strings.ctxRedo),
-        });
+
+        PopoverMenu menu = new (
+                                new List<MenuItemv2>
+                                {
+                                    new (this, Command.SelectAll, Strings.ctxSelectAll),
+                                    new (this, Command.DeleteAll, Strings.ctxDeleteAll),
+                                    new (this, Command.Copy, Strings.ctxCopy),
+                                    new (this, Command.Cut, Strings.ctxCut),
+                                    new (this, Command.Paste, Strings.ctxPaste),
+                                    new (this, Command.Undo, Strings.ctxUndo),
+                                    new (this, Command.Redo, Strings.ctxRedo)
+                                });
 
         HotKeyBindings.Remove (menu.Key);
         HotKeyBindings.Add (menu.Key, Command.Context);
@@ -1240,10 +1262,7 @@ private void CreateContextMenu ()
         ContextMenu = menu;
     }
 
-    private void ContextMenu_KeyChanged (object sender, KeyChangedEventArgs e)
-    {
-        KeyBindings.Replace (e.OldKey.KeyCode, e.NewKey.KeyCode);
-    }
+    private void ContextMenu_KeyChanged (object sender, KeyChangedEventArgs e) { KeyBindings.Replace (e.OldKey.KeyCode, e.NewKey.KeyCode); }
 
     private List<Rune> DeleteSelectedText ()
     {
@@ -1290,24 +1309,7 @@ private TextModel GetModel ()
         return model;
     }
 
-    private Attribute GetReadOnlyColor ()
-    {
-        ColorScheme cs = ColorScheme;
-
-        if (ColorScheme is null)
-        {
-            cs = new ();
-        }
-
-        if (cs.Disabled.Foreground == cs.Focus.Background)
-        {
-            return new (cs.Focus.Foreground, cs.Focus.Background);
-        }
-
-        return new (cs.Disabled.Foreground, cs.Focus.Background);
-    }
-
-    private void HistoryText_ChangeText (object sender, HistoryText.HistoryTextItemEventArgs obj)
+    private void HistoryText_ChangeText (object sender, HistoryTextItemEventArgs obj)
     {
         if (obj is null)
         {
@@ -1456,16 +1458,18 @@ private void MoveHomeExtend ()
     }
 
     /// <summary>
-    /// Moves the cursor +/- the given <paramref name="distance"/>, clearing
-    /// any selection and returning true if any meaningful changes were made.
+    ///     Moves the cursor +/- the given <paramref name="distance"/>, clearing
+    ///     any selection and returning true if any meaningful changes were made.
     /// </summary>
-    /// <param name="distance">Distance to move the cursor, will be clamped to
-    /// text length. Positive for right, Negative for left.</param>
+    /// <param name="distance">
+    ///     Distance to move the cursor, will be clamped to
+    ///     text length. Positive for right, Negative for left.
+    /// </param>
     /// <returns></returns>
     private bool Move (int distance)
     {
-        var oldCursorPosition = _cursorPosition;
-        var hadSelection = _selectedText != null && _selectedText.Length > 0;
+        int oldCursorPosition = _cursorPosition;
+        bool hadSelection = _selectedText != null && _selectedText.Length > 0;
 
         _cursorPosition = Math.Min (_text.Count, Math.Max (0, _cursorPosition + distance));
         ClearAllSelection ();
@@ -1474,10 +1478,7 @@ private bool Move (int distance)
         return _cursorPosition != oldCursorPosition || hadSelection;
     }
 
-    private bool MoveLeft ()
-    {
-        return Move (-1);
-    }
+    private bool MoveLeft () { return Move (-1); }
 
     private void MoveLeftExtend ()
     {
@@ -1487,10 +1488,7 @@ private void MoveLeftExtend ()
         }
     }
 
-    private bool MoveRight ()
-    {
-        return Move (1);
-    }
+    private bool MoveRight () { return Move (1); }
 
     private void MoveRightExtend ()
     {
@@ -1720,7 +1718,7 @@ private void RenderCaption ()
             return;
         }
 
-        var color = new Attribute (CaptionColor, GetNormalColor ().Background);
+        var color = new Attribute (CaptionColor, GetAttributeForRole (VisualRole.Editable).Background, GetAttributeForRole (VisualRole.Editable).Style);
         SetAttribute (color);
 
         Move (0, 0);
@@ -1765,7 +1763,6 @@ private void SetSelectedStartSelectedLength ()
 
     private void ShowContextMenu (bool keyboard)
     {
-
         if (!Equals (_currentCulture, Thread.CurrentThread.CurrentUICulture))
         {
             _currentCulture = Thread.CurrentThread.CurrentUICulture;
@@ -1778,7 +1775,7 @@ private void ShowContextMenu (bool keyboard)
 
         if (keyboard)
         {
-            ContextMenu?.MakeVisible(ViewportToScreen (new Point (_cursorPosition - ScrollOffset, 1)));
+            ContextMenu?.MakeVisible (ViewportToScreen (new Point (_cursorPosition - ScrollOffset, 1)));
         }
         else
         {
@@ -1788,7 +1785,7 @@ private void ShowContextMenu (bool keyboard)
 
     private void TextField_SuperViewChanged (object sender, SuperViewChangedEventArgs e)
     {
-        if (e.SuperView is {})
+        if (e.SuperView is { })
         {
             if (Autocomplete.HostControl is null)
             {
@@ -1830,12 +1827,22 @@ private void DisposeContextMenu ()
     }
 
     /// <inheritdoc />
+    public bool EnableForDesign ()
+    {
+        Text = "This is a test.";
+        Caption = "Caption";
+
+        return true;
+    }
+
+    /// <inheritdoc/>
     protected override void Dispose (bool disposing)
     {
         if (disposing)
         {
             DisposeContextMenu ();
         }
+
         base.Dispose (disposing);
     }
 }
diff --git a/Terminal.Gui/Views/TextInput/TextModel.cs b/Terminal.Gui/Views/TextInput/TextModel.cs
new file mode 100644
index 0000000000..5ba9323d6e
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/TextModel.cs
@@ -0,0 +1,1116 @@
+#nullable enable
+namespace Terminal.Gui;
+
+/// <summary>
+///     Represents the underlying data model for managing and manipulating multi-line text in a <see cref="TextView"/>.
+/// </summary>
+/// <remarks>
+///     The <see cref="TextModel"/> class provides functionality for storing, retrieving, and modifying lines of text,
+///     as well as supporting operations like word navigation, text search, and file loading. It is used internally
+///     by text input controls such as <see cref="TextView"/> to manage text content.
+/// </remarks>
+internal class TextModel
+{
+    private List<List<Cell>> _lines = new ();
+    private (Point startPointToFind, Point currentPointToFind, bool found) _toFind;
+
+    /// <summary>The number of text lines in the model</summary>
+    public int Count => _lines.Count;
+
+    public string? FilePath { get; set; }
+
+    /// <summary>Adds a line to the model at the specified position.</summary>
+    /// <param name="pos">Line number where the line will be inserted.</param>
+    /// <param name="cells">The line of text and color, as a List of Cell.</param>
+    public void AddLine (int pos, List<Cell> cells) { _lines.Insert (pos, cells); }
+
+    public bool CloseFile ()
+    {
+        if (FilePath is null)
+        {
+            throw new ArgumentNullException (nameof (FilePath));
+        }
+
+        FilePath = null;
+        _lines = new ();
+
+        return true;
+    }
+
+    public List<List<Cell>> GetAllLines () { return _lines; }
+
+    /// <summary>Returns the specified line as a List of Rune</summary>
+    /// <returns>The line.</returns>
+    /// <param name="line">Line number to retrieve.</param>
+    public List<Cell> GetLine (int line)
+    {
+        if (_lines.Count > 0)
+        {
+            if (line < Count)
+            {
+                return _lines [line];
+            }
+
+            return _lines [Count - 1];
+        }
+
+        _lines.Add (new ());
+
+        return _lines [0];
+    }
+
+    /// <summary>Returns the maximum line length of the visible lines.</summary>
+    /// <param name="first">The first line.</param>
+    /// <param name="last">The last line.</param>
+    /// <param name="tabWidth">The tab width.</param>
+    public int GetMaxVisibleLine (int first, int last, int tabWidth)
+    {
+        var maxLength = 0;
+        last = last < _lines.Count ? last : _lines.Count;
+
+        for (int i = first; i < last; i++)
+        {
+            List<Cell> line = GetLine (i);
+            int tabSum = line.Sum (c => c.Rune.Value == '\t' ? Math.Max (tabWidth - 1, 0) : 0);
+            int l = line.Count + tabSum;
+
+            if (l > maxLength)
+            {
+                maxLength = l;
+            }
+        }
+
+        return maxLength;
+    }
+
+    public event EventHandler? LinesLoaded;
+
+    public bool LoadFile (string file)
+    {
+        FilePath = file ?? throw new ArgumentNullException (nameof (file));
+
+        using (FileStream stream = File.OpenRead (file))
+        {
+            LoadStream (stream);
+
+            return true;
+        }
+    }
+
+    public void LoadListCells (List<List<Cell>> cellsList, Attribute? attribute)
+    {
+        _lines = cellsList;
+        SetAttributes (attribute);
+        OnLinesLoaded ();
+    }
+
+    public void LoadCells (List<Cell> cells, Attribute? attribute)
+    {
+        _lines = Cell.ToCells (cells);
+        SetAttributes (attribute);
+        OnLinesLoaded ();
+    }
+
+    public void LoadStream (Stream input)
+    {
+        if (input is null)
+        {
+            throw new ArgumentNullException (nameof (input));
+        }
+
+        _lines = new ();
+        var buff = new BufferedStream (input);
+        int v;
+        List<byte> line = new ();
+        var wasNewLine = false;
+
+        while ((v = buff.ReadByte ()) != -1)
+        {
+            if (v == 13)
+            {
+                continue;
+            }
+
+            if (v == 10)
+            {
+                Append (line);
+                line.Clear ();
+                wasNewLine = true;
+
+                continue;
+            }
+
+            line.Add ((byte)v);
+            wasNewLine = false;
+        }
+
+        if (line.Count > 0 || wasNewLine)
+        {
+            Append (line);
+        }
+
+        buff.Dispose ();
+
+        OnLinesLoaded ();
+    }
+
+    public void LoadString (string content)
+    {
+        _lines = Cell.StringToLinesOfCells (content);
+
+        OnLinesLoaded ();
+    }
+
+    /// <summary>Removes the line at the specified position</summary>
+    /// <param name="pos">Position.</param>
+    public void RemoveLine (int pos)
+    {
+        if (_lines.Count > 0)
+        {
+            if (_lines.Count == 1 && _lines [0].Count == 0)
+            {
+                return;
+            }
+
+            _lines.RemoveAt (pos);
+        }
+    }
+
+    public void ReplaceLine (int pos, List<Cell> runes)
+    {
+        if (_lines.Count > 0 && pos < _lines.Count)
+        {
+            _lines [pos] = [.. runes];
+        }
+        else if (_lines.Count == 0 || (_lines.Count > 0 && pos >= _lines.Count))
+        {
+            _lines.Add (runes);
+        }
+    }
+
+    public override string ToString ()
+    {
+        var sb = new StringBuilder ();
+
+        for (var i = 0; i < _lines.Count; i++)
+        {
+            sb.Append (Cell.ToString (_lines [i]));
+
+            if (i + 1 < _lines.Count)
+            {
+                sb.AppendLine ();
+            }
+        }
+
+        return sb.ToString ();
+    }
+
+    public (int col, int row)? WordBackward (int fromCol, int fromRow)
+    {
+        if (fromRow == 0 && fromCol == 0)
+        {
+            return null;
+        }
+
+        int col = Math.Max (fromCol - 1, 0);
+        int row = fromRow;
+
+        try
+        {
+            Cell? cell = RuneAt (col, row);
+            Rune rune;
+
+            if (cell is { })
+            {
+                rune = cell.Value.Rune;
+            }
+            else
+            {
+                if (col > 0)
+                {
+                    return (col, row);
+                }
+
+                if (col == 0 && row > 0)
+                {
+                    row--;
+                    List<Cell> line = GetLine (row);
+
+                    return (line.Count, row);
+                }
+
+                return null;
+            }
+
+            RuneType runeType = GetRuneType (rune);
+
+            int lastValidCol = IsSameRuneType (rune, runeType) && (Rune.IsLetterOrDigit (rune) || Rune.IsPunctuation (rune) || Rune.IsSymbol (rune))
+                                   ? col
+                                   : -1;
+
+            void ProcMovePrev (ref int nCol, ref int nRow, Rune nRune)
+            {
+                if (Rune.IsWhiteSpace (nRune))
+                {
+                    while (MovePrev (ref nCol, ref nRow, out nRune))
+                    {
+                        if (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune))
+                        {
+                            lastValidCol = nCol;
+
+                            if (runeType == RuneType.IsWhiteSpace || runeType == RuneType.IsUnknown)
+                            {
+                                runeType = GetRuneType (nRune);
+                            }
+
+                            break;
+                        }
+                    }
+
+                    if (nRow != fromRow && (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)))
+                    {
+                        if (lastValidCol > -1)
+                        {
+                            nCol = lastValidCol;
+                        }
+
+                        return;
+                    }
+
+                    while (MovePrev (ref nCol, ref nRow, out nRune))
+                    {
+                        if (!Rune.IsLetterOrDigit (nRune) && !Rune.IsPunctuation (nRune) && !Rune.IsSymbol (nRune))
+                        {
+                            break;
+                        }
+
+                        if (nRow != fromRow)
+                        {
+                            break;
+                        }
+
+                        lastValidCol =
+                            (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
+                                ? nCol
+                                : lastValidCol;
+                    }
+
+                    if (lastValidCol > -1)
+                    {
+                        nCol = lastValidCol;
+                        nRow = fromRow;
+                    }
+                }
+                else
+                {
+                    if (!MovePrev (ref nCol, ref nRow, out nRune))
+                    {
+                        return;
+                    }
+
+                    List<Cell> line = GetLine (nRow);
+
+                    if (nCol == 0
+                        && nRow == fromRow
+                        && (Rune.IsLetterOrDigit (line [0].Rune) || Rune.IsPunctuation (line [0].Rune) || Rune.IsSymbol (line [0].Rune)))
+                    {
+                        return;
+                    }
+
+                    lastValidCol =
+                        (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
+                            ? nCol
+                            : lastValidCol;
+
+                    if (lastValidCol > -1 && Rune.IsWhiteSpace (nRune))
+                    {
+                        nCol = lastValidCol;
+
+                        return;
+                    }
+
+                    if (fromRow != nRow)
+                    {
+                        nCol = line.Count;
+
+                        return;
+                    }
+
+                    ProcMovePrev (ref nCol, ref nRow, nRune);
+                }
+            }
+
+            ProcMovePrev (ref col, ref row, rune);
+
+            if (fromCol != col || fromRow != row)
+            {
+                return (col, row);
+            }
+
+            return null;
+        }
+        catch (Exception)
+        {
+            return null;
+        }
+    }
+
+    public (int col, int row)? WordForward (int fromCol, int fromRow)
+    {
+        if (fromRow == _lines.Count - 1 && fromCol == GetLine (_lines.Count - 1).Count)
+        {
+            return null;
+        }
+
+        int col = fromCol;
+        int row = fromRow;
+
+        try
+        {
+            Rune rune = RuneAt (col, row)!.Value.Rune;
+            RuneType runeType = GetRuneType (rune);
+
+            int lastValidCol = IsSameRuneType (rune, runeType) && (Rune.IsLetterOrDigit (rune) || Rune.IsPunctuation (rune) || Rune.IsSymbol (rune))
+                                   ? col
+                                   : -1;
+
+            void ProcMoveNext (ref int nCol, ref int nRow, Rune nRune)
+            {
+                if (Rune.IsWhiteSpace (nRune))
+                {
+                    while (MoveNext (ref nCol, ref nRow, out nRune))
+                    {
+                        if (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune))
+                        {
+                            lastValidCol = nCol;
+
+                            return;
+                        }
+                    }
+
+                    if (nRow != fromRow && (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)))
+                    {
+                        if (lastValidCol > -1)
+                        {
+                            nCol = lastValidCol;
+                        }
+
+                        return;
+                    }
+
+                    while (MoveNext (ref nCol, ref nRow, out nRune))
+                    {
+                        if (!Rune.IsLetterOrDigit (nRune) && !Rune.IsPunctuation (nRune) && !Rune.IsSymbol (nRune))
+                        {
+                            break;
+                        }
+
+                        if (nRow != fromRow)
+                        {
+                            break;
+                        }
+
+                        lastValidCol =
+                            (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
+                                ? nCol
+                                : lastValidCol;
+                    }
+
+                    if (lastValidCol > -1)
+                    {
+                        nCol = lastValidCol;
+                        nRow = fromRow;
+                    }
+                }
+                else
+                {
+                    if (!MoveNext (ref nCol, ref nRow, out nRune))
+                    {
+                        return;
+                    }
+
+                    if (!IsSameRuneType (nRune, runeType) && !Rune.IsWhiteSpace (nRune))
+                    {
+                        return;
+                    }
+
+                    List<Cell> line = GetLine (nRow);
+
+                    if (nCol == line.Count
+                        && nRow == fromRow
+                        && (Rune.IsLetterOrDigit (line [0].Rune) || Rune.IsPunctuation (line [0].Rune) || Rune.IsSymbol (line [0].Rune)))
+                    {
+                        return;
+                    }
+
+                    lastValidCol =
+                        (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
+                            ? nCol
+                            : lastValidCol;
+
+                    if (fromRow != nRow)
+                    {
+                        nCol = 0;
+
+                        return;
+                    }
+
+                    ProcMoveNext (ref nCol, ref nRow, nRune);
+                }
+            }
+
+            ProcMoveNext (ref col, ref row, rune);
+
+            if (fromCol != col || fromRow != row)
+            {
+                return (col, row);
+            }
+
+            return null;
+        }
+        catch (Exception)
+        {
+            return null;
+        }
+    }
+
+    internal static int CalculateLeftColumn (List<Cell> t, int start, int end, int width, int tabWidth = 0)
+    {
+        List<Rune> runes = new ();
+
+        foreach (Cell cell in t)
+        {
+            runes.Add (cell.Rune);
+        }
+
+        return CalculateLeftColumn (runes, start, end, width, tabWidth);
+    }
+
+    // Returns the left column in a range of the string.
+    internal static int CalculateLeftColumn (List<Rune> t, int start, int end, int width, int tabWidth = 0)
+    {
+        if (t is null || t.Count == 0)
+        {
+            return 0;
+        }
+
+        var size = 0;
+        int tcount = end > t.Count - 1 ? t.Count - 1 : end;
+        var col = 0;
+
+        for (int i = tcount; i >= 0; i--)
+        {
+            Rune rune = t [i];
+            size += rune.GetColumns ();
+
+            if (rune.Value == '\t')
+            {
+                size += tabWidth + 1;
+            }
+
+            if (size > width)
+            {
+                if (col + width == end)
+                {
+                    col++;
+                }
+
+                break;
+            }
+
+            if ((end < t.Count && col > 0 && start < end && col == start) || end - col == width - 1)
+            {
+                break;
+            }
+
+            col = i;
+        }
+
+        return col;
+    }
+
+    internal static (int size, int length) DisplaySize (
+        List<Cell> t,
+        int start = -1,
+        int end = -1,
+        bool checkNextRune = true,
+        int tabWidth = 0
+    )
+    {
+        List<Rune> runes = new ();
+
+        foreach (Cell cell in t)
+        {
+            runes.Add (cell.Rune);
+        }
+
+        return DisplaySize (runes, start, end, checkNextRune, tabWidth);
+    }
+
+    // Returns the size and length in a range of the string.
+    internal static (int size, int length) DisplaySize (
+        List<Rune> t,
+        int start = -1,
+        int end = -1,
+        bool checkNextRune = true,
+        int tabWidth = 0
+    )
+    {
+        if (t is null || t.Count == 0)
+        {
+            return (0, 0);
+        }
+
+        var size = 0;
+        var len = 0;
+
+        int tcount = end == -1 ? t.Count :
+                     end > t.Count ? t.Count : end;
+        int i = start == -1 ? 0 : start;
+
+        for (; i < tcount; i++)
+        {
+            Rune rune = t [i];
+            size += rune.GetColumns ();
+            len += rune.GetEncodingLength (Encoding.Unicode);
+
+            if (rune.Value == '\t')
+            {
+                size += tabWidth + 1;
+                len += tabWidth - 1;
+            }
+
+            if (checkNextRune && i == tcount - 1 && t.Count > tcount && IsWideRune (t [i + 1], tabWidth, out int s, out int l))
+            {
+                size += s;
+                len += l;
+            }
+        }
+
+        bool IsWideRune (Rune r, int tWidth, out int s, out int l)
+        {
+            s = r.GetColumns ();
+            l = r.GetEncodingLength ();
+
+            if (r.Value == '\t')
+            {
+                s += tWidth + 1;
+                l += tWidth - 1;
+            }
+
+            return s > 1;
+        }
+
+        return (size, len);
+    }
+
+    internal Size GetDisplaySize ()
+    {
+        var size = Size.Empty;
+
+        return size;
+    }
+
+    internal (Point current, bool found) FindNextText (
+        string text,
+        out bool gaveFullTurn,
+        bool matchCase = false,
+        bool matchWholeWord = false
+    )
+    {
+        if (text is null || _lines.Count == 0)
+        {
+            gaveFullTurn = false;
+
+            return (Point.Empty, false);
+        }
+
+        if (_toFind.found)
+        {
+            _toFind.currentPointToFind.X++;
+        }
+
+        (Point current, bool found) foundPos = GetFoundNextTextPoint (
+                                                                      text,
+                                                                      _lines.Count,
+                                                                      matchCase,
+                                                                      matchWholeWord,
+                                                                      _toFind.currentPointToFind
+                                                                     );
+
+        if (!foundPos.found && _toFind.currentPointToFind != _toFind.startPointToFind)
+        {
+            foundPos = GetFoundNextTextPoint (
+                                              text,
+                                              _toFind.startPointToFind.Y + 1,
+                                              matchCase,
+                                              matchWholeWord,
+                                              Point.Empty
+                                             );
+        }
+
+        gaveFullTurn = ApplyToFind (foundPos);
+
+        return foundPos;
+    }
+
+    internal (Point current, bool found) FindPreviousText (
+        string text,
+        out bool gaveFullTurn,
+        bool matchCase = false,
+        bool matchWholeWord = false
+    )
+    {
+        if (text is null || _lines.Count == 0)
+        {
+            gaveFullTurn = false;
+
+            return (Point.Empty, false);
+        }
+
+        if (_toFind.found)
+        {
+            _toFind.currentPointToFind.X++;
+        }
+
+        int linesCount = _toFind.currentPointToFind.IsEmpty ? _lines.Count - 1 : _toFind.currentPointToFind.Y;
+
+        (Point current, bool found) foundPos = GetFoundPreviousTextPoint (
+                                                                          text,
+                                                                          linesCount,
+                                                                          matchCase,
+                                                                          matchWholeWord,
+                                                                          _toFind.currentPointToFind
+                                                                         );
+
+        if (!foundPos.found && _toFind.currentPointToFind != _toFind.startPointToFind)
+        {
+            foundPos = GetFoundPreviousTextPoint (
+                                                  text,
+                                                  _lines.Count - 1,
+                                                  matchCase,
+                                                  matchWholeWord,
+                                                  new (_lines [_lines.Count - 1].Count, _lines.Count)
+                                                 );
+        }
+
+        gaveFullTurn = ApplyToFind (foundPos);
+
+        return foundPos;
+    }
+
+    internal static int GetColFromX (List<Cell> t, int start, int x, int tabWidth = 0)
+    {
+        List<Rune> runes = new ();
+
+        foreach (Cell cell in t)
+        {
+            runes.Add (cell.Rune);
+        }
+
+        return GetColFromX (runes, start, x, tabWidth);
+    }
+
+    internal static int GetColFromX (List<Rune> t, int start, int x, int tabWidth = 0)
+    {
+        if (x < 0)
+        {
+            return x;
+        }
+
+        int size = start;
+        int pX = x + start;
+
+        for (int i = start; i < t.Count; i++)
+        {
+            Rune r = t [i];
+            size += r.GetColumns ();
+
+            if (r.Value == '\t')
+            {
+                size += tabWidth + 1;
+            }
+
+            if (i == pX || size > pX)
+            {
+                return i - start;
+            }
+        }
+
+        return t.Count - start;
+    }
+
+    internal (Point current, bool found) ReplaceAllText (
+        string text,
+        bool matchCase = false,
+        bool matchWholeWord = false,
+        string? textToReplace = null
+    )
+    {
+        var found = false;
+        var pos = Point.Empty;
+
+        for (var i = 0; i < _lines.Count; i++)
+        {
+            List<Cell> x = _lines [i];
+            string txt = GetText (x);
+            string matchText = !matchCase ? text.ToUpper () : text;
+            int col = txt.IndexOf (matchText);
+
+            while (col > -1)
+            {
+                if (matchWholeWord && !MatchWholeWord (txt, matchText, col))
+                {
+                    if (col + 1 > txt.Length)
+                    {
+                        break;
+                    }
+
+                    col = txt.IndexOf (matchText, col + 1);
+
+                    continue;
+                }
+
+                if (col > -1)
+                {
+                    if (!found)
+                    {
+                        found = true;
+                    }
+
+                    _lines [i] = Cell.ToCellList (ReplaceText (x, textToReplace!, matchText, col));
+                    x = _lines [i];
+                    txt = GetText (x);
+                    pos = new (col, i);
+                    col += textToReplace!.Length - matchText.Length;
+                }
+
+                if (col < 0 || col + 1 > txt.Length)
+                {
+                    break;
+                }
+
+                col = txt.IndexOf (matchText, col + 1);
+            }
+        }
+
+        string GetText (List<Cell> x)
+        {
+            var txt = Cell.ToString (x);
+
+            if (!matchCase)
+            {
+                txt = txt.ToUpper ();
+            }
+
+            return txt;
+        }
+
+        return (pos, found);
+    }
+
+    /// <summary>Redefine column and line tracking.</summary>
+    /// <param name="point">Contains the column and line.</param>
+    internal void ResetContinuousFind (Point point)
+    {
+        _toFind.startPointToFind = _toFind.currentPointToFind = point;
+        _toFind.found = false;
+    }
+
+    internal static bool SetCol (ref int col, int width, int cols)
+    {
+        if (col + cols <= width)
+        {
+            col += cols;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private void Append (List<byte> line)
+    {
+        var str = StringExtensions.ToString (line.ToArray ());
+        _lines.Add (Cell.StringToCells (str));
+    }
+
+    private bool ApplyToFind ((Point current, bool found) foundPos)
+    {
+        var gaveFullTurn = false;
+
+        if (foundPos.found)
+        {
+            _toFind.currentPointToFind = foundPos.current;
+
+            if (_toFind.found && _toFind.currentPointToFind == _toFind.startPointToFind)
+            {
+                gaveFullTurn = true;
+            }
+
+            if (!_toFind.found)
+            {
+                _toFind.startPointToFind = _toFind.currentPointToFind = foundPos.current;
+                _toFind.found = foundPos.found;
+            }
+        }
+
+        return gaveFullTurn;
+    }
+
+    private (Point current, bool found) GetFoundNextTextPoint (
+        string text,
+        int linesCount,
+        bool matchCase,
+        bool matchWholeWord,
+        Point start
+    )
+    {
+        for (int i = start.Y; i < linesCount; i++)
+        {
+            List<Cell> x = _lines [i];
+            var txt = Cell.ToString (x);
+
+            if (!matchCase)
+            {
+                txt = txt.ToUpper ();
+            }
+
+            string matchText = !matchCase ? text.ToUpper () : text;
+            int col = txt.IndexOf (matchText, Math.Min (start.X, txt.Length));
+
+            if (col > -1 && matchWholeWord && !MatchWholeWord (txt, matchText, col))
+            {
+                continue;
+            }
+
+            if (col > -1 && ((i == start.Y && col >= start.X) || i > start.Y) && txt.Contains (matchText))
+            {
+                return (new (col, i), true);
+            }
+
+            if (col == -1 && start.X > 0)
+            {
+                start.X = 0;
+            }
+        }
+
+        return (Point.Empty, false);
+    }
+
+    private (Point current, bool found) GetFoundPreviousTextPoint (
+        string text,
+        int linesCount,
+        bool matchCase,
+        bool matchWholeWord,
+        Point start
+    )
+    {
+        for (int i = linesCount; i >= 0; i--)
+        {
+            List<Cell> x = _lines [i];
+            var txt = Cell.ToString (x);
+
+            if (!matchCase)
+            {
+                txt = txt.ToUpper ();
+            }
+
+            if (start.Y != i)
+            {
+                start.X = Math.Max (x.Count - 1, 0);
+            }
+
+            string matchText = !matchCase ? text.ToUpper () : text;
+            int col = txt.LastIndexOf (matchText, _toFind.found ? start.X - 1 : start.X);
+
+            if (col > -1 && matchWholeWord && !MatchWholeWord (txt, matchText, col))
+            {
+                continue;
+            }
+
+            if (col > -1 && ((i <= linesCount && col <= start.X) || i < start.Y) && txt.Contains (matchText))
+            {
+                return (new (col, i), true);
+            }
+        }
+
+        return (Point.Empty, false);
+    }
+
+    private RuneType GetRuneType (Rune rune)
+    {
+        if (Rune.IsSymbol (rune))
+        {
+            return RuneType.IsSymbol;
+        }
+
+        if (Rune.IsWhiteSpace (rune))
+        {
+            return RuneType.IsWhiteSpace;
+        }
+
+        if (Rune.IsLetterOrDigit (rune))
+        {
+            return RuneType.IsLetterOrDigit;
+        }
+
+        if (Rune.IsPunctuation (rune))
+        {
+            return RuneType.IsPunctuation;
+        }
+
+        return RuneType.IsUnknown;
+    }
+
+    private bool IsSameRuneType (Rune newRune, RuneType runeType)
+    {
+        RuneType rt = GetRuneType (newRune);
+
+        return rt == runeType;
+    }
+
+    private bool MatchWholeWord (string source, string matchText, int index = 0)
+    {
+        if (string.IsNullOrEmpty (source) || string.IsNullOrEmpty (matchText))
+        {
+            return false;
+        }
+
+        string txt = matchText.Trim ();
+        int start = index > 0 ? index - 1 : 0;
+        int end = index + txt.Length;
+
+        if ((start == 0 || Rune.IsWhiteSpace ((Rune)source [start])) && (end == source.Length || Rune.IsWhiteSpace ((Rune)source [end])))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool MoveNext (ref int col, ref int row, out Rune rune)
+    {
+        List<Cell> line = GetLine (row);
+
+        if (col + 1 < line.Count)
+        {
+            col++;
+            rune = line [col].Rune;
+
+            if (col + 1 == line.Count && !Rune.IsLetterOrDigit (rune) && !Rune.IsWhiteSpace (line [col - 1].Rune))
+            {
+                col++;
+            }
+
+            return true;
+        }
+
+        if (col + 1 == line.Count)
+        {
+            col++;
+        }
+
+        while (row + 1 < Count)
+        {
+            col = 0;
+            row++;
+            line = GetLine (row);
+
+            if (line.Count > 0)
+            {
+                rune = line [0].Rune;
+
+                return true;
+            }
+        }
+
+        rune = default (Rune);
+
+        return false;
+    }
+
+    private bool MovePrev (ref int col, ref int row, out Rune rune)
+    {
+        List<Cell> line = GetLine (row);
+
+        if (col > 0)
+        {
+            col--;
+            rune = line [col].Rune;
+
+            return true;
+        }
+
+        if (row == 0)
+        {
+            rune = default (Rune);
+
+            return false;
+        }
+
+        while (row > 0)
+        {
+            row--;
+            line = GetLine (row);
+            col = line.Count - 1;
+
+            if (col >= 0)
+            {
+                rune = line [col].Rune;
+
+                return true;
+            }
+        }
+
+        rune = default (Rune);
+
+        return false;
+    }
+
+    private void OnLinesLoaded () { LinesLoaded?.Invoke (this, EventArgs.Empty); }
+
+    private string ReplaceText (List<Cell> source, string textToReplace, string matchText, int col)
+    {
+        var origTxt = Cell.ToString (source);
+        (_, int len) = DisplaySize (source, 0, col, false);
+        (_, int len2) = DisplaySize (source, col, col + matchText.Length, false);
+        (_, int len3) = DisplaySize (source, col + matchText.Length, origTxt.GetRuneCount (), false);
+
+        return origTxt [..len] + textToReplace + origTxt.Substring (len + len2, len3);
+    }
+
+    private Cell? RuneAt (int col, int row)
+    {
+        List<Cell> line = GetLine (row);
+
+        if (line.Count > 0)
+        {
+            return line [col > line.Count - 1 ? line.Count - 1 : col];
+        }
+
+        return null;
+    }
+
+    private void SetAttributes (Attribute? attribute)
+    {
+        foreach (List<Cell> line in _lines)
+        {
+            for (var i = 0; i < line.Count; i++)
+            {
+                Cell cell = line [i];
+                cell.Attribute ??= attribute;
+                line [i] = cell;
+            }
+        }
+    }
+
+    private enum RuneType
+    {
+        IsSymbol,
+        IsWhiteSpace,
+        IsLetterOrDigit,
+        IsPunctuation,
+        IsUnknown
+    }
+}
diff --git a/Terminal.Gui/Views/TextInput/TextRegexProvider.cs b/Terminal.Gui/Views/TextInput/TextRegexProvider.cs
new file mode 100644
index 0000000000..42b9da4318
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/TextRegexProvider.cs
@@ -0,0 +1,151 @@
+#nullable enable
+using System.Text.RegularExpressions;
+
+namespace Terminal.Gui;
+
+/// <summary>Regex Provider for TextValidateField.</summary>
+public class TextRegexProvider : ITextValidateProvider
+{
+    private List<Rune> _pattern = null!;
+    private Regex _regex = null!;
+    private List<Rune> _text = null!;
+
+    /// <summary>Empty Constructor.</summary>
+    public TextRegexProvider (string pattern) { Pattern = pattern; }
+
+    /// <summary>Regex pattern property.</summary>
+    public string Pattern
+    {
+        get => StringExtensions.ToString (_pattern);
+        set
+        {
+            _pattern = value.ToRuneList ();
+            CompileMask ();
+            SetupText ();
+        }
+    }
+
+    /// <summary>When true, validates with the regex pattern on each input, preventing the input if it's not valid.</summary>
+    public bool ValidateOnInput { get; set; } = true;
+
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<string>> TextChanged = null!;
+
+    /// <inheritdoc/>
+    public string Text
+    {
+        get => StringExtensions.ToString (_text);
+        set
+        {
+            _text = (value != string.Empty ? value.ToRuneList () : null)!;
+            SetupText ();
+        }
+    }
+
+    /// <inheritdoc/>
+    public string DisplayText => Text;
+
+    /// <inheritdoc/>
+    public bool IsValid => Validate (_text);
+
+    /// <inheritdoc/>
+    public bool Fixed => false;
+
+    /// <inheritdoc/>
+    public int Cursor (int pos)
+    {
+        if (pos < 0)
+        {
+            return CursorStart ();
+        }
+
+        if (pos >= _text.Count)
+        {
+            return CursorEnd ();
+        }
+
+        return pos;
+    }
+
+    /// <inheritdoc/>
+    public int CursorStart () { return 0; }
+
+    /// <inheritdoc/>
+    public int CursorEnd () { return _text.Count; }
+
+    /// <inheritdoc/>
+    public int CursorLeft (int pos)
+    {
+        if (pos > 0)
+        {
+            return pos - 1;
+        }
+
+        return pos;
+    }
+
+    /// <inheritdoc/>
+    public int CursorRight (int pos)
+    {
+        if (pos < _text.Count)
+        {
+            return pos + 1;
+        }
+
+        return pos;
+    }
+
+    /// <inheritdoc/>
+    public bool Delete (int pos)
+    {
+        if (_text.Count > 0 && pos < _text.Count)
+        {
+            string oldValue = Text;
+            _text.RemoveAt (pos);
+            OnTextChanged (new (in oldValue));
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public bool InsertAt (char ch, int pos)
+    {
+        List<Rune> aux = _text.ToList ();
+        aux.Insert (pos, (Rune)ch);
+
+        if (Validate (aux) || ValidateOnInput == false)
+        {
+            string oldValue = Text;
+            _text.Insert (pos, (Rune)ch);
+            OnTextChanged (new (in oldValue));
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public void OnTextChanged (EventArgs<string> args) { TextChanged?.Invoke (this, args); }
+
+    /// <summary>Compiles the regex pattern for validation./></summary>
+    private void CompileMask () { _regex = new (StringExtensions.ToString (_pattern), RegexOptions.Compiled); }
+
+    private void SetupText ()
+    {
+        if (_text is { } && IsValid)
+        {
+            return;
+        }
+
+        _text = new ();
+    }
+
+    private bool Validate (List<Rune> text)
+    {
+        Match match = _regex.Match (StringExtensions.ToString (text));
+
+        return match.Success;
+    }
+}
diff --git a/Terminal.Gui/Views/TextInput/TextValidateField.cs b/Terminal.Gui/Views/TextInput/TextValidateField.cs
new file mode 100644
index 0000000000..c10dbf4972
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/TextValidateField.cs
@@ -0,0 +1,369 @@
+#nullable enable
+
+namespace Terminal.Gui;
+
+/// <summary>Text field that validates input through a  <see cref="ITextValidateProvider"/></summary>
+public class TextValidateField : View
+{
+    private const int DEFAULT_LENGTH = 10;
+    private int _cursorPosition;
+    private ITextValidateProvider? _provider;
+
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="TextValidateField"/> class.
+    /// </summary>
+    public TextValidateField ()
+    {
+        Height = Dim.Auto (minimumContentDim: 1);
+        CanFocus = true;
+
+        // Things this view knows how to do
+        AddCommand (
+                    Command.LeftStart,
+                    () =>
+                    {
+                        HomeKeyHandler ();
+
+                        return true;
+                    }
+                   );
+
+        AddCommand (
+                    Command.RightEnd,
+                    () =>
+                    {
+                        EndKeyHandler ();
+
+                        return true;
+                    }
+                   );
+
+        AddCommand (
+                    Command.DeleteCharRight,
+                    () =>
+                    {
+                        DeleteKeyHandler ();
+
+                        return true;
+                    }
+                   );
+
+        AddCommand (
+                    Command.DeleteCharLeft,
+                    () =>
+                    {
+                        BackspaceKeyHandler ();
+
+                        return true;
+                    }
+                   );
+
+        AddCommand (
+                    Command.Left,
+                    () =>
+                    {
+                        CursorLeft ();
+
+                        return true;
+                    }
+                   );
+
+        AddCommand (
+                    Command.Right,
+                    () =>
+                    {
+                        CursorRight ();
+
+                        return true;
+                    }
+                   );
+
+        // Default keybindings for this view
+        KeyBindings.Add (Key.Home, Command.LeftStart);
+        KeyBindings.Add (Key.End, Command.RightEnd);
+
+        KeyBindings.Add (Key.Delete, Command.DeleteCharRight);
+
+        KeyBindings.Add (Key.Backspace, Command.DeleteCharLeft);
+        KeyBindings.Add (Key.CursorLeft, Command.Left);
+        KeyBindings.Add (Key.CursorRight, Command.Right);
+    }
+
+    /// <summary>This property returns true if the input is valid.</summary>
+    public virtual bool IsValid
+    {
+        get
+        {
+            if (_provider is null)
+            {
+                return false;
+            }
+
+            return _provider.IsValid;
+        }
+    }
+
+    /// <summary>Provider</summary>
+    public ITextValidateProvider? Provider
+    {
+        get => _provider;
+        set
+        {
+            _provider = value;
+
+            if (_provider!.Fixed)
+            {
+                Width = _provider.DisplayText == string.Empty
+                            ? DEFAULT_LENGTH
+                            : _provider.DisplayText.Length;
+            }
+
+            // HomeKeyHandler already call SetNeedsDisplay
+            HomeKeyHandler ();
+        }
+    }
+
+    /// <summary>Text</summary>
+    public new string Text
+    {
+        get
+        {
+            if (_provider is null)
+            {
+                return string.Empty;
+            }
+
+            return _provider.Text;
+        }
+        set
+        {
+            if (_provider is null)
+            {
+                return;
+            }
+
+            _provider.Text = value;
+
+            SetNeedsDraw ();
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
+    {
+        if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed))
+        {
+            int c = _provider!.Cursor (mouseEvent.Position.X - GetMargins (Viewport.Width).left);
+
+            if (_provider.Fixed == false && TextAlignment == Alignment.End && Text.Length > 0)
+            {
+                c++;
+            }
+
+            _cursorPosition = c;
+            SetFocus ();
+            SetNeedsDraw ();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    protected override bool OnDrawingContent ()
+    {
+        if (_provider is null)
+        {
+            Move (0, 0);
+            Driver?.AddStr ("Error: ITextValidateProvider not set!");
+
+            return true;
+        }
+
+        VisualRole role = HasFocus ? VisualRole.Focus : VisualRole.Editable;
+        Attribute textColor = IsValid ? GetAttributeForRole (role) : SchemeManager.GetScheme (Schemes.Error).GetAttributeForRole (role);
+
+        (int marginLeft, int marginRight) = GetMargins (Viewport.Width);
+
+        Move (0, 0);
+
+        // Left Margin
+        SetAttribute (textColor);
+
+        for (var i = 0; i < marginLeft; i++)
+        {
+            Driver?.AddRune ((Rune)' ');
+        }
+
+        // Content
+        SetAttribute (textColor);
+
+        // Content
+        for (var i = 0; i < _provider.DisplayText.Length; i++)
+        {
+            Driver?.AddRune ((Rune)_provider.DisplayText [i]);
+        }
+
+        // Right Margin
+        SetAttribute (textColor);
+
+        for (var i = 0; i < marginRight; i++)
+        {
+            Driver?.AddRune ((Rune)' ');
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc/>
+    protected override bool OnKeyDownNotHandled (Key key)
+    {
+        if (_provider is null)
+        {
+            return false;
+        }
+
+        if (key.AsRune == default (Rune) || key == Application.QuitKey)
+        {
+            return false;
+        }
+
+        Rune rune = key.AsRune;
+
+        bool inserted = _provider.InsertAt ((char)rune.Value, _cursorPosition);
+
+        if (inserted)
+        {
+            CursorRight ();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override Point? PositionCursor ()
+    {
+        (int left, _) = GetMargins (Viewport.Width);
+
+        // Fixed = true, is for inputs that have fixed width, like masked ones.
+        // Fixed = false, is for normal input.
+        // When it's right-aligned and it's a normal input, the cursor behaves differently.
+        int curPos;
+
+        if (_provider?.Fixed == false && TextAlignment == Alignment.End)
+        {
+            curPos = _cursorPosition + left - 1;
+        }
+        else
+        {
+            curPos = _cursorPosition + left;
+        }
+
+        Move (curPos, 0);
+
+        return new (curPos, 0);
+    }
+
+    /// <summary>Delete char at cursor position - 1, moving the cursor.</summary>
+    /// <returns></returns>
+    private bool BackspaceKeyHandler ()
+    {
+        if (_provider!.Fixed == false && TextAlignment == Alignment.End && _cursorPosition <= 1)
+        {
+            return false;
+        }
+
+        _cursorPosition = _provider.CursorLeft (_cursorPosition);
+        _provider.Delete (_cursorPosition);
+        SetNeedsDraw ();
+
+        return true;
+    }
+
+    /// <summary>Try to move the cursor to the left.</summary>
+    /// <returns>True if moved.</returns>
+    private bool CursorLeft ()
+    {
+        if (_provider is null)
+        {
+            return false;
+        }
+
+        int current = _cursorPosition;
+        _cursorPosition = _provider.CursorLeft (_cursorPosition);
+        SetNeedsDraw ();
+
+        return current != _cursorPosition;
+    }
+
+    /// <summary>Try to move the cursor to the right.</summary>
+    /// <returns>True if moved.</returns>
+    private bool CursorRight ()
+    {
+        if (_provider is null)
+        {
+            return false;
+        }
+
+        int current = _cursorPosition;
+        _cursorPosition = _provider.CursorRight (_cursorPosition);
+        SetNeedsDraw ();
+
+        return current != _cursorPosition;
+    }
+
+    /// <summary>Deletes char at current position.</summary>
+    /// <returns></returns>
+    private bool DeleteKeyHandler ()
+    {
+        if (_provider!.Fixed == false && TextAlignment == Alignment.End)
+        {
+            _cursorPosition = _provider.CursorLeft (_cursorPosition);
+        }
+
+        _provider.Delete (_cursorPosition);
+        SetNeedsDraw ();
+
+        return true;
+    }
+
+    /// <summary>Moves the cursor to the last char.</summary>
+    /// <returns></returns>
+    private bool EndKeyHandler ()
+    {
+        _cursorPosition = _provider!.CursorEnd ();
+        SetNeedsDraw ();
+
+        return true;
+    }
+
+    /// <summary>Margins for text alignment.</summary>
+    /// <param name="width">Total width</param>
+    /// <returns>Left and right margins</returns>
+    private (int left, int right) GetMargins (int width)
+    {
+        int count = Text.Length;
+        int total = width - count;
+
+        return TextAlignment switch
+               {
+                   Alignment.Start => (0, total),
+                   Alignment.Center => (total / 2, total / 2 + total % 2),
+                   Alignment.End => (total, 0),
+                   _ => (0, total)
+               };
+    }
+
+    /// <summary>Moves the cursor to first char.</summary>
+    /// <returns></returns>
+    private bool HomeKeyHandler ()
+    {
+        _cursorPosition = _provider!.CursorStart ();
+        SetNeedsDraw ();
+
+        return true;
+    }
+}
diff --git a/Terminal.Gui/Views/TextView.cs b/Terminal.Gui/Views/TextInput/TextView.cs
similarity index 69%
rename from Terminal.Gui/Views/TextView.cs
rename to Terminal.Gui/Views/TextInput/TextView.cs
index c3c768ad61..9fadc84add 100644
--- a/Terminal.Gui/Views/TextView.cs
+++ b/Terminal.Gui/Views/TextInput/TextView.cs
@@ -7,1782 +7,10 @@
 
 namespace Terminal.Gui;
 
-internal class TextModel
-{
-    private List<List<Cell>> _lines = new ();
-    private (Point startPointToFind, Point currentPointToFind, bool found) _toFind;
-
-    /// <summary>The number of text lines in the model</summary>
-    public int Count => _lines.Count;
-
-    public string? FilePath { get; set; }
-
-    /// <summary>Adds a line to the model at the specified position.</summary>
-    /// <param name="pos">Line number where the line will be inserted.</param>
-    /// <param name="cells">The line of text and color, as a List of Cell.</param>
-    public void AddLine (int pos, List<Cell> cells) { _lines.Insert (pos, cells); }
-
-    public bool CloseFile ()
-    {
-        if (FilePath is null)
-        {
-            throw new ArgumentNullException (nameof (FilePath));
-        }
-
-        FilePath = null;
-        _lines = new ();
-
-        return true;
-    }
-
-    public List<List<Cell>> GetAllLines () { return _lines; }
-
-    /// <summary>Returns the specified line as a List of Rune</summary>
-    /// <returns>The line.</returns>
-    /// <param name="line">Line number to retrieve.</param>
-    public List<Cell> GetLine (int line)
-    {
-        if (_lines.Count > 0)
-        {
-            if (line < Count)
-            {
-                return _lines [line];
-            }
-
-            return _lines [Count - 1];
-        }
-
-        _lines.Add (new ());
-
-        return _lines [0];
-    }
-
-    /// <summary>Returns the maximum line length of the visible lines.</summary>
-    /// <param name="first">The first line.</param>
-    /// <param name="last">The last line.</param>
-    /// <param name="tabWidth">The tab width.</param>
-    public int GetMaxVisibleLine (int first, int last, int tabWidth)
-    {
-        var maxLength = 0;
-        last = last < _lines.Count ? last : _lines.Count;
-
-        for (int i = first; i < last; i++)
-        {
-            List<Cell> line = GetLine (i);
-            int tabSum = line.Sum (c => c.Rune.Value == '\t' ? Math.Max (tabWidth - 1, 0) : 0);
-            int l = line.Count + tabSum;
-
-            if (l > maxLength)
-            {
-                maxLength = l;
-            }
-        }
-
-        return maxLength;
-    }
-
-    public event EventHandler? LinesLoaded;
-
-    public bool LoadFile (string file)
-    {
-        FilePath = file ?? throw new ArgumentNullException (nameof (file));
-
-        using (FileStream stream = File.OpenRead (file))
-        {
-            LoadStream (stream);
-
-            return true;
-        }
-    }
-
-    public void LoadListCells (List<List<Cell>> cellsList, Attribute? attribute)
-    {
-        _lines = cellsList;
-        SetAttributes (attribute);
-        OnLinesLoaded ();
-    }
-
-    public void LoadCells (List<Cell> cells, Attribute? attribute)
-    {
-        _lines = Cell.ToCells (cells);
-        SetAttributes (attribute);
-        OnLinesLoaded ();
-    }
-
-    public void LoadStream (Stream input)
-    {
-        if (input is null)
-        {
-            throw new ArgumentNullException (nameof (input));
-        }
-
-        _lines = new ();
-        var buff = new BufferedStream (input);
-        int v;
-        List<byte> line = new ();
-        var wasNewLine = false;
-
-        while ((v = buff.ReadByte ()) != -1)
-        {
-            if (v == 13)
-            {
-                continue;
-            }
-
-            if (v == 10)
-            {
-                Append (line);
-                line.Clear ();
-                wasNewLine = true;
-
-                continue;
-            }
-
-            line.Add ((byte)v);
-            wasNewLine = false;
-        }
-
-        if (line.Count > 0 || wasNewLine)
-        {
-            Append (line);
-        }
-
-        buff.Dispose ();
-
-        OnLinesLoaded ();
-    }
-
-    public void LoadString (string content)
-    {
-        _lines = Cell.StringToLinesOfCells (content);
-
-        OnLinesLoaded ();
-    }
-
-    /// <summary>Removes the line at the specified position</summary>
-    /// <param name="pos">Position.</param>
-    public void RemoveLine (int pos)
-    {
-        if (_lines.Count > 0)
-        {
-            if (_lines.Count == 1 && _lines [0].Count == 0)
-            {
-                return;
-            }
-
-            _lines.RemoveAt (pos);
-        }
-    }
-
-    public void ReplaceLine (int pos, List<Cell> runes)
-    {
-        if (_lines.Count > 0 && pos < _lines.Count)
-        {
-            _lines [pos] = [.. runes];
-        }
-        else if (_lines.Count == 0 || (_lines.Count > 0 && pos >= _lines.Count))
-        {
-            _lines.Add (runes);
-        }
-    }
-
-    public override string ToString ()
-    {
-        var sb = new StringBuilder ();
-
-        for (var i = 0; i < _lines.Count; i++)
-        {
-            sb.Append (Cell.ToString (_lines [i]));
-
-            if (i + 1 < _lines.Count)
-            {
-                sb.AppendLine ();
-            }
-        }
-
-        return sb.ToString ();
-    }
-
-    public (int col, int row)? WordBackward (int fromCol, int fromRow)
-    {
-        if (fromRow == 0 && fromCol == 0)
-        {
-            return null;
-        }
-
-        int col = Math.Max (fromCol - 1, 0);
-        int row = fromRow;
-
-        try
-        {
-            Cell? cell = RuneAt (col, row);
-            Rune rune;
-
-            if (cell is { })
-            {
-                rune = cell.Value.Rune;
-            }
-            else
-            {
-                if (col > 0)
-                {
-                    return (col, row);
-                }
-
-                if (col == 0 && row > 0)
-                {
-                    row--;
-                    List<Cell> line = GetLine (row);
-
-                    return (line.Count, row);
-                }
-
-                return null;
-            }
-
-            RuneType runeType = GetRuneType (rune);
-
-            int lastValidCol = IsSameRuneType (rune, runeType) && (Rune.IsLetterOrDigit (rune) || Rune.IsPunctuation (rune) || Rune.IsSymbol (rune))
-                                   ? col
-                                   : -1;
-
-            void ProcMovePrev (ref int nCol, ref int nRow, Rune nRune)
-            {
-                if (Rune.IsWhiteSpace (nRune))
-                {
-                    while (MovePrev (ref nCol, ref nRow, out nRune))
-                    {
-                        if (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune))
-                        {
-                            lastValidCol = nCol;
-
-                            if (runeType == RuneType.IsWhiteSpace || runeType == RuneType.IsUnknown)
-                            {
-                                runeType = GetRuneType (nRune);
-                            }
-
-                            break;
-                        }
-                    }
-
-                    if (nRow != fromRow && (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)))
-                    {
-                        if (lastValidCol > -1)
-                        {
-                            nCol = lastValidCol;
-                        }
-
-                        return;
-                    }
-
-                    while (MovePrev (ref nCol, ref nRow, out nRune))
-                    {
-                        if (!Rune.IsLetterOrDigit (nRune) && !Rune.IsPunctuation (nRune) && !Rune.IsSymbol (nRune))
-                        {
-                            break;
-                        }
-
-                        if (nRow != fromRow)
-                        {
-                            break;
-                        }
-
-                        lastValidCol =
-                            (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
-                                ? nCol
-                                : lastValidCol;
-                    }
-
-                    if (lastValidCol > -1)
-                    {
-                        nCol = lastValidCol;
-                        nRow = fromRow;
-                    }
-                }
-                else
-                {
-                    if (!MovePrev (ref nCol, ref nRow, out nRune))
-                    {
-                        return;
-                    }
-
-                    List<Cell> line = GetLine (nRow);
-
-                    if (nCol == 0
-                        && nRow == fromRow
-                        && (Rune.IsLetterOrDigit (line [0].Rune) || Rune.IsPunctuation (line [0].Rune) || Rune.IsSymbol (line [0].Rune)))
-                    {
-                        return;
-                    }
-
-                    lastValidCol =
-                        (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
-                            ? nCol
-                            : lastValidCol;
-
-                    if (lastValidCol > -1 && Rune.IsWhiteSpace (nRune))
-                    {
-                        nCol = lastValidCol;
-
-                        return;
-                    }
-
-                    if (fromRow != nRow)
-                    {
-                        nCol = line.Count;
-
-                        return;
-                    }
-
-                    ProcMovePrev (ref nCol, ref nRow, nRune);
-                }
-            }
-
-            ProcMovePrev (ref col, ref row, rune);
-
-            if (fromCol != col || fromRow != row)
-            {
-                return (col, row);
-            }
-
-            return null;
-        }
-        catch (Exception)
-        {
-            return null;
-        }
-    }
-
-    public (int col, int row)? WordForward (int fromCol, int fromRow)
-    {
-        if (fromRow == _lines.Count - 1 && fromCol == GetLine (_lines.Count - 1).Count)
-        {
-            return null;
-        }
-
-        int col = fromCol;
-        int row = fromRow;
-
-        try
-        {
-            Rune rune = RuneAt (col, row)!.Value.Rune;
-            RuneType runeType = GetRuneType (rune);
-
-            int lastValidCol = IsSameRuneType (rune, runeType) && (Rune.IsLetterOrDigit (rune) || Rune.IsPunctuation (rune) || Rune.IsSymbol (rune))
-                                   ? col
-                                   : -1;
-
-            void ProcMoveNext (ref int nCol, ref int nRow, Rune nRune)
-            {
-                if (Rune.IsWhiteSpace (nRune))
-                {
-                    while (MoveNext (ref nCol, ref nRow, out nRune))
-                    {
-                        if (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune))
-                        {
-                            lastValidCol = nCol;
-
-                            return;
-                        }
-                    }
-
-                    if (nRow != fromRow && (Rune.IsLetterOrDigit (nRune) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)))
-                    {
-                        if (lastValidCol > -1)
-                        {
-                            nCol = lastValidCol;
-                        }
-
-                        return;
-                    }
-
-                    while (MoveNext (ref nCol, ref nRow, out nRune))
-                    {
-                        if (!Rune.IsLetterOrDigit (nRune) && !Rune.IsPunctuation (nRune) && !Rune.IsSymbol (nRune))
-                        {
-                            break;
-                        }
-
-                        if (nRow != fromRow)
-                        {
-                            break;
-                        }
-
-                        lastValidCol =
-                            (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
-                                ? nCol
-                                : lastValidCol;
-                    }
-
-                    if (lastValidCol > -1)
-                    {
-                        nCol = lastValidCol;
-                        nRow = fromRow;
-                    }
-                }
-                else
-                {
-                    if (!MoveNext (ref nCol, ref nRow, out nRune))
-                    {
-                        return;
-                    }
-
-                    if (!IsSameRuneType (nRune, runeType) && !Rune.IsWhiteSpace (nRune))
-                    {
-                        return;
-                    }
-
-                    List<Cell> line = GetLine (nRow);
-
-                    if (nCol == line.Count
-                        && nRow == fromRow
-                        && (Rune.IsLetterOrDigit (line [0].Rune) || Rune.IsPunctuation (line [0].Rune) || Rune.IsSymbol (line [0].Rune)))
-                    {
-                        return;
-                    }
-
-                    lastValidCol =
-                        (IsSameRuneType (nRune, runeType) && Rune.IsLetterOrDigit (nRune)) || Rune.IsPunctuation (nRune) || Rune.IsSymbol (nRune)
-                            ? nCol
-                            : lastValidCol;
-
-                    if (fromRow != nRow)
-                    {
-                        nCol = 0;
-
-                        return;
-                    }
-
-                    ProcMoveNext (ref nCol, ref nRow, nRune);
-                }
-            }
-
-            ProcMoveNext (ref col, ref row, rune);
-
-            if (fromCol != col || fromRow != row)
-            {
-                return (col, row);
-            }
-
-            return null;
-        }
-        catch (Exception)
-        {
-            return null;
-        }
-    }
-
-    internal static int CalculateLeftColumn (List<Cell> t, int start, int end, int width, int tabWidth = 0)
-    {
-        List<Rune> runes = new ();
-
-        foreach (Cell cell in t)
-        {
-            runes.Add (cell.Rune);
-        }
-
-        return CalculateLeftColumn (runes, start, end, width, tabWidth);
-    }
-
-    // Returns the left column in a range of the string.
-    internal static int CalculateLeftColumn (List<Rune> t, int start, int end, int width, int tabWidth = 0)
-    {
-        if (t is null || t.Count == 0)
-        {
-            return 0;
-        }
-
-        var size = 0;
-        int tcount = end > t.Count - 1 ? t.Count - 1 : end;
-        var col = 0;
-
-        for (int i = tcount; i >= 0; i--)
-        {
-            Rune rune = t [i];
-            size += rune.GetColumns ();
-
-            if (rune.Value == '\t')
-            {
-                size += tabWidth + 1;
-            }
-
-            if (size > width)
-            {
-                if (col + width == end)
-                {
-                    col++;
-                }
-
-                break;
-            }
-
-            if ((end < t.Count && col > 0 && start < end && col == start) || end - col == width - 1)
-            {
-                break;
-            }
-
-            col = i;
-        }
-
-        return col;
-    }
-
-    internal static (int size, int length) DisplaySize (
-        List<Cell> t,
-        int start = -1,
-        int end = -1,
-        bool checkNextRune = true,
-        int tabWidth = 0
-    )
-    {
-        List<Rune> runes = new ();
-
-        foreach (Cell cell in t)
-        {
-            runes.Add (cell.Rune);
-        }
-
-        return DisplaySize (runes, start, end, checkNextRune, tabWidth);
-    }
-
-    // Returns the size and length in a range of the string.
-    internal static (int size, int length) DisplaySize (
-        List<Rune> t,
-        int start = -1,
-        int end = -1,
-        bool checkNextRune = true,
-        int tabWidth = 0
-    )
-    {
-        if (t is null || t.Count == 0)
-        {
-            return (0, 0);
-        }
-
-        var size = 0;
-        var len = 0;
-
-        int tcount = end == -1 ? t.Count :
-                     end > t.Count ? t.Count : end;
-        int i = start == -1 ? 0 : start;
-
-        for (; i < tcount; i++)
-        {
-            Rune rune = t [i];
-            size += rune.GetColumns ();
-            len += rune.GetEncodingLength (Encoding.Unicode);
-
-            if (rune.Value == '\t')
-            {
-                size += tabWidth + 1;
-                len += tabWidth - 1;
-            }
-
-            if (checkNextRune && i == tcount - 1 && t.Count > tcount && IsWideRune (t [i + 1], tabWidth, out int s, out int l))
-            {
-                size += s;
-                len += l;
-            }
-        }
-
-        bool IsWideRune (Rune r, int tWidth, out int s, out int l)
-        {
-            s = r.GetColumns ();
-            l = r.GetEncodingLength ();
-
-            if (r.Value == '\t')
-            {
-                s += tWidth + 1;
-                l += tWidth - 1;
-            }
-
-            return s > 1;
-        }
-
-        return (size, len);
-    }
-
-    internal Size GetDisplaySize ()
-    {
-        var size = Size.Empty;
-
-        return size;
-    }
-
-    internal (Point current, bool found) FindNextText (
-        string text,
-        out bool gaveFullTurn,
-        bool matchCase = false,
-        bool matchWholeWord = false
-    )
-    {
-        if (text is null || _lines.Count == 0)
-        {
-            gaveFullTurn = false;
-
-            return (Point.Empty, false);
-        }
-
-        if (_toFind.found)
-        {
-            _toFind.currentPointToFind.X++;
-        }
-
-        (Point current, bool found) foundPos = GetFoundNextTextPoint (
-                                                                      text,
-                                                                      _lines.Count,
-                                                                      matchCase,
-                                                                      matchWholeWord,
-                                                                      _toFind.currentPointToFind
-                                                                     );
-
-        if (!foundPos.found && _toFind.currentPointToFind != _toFind.startPointToFind)
-        {
-            foundPos = GetFoundNextTextPoint (
-                                              text,
-                                              _toFind.startPointToFind.Y + 1,
-                                              matchCase,
-                                              matchWholeWord,
-                                              Point.Empty
-                                             );
-        }
-
-        gaveFullTurn = ApplyToFind (foundPos);
-
-        return foundPos;
-    }
-
-    internal (Point current, bool found) FindPreviousText (
-        string text,
-        out bool gaveFullTurn,
-        bool matchCase = false,
-        bool matchWholeWord = false
-    )
-    {
-        if (text is null || _lines.Count == 0)
-        {
-            gaveFullTurn = false;
-
-            return (Point.Empty, false);
-        }
-
-        if (_toFind.found)
-        {
-            _toFind.currentPointToFind.X++;
-        }
-
-        int linesCount = _toFind.currentPointToFind.IsEmpty ? _lines.Count - 1 : _toFind.currentPointToFind.Y;
-
-        (Point current, bool found) foundPos = GetFoundPreviousTextPoint (
-                                                                          text,
-                                                                          linesCount,
-                                                                          matchCase,
-                                                                          matchWholeWord,
-                                                                          _toFind.currentPointToFind
-                                                                         );
-
-        if (!foundPos.found && _toFind.currentPointToFind != _toFind.startPointToFind)
-        {
-            foundPos = GetFoundPreviousTextPoint (
-                                                  text,
-                                                  _lines.Count - 1,
-                                                  matchCase,
-                                                  matchWholeWord,
-                                                  new (_lines [_lines.Count - 1].Count, _lines.Count)
-                                                 );
-        }
-
-        gaveFullTurn = ApplyToFind (foundPos);
-
-        return foundPos;
-    }
-
-    internal static int GetColFromX (List<Cell> t, int start, int x, int tabWidth = 0)
-    {
-        List<Rune> runes = new ();
-
-        foreach (Cell cell in t)
-        {
-            runes.Add (cell.Rune);
-        }
-
-        return GetColFromX (runes, start, x, tabWidth);
-    }
-
-    internal static int GetColFromX (List<Rune> t, int start, int x, int tabWidth = 0)
-    {
-        if (x < 0)
-        {
-            return x;
-        }
-
-        int size = start;
-        int pX = x + start;
-
-        for (int i = start; i < t.Count; i++)
-        {
-            Rune r = t [i];
-            size += r.GetColumns ();
-
-            if (r.Value == '\t')
-            {
-                size += tabWidth + 1;
-            }
-
-            if (i == pX || size > pX)
-            {
-                return i - start;
-            }
-        }
-
-        return t.Count - start;
-    }
-
-    internal (Point current, bool found) ReplaceAllText (
-        string text,
-        bool matchCase = false,
-        bool matchWholeWord = false,
-        string? textToReplace = null
-    )
-    {
-        var found = false;
-        var pos = Point.Empty;
-
-        for (var i = 0; i < _lines.Count; i++)
-        {
-            List<Cell> x = _lines [i];
-            string txt = GetText (x);
-            string matchText = !matchCase ? text.ToUpper () : text;
-            int col = txt.IndexOf (matchText);
-
-            while (col > -1)
-            {
-                if (matchWholeWord && !MatchWholeWord (txt, matchText, col))
-                {
-                    if (col + 1 > txt.Length)
-                    {
-                        break;
-                    }
-
-                    col = txt.IndexOf (matchText, col + 1);
-
-                    continue;
-                }
-
-                if (col > -1)
-                {
-                    if (!found)
-                    {
-                        found = true;
-                    }
-
-                    _lines [i] = Cell.ToCellList (ReplaceText (x, textToReplace!, matchText, col));
-                    x = _lines [i];
-                    txt = GetText (x);
-                    pos = new (col, i);
-                    col += textToReplace!.Length - matchText.Length;
-                }
-
-                if (col < 0 || col + 1 > txt.Length)
-                {
-                    break;
-                }
-
-                col = txt.IndexOf (matchText, col + 1);
-            }
-        }
-
-        string GetText (List<Cell> x)
-        {
-            var txt = Cell.ToString (x);
-
-            if (!matchCase)
-            {
-                txt = txt.ToUpper ();
-            }
-
-            return txt;
-        }
-
-        return (pos, found);
-    }
-
-    /// <summary>Redefine column and line tracking.</summary>
-    /// <param name="point">Contains the column and line.</param>
-    internal void ResetContinuousFind (Point point)
-    {
-        _toFind.startPointToFind = _toFind.currentPointToFind = point;
-        _toFind.found = false;
-    }
-
-    internal static bool SetCol (ref int col, int width, int cols)
-    {
-        if (col + cols <= width)
-        {
-            col += cols;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private void Append (List<byte> line)
-    {
-        var str = StringExtensions.ToString (line.ToArray ());
-        _lines.Add (Cell.StringToCells (str));
-    }
-
-    private bool ApplyToFind ((Point current, bool found) foundPos)
-    {
-        var gaveFullTurn = false;
-
-        if (foundPos.found)
-        {
-            _toFind.currentPointToFind = foundPos.current;
-
-            if (_toFind.found && _toFind.currentPointToFind == _toFind.startPointToFind)
-            {
-                gaveFullTurn = true;
-            }
-
-            if (!_toFind.found)
-            {
-                _toFind.startPointToFind = _toFind.currentPointToFind = foundPos.current;
-                _toFind.found = foundPos.found;
-            }
-        }
-
-        return gaveFullTurn;
-    }
-
-    private (Point current, bool found) GetFoundNextTextPoint (
-        string text,
-        int linesCount,
-        bool matchCase,
-        bool matchWholeWord,
-        Point start
-    )
-    {
-        for (int i = start.Y; i < linesCount; i++)
-        {
-            List<Cell> x = _lines [i];
-            var txt = Cell.ToString (x);
-
-            if (!matchCase)
-            {
-                txt = txt.ToUpper ();
-            }
-
-            string matchText = !matchCase ? text.ToUpper () : text;
-            int col = txt.IndexOf (matchText, Math.Min (start.X, txt.Length));
-
-            if (col > -1 && matchWholeWord && !MatchWholeWord (txt, matchText, col))
-            {
-                continue;
-            }
-
-            if (col > -1 && ((i == start.Y && col >= start.X) || i > start.Y) && txt.Contains (matchText))
-            {
-                return (new (col, i), true);
-            }
-
-            if (col == -1 && start.X > 0)
-            {
-                start.X = 0;
-            }
-        }
-
-        return (Point.Empty, false);
-    }
-
-    private (Point current, bool found) GetFoundPreviousTextPoint (
-        string text,
-        int linesCount,
-        bool matchCase,
-        bool matchWholeWord,
-        Point start
-    )
-    {
-        for (int i = linesCount; i >= 0; i--)
-        {
-            List<Cell> x = _lines [i];
-            var txt = Cell.ToString (x);
-
-            if (!matchCase)
-            {
-                txt = txt.ToUpper ();
-            }
-
-            if (start.Y != i)
-            {
-                start.X = Math.Max (x.Count - 1, 0);
-            }
-
-            string matchText = !matchCase ? text.ToUpper () : text;
-            int col = txt.LastIndexOf (matchText, _toFind.found ? start.X - 1 : start.X);
-
-            if (col > -1 && matchWholeWord && !MatchWholeWord (txt, matchText, col))
-            {
-                continue;
-            }
-
-            if (col > -1 && ((i <= linesCount && col <= start.X) || i < start.Y) && txt.Contains (matchText))
-            {
-                return (new (col, i), true);
-            }
-        }
-
-        return (Point.Empty, false);
-    }
-
-    private RuneType GetRuneType (Rune rune)
-    {
-        if (Rune.IsSymbol (rune))
-        {
-            return RuneType.IsSymbol;
-        }
-
-        if (Rune.IsWhiteSpace (rune))
-        {
-            return RuneType.IsWhiteSpace;
-        }
-
-        if (Rune.IsLetterOrDigit (rune))
-        {
-            return RuneType.IsLetterOrDigit;
-        }
-
-        if (Rune.IsPunctuation (rune))
-        {
-            return RuneType.IsPunctuation;
-        }
-
-        return RuneType.IsUnknown;
-    }
-
-    private bool IsSameRuneType (Rune newRune, RuneType runeType)
-    {
-        RuneType rt = GetRuneType (newRune);
-
-        return rt == runeType;
-    }
-
-    private bool MatchWholeWord (string source, string matchText, int index = 0)
-    {
-        if (string.IsNullOrEmpty (source) || string.IsNullOrEmpty (matchText))
-        {
-            return false;
-        }
-
-        string txt = matchText.Trim ();
-        int start = index > 0 ? index - 1 : 0;
-        int end = index + txt.Length;
-
-        if ((start == 0 || Rune.IsWhiteSpace ((Rune)source [start])) && (end == source.Length || Rune.IsWhiteSpace ((Rune)source [end])))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    private bool MoveNext (ref int col, ref int row, out Rune rune)
-    {
-        List<Cell> line = GetLine (row);
-
-        if (col + 1 < line.Count)
-        {
-            col++;
-            rune = line [col].Rune;
-
-            if (col + 1 == line.Count && !Rune.IsLetterOrDigit (rune) && !Rune.IsWhiteSpace (line [col - 1].Rune))
-            {
-                col++;
-            }
-
-            return true;
-        }
-
-        if (col + 1 == line.Count)
-        {
-            col++;
-        }
-
-        while (row + 1 < Count)
-        {
-            col = 0;
-            row++;
-            line = GetLine (row);
-
-            if (line.Count > 0)
-            {
-                rune = line [0].Rune;
-
-                return true;
-            }
-        }
-
-        rune = default (Rune);
-
-        return false;
-    }
-
-    private bool MovePrev (ref int col, ref int row, out Rune rune)
-    {
-        List<Cell> line = GetLine (row);
-
-        if (col > 0)
-        {
-            col--;
-            rune = line [col].Rune;
-
-            return true;
-        }
-
-        if (row == 0)
-        {
-            rune = default (Rune);
-
-            return false;
-        }
-
-        while (row > 0)
-        {
-            row--;
-            line = GetLine (row);
-            col = line.Count - 1;
-
-            if (col >= 0)
-            {
-                rune = line [col].Rune;
-
-                return true;
-            }
-        }
-
-        rune = default (Rune);
-
-        return false;
-    }
-
-    private void OnLinesLoaded () { LinesLoaded?.Invoke (this, EventArgs.Empty); }
-
-    private string ReplaceText (List<Cell> source, string textToReplace, string matchText, int col)
-    {
-        var origTxt = Cell.ToString (source);
-        (_, int len) = DisplaySize (source, 0, col, false);
-        (_, int len2) = DisplaySize (source, col, col + matchText.Length, false);
-        (_, int len3) = DisplaySize (source, col + matchText.Length, origTxt.GetRuneCount (), false);
-
-        return origTxt [..len] + textToReplace + origTxt.Substring (len + len2, len3);
-    }
-
-    private Cell? RuneAt (int col, int row)
-    {
-        List<Cell> line = GetLine (row);
-
-        if (line.Count > 0)
-        {
-            return line [col > line.Count - 1 ? line.Count - 1 : col];
-        }
-
-        return null;
-    }
-
-    private void SetAttributes (Attribute? attribute)
-    {
-        foreach (List<Cell> line in _lines)
-        {
-            for (var i = 0; i < line.Count; i++)
-            {
-                Cell cell = line [i];
-                cell.Attribute ??= attribute;
-                line [i] = cell;
-            }
-        }
-    }
-
-    private enum RuneType
-    {
-        IsSymbol,
-        IsWhiteSpace,
-        IsLetterOrDigit,
-        IsPunctuation,
-        IsUnknown
-    }
-}
-
-internal partial class HistoryText
-{
-    public enum LineStatus
-    {
-        Original,
-        Replaced,
-        Removed,
-        Added,
-        Attribute
-    }
-
-    private readonly List<HistoryTextItemEventArgs> _historyTextItems = [];
-    private int _idxHistoryText = -1;
-    private readonly List<List<Cell>> _originalCellsList = [];
-    public bool HasHistoryChanges => _idxHistoryText > -1;
-    public bool IsFromHistory { get; private set; }
-
-    public void Add (List<List<Cell>> lines, Point curPos, LineStatus lineStatus = LineStatus.Original)
-    {
-        if (lineStatus == LineStatus.Original && _historyTextItems.Count > 0 && _historyTextItems.Last ().LineStatus == LineStatus.Original)
-        {
-            return;
-        }
-
-        if (lineStatus == LineStatus.Replaced && _historyTextItems.Count > 0 && _historyTextItems.Last ().LineStatus == LineStatus.Replaced)
-        {
-            return;
-        }
-
-        if (_historyTextItems.Count == 0 && lineStatus != LineStatus.Original)
-        {
-            throw new ArgumentException ("The first item must be the original.");
-        }
-
-        if (_idxHistoryText >= 0 && _idxHistoryText + 1 < _historyTextItems.Count)
-        {
-            _historyTextItems.RemoveRange (
-                                           _idxHistoryText + 1,
-                                           _historyTextItems.Count - _idxHistoryText - 1
-                                          );
-        }
-
-        _historyTextItems.Add (new (lines, curPos, lineStatus));
-        _idxHistoryText++;
-    }
-
-    public event EventHandler<HistoryTextItemEventArgs>? ChangeText;
-
-    public void Clear (List<List<Cell>> cellsList)
-    {
-        _historyTextItems.Clear ();
-        _idxHistoryText = -1;
-        _originalCellsList.Clear ();
-
-        // Save a copy of the original, not the reference
-        foreach (List<Cell> cells in cellsList)
-        {
-            _originalCellsList.Add ([.. cells]);
-        }
-
-        OnChangeText (null);
-    }
-
-    public bool IsDirty (List<List<Cell>> cellsList)
-    {
-        if (cellsList.Count != _originalCellsList.Count)
-        {
-            return true;
-        }
-
-        for (var r = 0; r < cellsList.Count; r++)
-        {
-            List<Cell> cells = cellsList [r];
-            List<Cell> originalCells = _originalCellsList [r];
-
-            if (cells.Count != originalCells.Count)
-            {
-                return true;
-            }
-
-            for (var c = 0; c < cells.Count; c++)
-            {
-                Cell cell = cells [c];
-                Cell originalCell = originalCells [c];
-
-                if (!cell.Equals (originalCell))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public void Redo ()
-    {
-        if (_historyTextItems?.Count > 0 && _idxHistoryText < _historyTextItems.Count - 1)
-        {
-            IsFromHistory = true;
-
-            _idxHistoryText++;
-
-            var historyTextItem = new HistoryTextItemEventArgs (_historyTextItems [_idxHistoryText]) { IsUndoing = false };
-
-            ProcessChanges (ref historyTextItem);
-
-            IsFromHistory = false;
-        }
-    }
-
-    public void ReplaceLast (List<List<Cell>> lines, Point curPos, LineStatus lineStatus)
-    {
-        HistoryTextItemEventArgs? found = _historyTextItems.FindLast (x => x.LineStatus == lineStatus);
-
-        if (found is { })
-        {
-            found.Lines = lines;
-            found.CursorPosition = curPos;
-        }
-    }
-
-    public void Undo ()
-    {
-        if (_historyTextItems?.Count > 0 && _idxHistoryText > 0)
-        {
-            IsFromHistory = true;
-
-            _idxHistoryText--;
-
-            var historyTextItem = new HistoryTextItemEventArgs (_historyTextItems [_idxHistoryText]) { IsUndoing = true };
-
-            ProcessChanges (ref historyTextItem);
-
-            IsFromHistory = false;
-        }
-    }
-
-    private void OnChangeText (HistoryTextItemEventArgs? lines) { ChangeText?.Invoke (this, lines!); }
-
-    private void ProcessChanges (ref HistoryTextItemEventArgs historyTextItem)
-    {
-        if (historyTextItem.IsUndoing)
-        {
-            if (_idxHistoryText - 1 > -1
-                && (_historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Added
-                    || _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Removed
-                    || (historyTextItem.LineStatus == LineStatus.Replaced && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Original)
-                    || (historyTextItem.LineStatus == LineStatus.Attribute && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Original)))
-            {
-                _idxHistoryText--;
-
-                while (_historyTextItems [_idxHistoryText].LineStatus == LineStatus.Added
-                       && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Removed)
-                {
-                    _idxHistoryText--;
-                }
-
-                historyTextItem = new (_historyTextItems [_idxHistoryText]);
-                historyTextItem.IsUndoing = true;
-                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
-            }
-
-            if (historyTextItem.LineStatus == LineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Added)
-            {
-                historyTextItem.RemovedOnAdded =
-                    new (_historyTextItems [_idxHistoryText + 1]);
-            }
-
-            if ((historyTextItem.LineStatus == LineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Original)
-                || (historyTextItem.LineStatus == LineStatus.Removed && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Original)
-                || (historyTextItem.LineStatus == LineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Removed))
-            {
-                if (!historyTextItem.Lines [0]
-                                    .SequenceEqual (_historyTextItems [_idxHistoryText - 1].Lines [0])
-                    && historyTextItem.CursorPosition == _historyTextItems [_idxHistoryText - 1].CursorPosition)
-                {
-                    historyTextItem.Lines [0] =
-                        new (_historyTextItems [_idxHistoryText - 1].Lines [0]);
-                }
-
-                if (historyTextItem.LineStatus == LineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Removed)
-                {
-                    historyTextItem.FinalCursorPosition =
-                        _historyTextItems [_idxHistoryText - 2].CursorPosition;
-                }
-                else
-                {
-                    historyTextItem.FinalCursorPosition =
-                        _historyTextItems [_idxHistoryText - 1].CursorPosition;
-                }
-            }
-            else
-            {
-                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
-            }
-
-            OnChangeText (historyTextItem);
-
-            while (_historyTextItems [_idxHistoryText].LineStatus == LineStatus.Removed
-                   || _historyTextItems [_idxHistoryText].LineStatus == LineStatus.Added)
-            {
-                _idxHistoryText--;
-            }
-        }
-        else if (!historyTextItem.IsUndoing)
-        {
-            if (_idxHistoryText + 1 < _historyTextItems.Count
-                && (historyTextItem.LineStatus == LineStatus.Original
-                    || _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Added
-                    || _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Removed))
-            {
-                _idxHistoryText++;
-                historyTextItem = new (_historyTextItems [_idxHistoryText]);
-                historyTextItem.IsUndoing = false;
-                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
-            }
-
-            if (historyTextItem.LineStatus == LineStatus.Added && _historyTextItems [_idxHistoryText - 1].LineStatus == LineStatus.Removed)
-            {
-                historyTextItem.RemovedOnAdded =
-                    new (_historyTextItems [_idxHistoryText - 1]);
-            }
-
-            if ((historyTextItem.LineStatus == LineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Replaced)
-                || (historyTextItem.LineStatus == LineStatus.Removed && _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Original)
-                || (historyTextItem.LineStatus == LineStatus.Added && _historyTextItems [_idxHistoryText + 1].LineStatus == LineStatus.Replaced))
-            {
-                if (historyTextItem.LineStatus == LineStatus.Removed
-                    && !historyTextItem.Lines [0]
-                                       .SequenceEqual (_historyTextItems [_idxHistoryText + 1].Lines [0]))
-                {
-                    historyTextItem.Lines [0] =
-                        new (_historyTextItems [_idxHistoryText + 1].Lines [0]);
-                }
-
-                historyTextItem.FinalCursorPosition =
-                    _historyTextItems [_idxHistoryText + 1].CursorPosition;
-            }
-            else
-            {
-                historyTextItem.FinalCursorPosition = historyTextItem.CursorPosition;
-            }
-
-            OnChangeText (historyTextItem);
-
-            while (_historyTextItems [_idxHistoryText].LineStatus == LineStatus.Removed
-                   || _historyTextItems [_idxHistoryText].LineStatus == LineStatus.Added)
-            {
-                _idxHistoryText++;
-            }
-        }
-    }
-}
-
-internal class WordWrapManager
-{
-    private int _frameWidth;
-    private bool _isWrapModelRefreshing;
-    private List<WrappedLine> _wrappedModelLines = new ();
-    public WordWrapManager (TextModel model) { Model = model; }
-    public TextModel Model { get; private set; }
-
-    public void AddLine (int row, int col)
-    {
-        int modelRow = GetModelLineFromWrappedLines (row);
-        int modelCol = GetModelColFromWrappedLines (row, col);
-        List<Cell> line = GetCurrentLine (modelRow);
-        int restCount = line.Count - modelCol;
-        List<Cell> rest = line.GetRange (modelCol, restCount);
-        line.RemoveRange (modelCol, restCount);
-        Model.AddLine (modelRow + 1, rest);
-        _isWrapModelRefreshing = true;
-        WrapModel (_frameWidth, out _, out _, out _, out _, modelRow + 1);
-        _isWrapModelRefreshing = false;
-    }
-
-    public int GetModelColFromWrappedLines (int line, int col)
-    {
-        if (_wrappedModelLines?.Count == 0)
-        {
-            return 0;
-        }
-
-        int modelLine = GetModelLineFromWrappedLines (line);
-        int firstLine = _wrappedModelLines.IndexOf (r => r.ModelLine == modelLine);
-        var modelCol = 0;
-
-        for (int i = firstLine; i <= Math.Min (line, _wrappedModelLines!.Count - 1); i++)
-        {
-            WrappedLine wLine = _wrappedModelLines [i];
-
-            if (i < line)
-            {
-                modelCol += wLine.ColWidth;
-            }
-            else
-            {
-                modelCol += col;
-            }
-        }
-
-        return modelCol;
-    }
-
-    public int GetModelLineFromWrappedLines (int line)
-    {
-        return _wrappedModelLines.Count > 0
-                   ? _wrappedModelLines [Math.Min (
-                                                   line,
-                                                   _wrappedModelLines.Count - 1
-                                                  )].ModelLine
-                   : 0;
-    }
-
-    public int GetWrappedLineColWidth (int line, int col, WordWrapManager wrapManager)
-    {
-        if (_wrappedModelLines?.Count == 0)
-        {
-            return 0;
-        }
-
-        List<WrappedLine> wModelLines = wrapManager._wrappedModelLines;
-        int modelLine = GetModelLineFromWrappedLines (line);
-        int firstLine = _wrappedModelLines.IndexOf (r => r.ModelLine == modelLine);
-        var modelCol = 0;
-        var colWidthOffset = 0;
-        int i = firstLine;
-
-        while (modelCol < col)
-        {
-            WrappedLine wLine = _wrappedModelLines! [i];
-            WrappedLine wLineToCompare = wModelLines [i];
-
-            if (wLine.ModelLine != modelLine || wLineToCompare.ModelLine != modelLine)
-            {
-                break;
-            }
-
-            modelCol += Math.Max (wLine.ColWidth, wLineToCompare.ColWidth);
-            colWidthOffset += wLine.ColWidth - wLineToCompare.ColWidth;
-
-            if (modelCol > col)
-            {
-                modelCol += col - modelCol;
-            }
-
-            i++;
-        }
-
-        return modelCol - colWidthOffset;
-    }
-
-    public bool Insert (int row, int col, Cell cell)
-    {
-        List<Cell> line = GetCurrentLine (GetModelLineFromWrappedLines (row));
-        line.Insert (GetModelColFromWrappedLines (row, col), cell);
-
-        if (line.Count > _frameWidth)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    public bool RemoveAt (int row, int col)
-    {
-        int modelRow = GetModelLineFromWrappedLines (row);
-        List<Cell> line = GetCurrentLine (modelRow);
-        int modelCol = GetModelColFromWrappedLines (row, col);
-
-        if (modelCol > line.Count)
-        {
-            Model.RemoveLine (modelRow);
-            RemoveAt (row, 0);
-
-            return false;
-        }
-
-        if (modelCol < line.Count)
-        {
-            line.RemoveAt (modelCol);
-        }
-
-        if (line.Count > _frameWidth || (row + 1 < _wrappedModelLines.Count && _wrappedModelLines [row + 1].ModelLine == modelRow))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    public bool RemoveLine (int row, int col, out bool lineRemoved, bool forward = true)
-    {
-        lineRemoved = false;
-        int modelRow = GetModelLineFromWrappedLines (row);
-        List<Cell> line = GetCurrentLine (modelRow);
-        int modelCol = GetModelColFromWrappedLines (row, col);
-
-        if (modelCol == 0 && line.Count == 0)
-        {
-            Model.RemoveLine (modelRow);
-
-            return false;
-        }
-
-        if (modelCol < line.Count)
-        {
-            if (forward)
-            {
-                line.RemoveAt (modelCol);
-
-                return true;
-            }
-
-            if (modelCol - 1 > -1)
-            {
-                line.RemoveAt (modelCol - 1);
-
-                return true;
-            }
-        }
-
-        lineRemoved = true;
-
-        if (forward)
-        {
-            if (modelRow + 1 == Model.Count)
-            {
-                return false;
-            }
-
-            List<Cell> nextLine = Model.GetLine (modelRow + 1);
-            line.AddRange (nextLine);
-            Model.RemoveLine (modelRow + 1);
-
-            if (line.Count > _frameWidth)
-            {
-                return true;
-            }
-        }
-        else
-        {
-            if (modelRow == 0)
-            {
-                return false;
-            }
-
-            List<Cell> prevLine = Model.GetLine (modelRow - 1);
-            prevLine.AddRange (line);
-            Model.RemoveLine (modelRow);
-
-            if (prevLine.Count > _frameWidth)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public bool RemoveRange (int row, int index, int count)
-    {
-        int modelRow = GetModelLineFromWrappedLines (row);
-        List<Cell> line = GetCurrentLine (modelRow);
-        int modelCol = GetModelColFromWrappedLines (row, index);
-
-        try
-        {
-            line.RemoveRange (modelCol, count);
-        }
-        catch (Exception)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public List<List<Cell>> ToListRune (List<string> textList)
-    {
-        List<List<Cell>> runesList = new ();
-
-        foreach (string text in textList)
-        {
-            runesList.Add (Cell.ToCellList (text));
-        }
-
-        return runesList;
-    }
-
-    public void UpdateModel (
-        TextModel model,
-        out int nRow,
-        out int nCol,
-        out int nStartRow,
-        out int nStartCol,
-        int row,
-        int col,
-        int startRow,
-        int startCol,
-        bool preserveTrailingSpaces
-    )
-    {
-        _isWrapModelRefreshing = true;
-        Model = model;
-
-        WrapModel (
-                   _frameWidth,
-                   out nRow,
-                   out nCol,
-                   out nStartRow,
-                   out nStartCol,
-                   row,
-                   col,
-                   startRow,
-                   startCol,
-                   0,
-                   preserveTrailingSpaces
-                  );
-        _isWrapModelRefreshing = false;
-    }
-
-    public TextModel WrapModel (
-        int width,
-        out int nRow,
-        out int nCol,
-        out int nStartRow,
-        out int nStartCol,
-        int row = 0,
-        int col = 0,
-        int startRow = 0,
-        int startCol = 0,
-        int tabWidth = 0,
-        bool preserveTrailingSpaces = true
-    )
-    {
-        _frameWidth = width;
-
-        int modelRow = _isWrapModelRefreshing ? row : GetModelLineFromWrappedLines (row);
-        int modelCol = _isWrapModelRefreshing ? col : GetModelColFromWrappedLines (row, col);
-        int modelStartRow = _isWrapModelRefreshing ? startRow : GetModelLineFromWrappedLines (startRow);
-
-        int modelStartCol =
-            _isWrapModelRefreshing ? startCol : GetModelColFromWrappedLines (startRow, startCol);
-        var wrappedModel = new TextModel ();
-        var lines = 0;
-        nRow = 0;
-        nCol = 0;
-        nStartRow = 0;
-        nStartCol = 0;
-        bool isRowAndColSet = row == 0 && col == 0;
-        bool isStartRowAndColSet = startRow == 0 && startCol == 0;
-        List<WrappedLine> wModelLines = new ();
-
-        for (var i = 0; i < Model.Count; i++)
-        {
-            List<Cell> line = Model.GetLine (i);
-
-            List<List<Cell>> wrappedLines = ToListRune (
-                                                        TextFormatter.Format (
-                                                                              Cell.ToString (line),
-                                                                              width,
-                                                                              Alignment.Start,
-                                                                              true,
-                                                                              preserveTrailingSpaces,
-                                                                              tabWidth
-                                                                             )
-                                                       );
-            var sumColWidth = 0;
-
-            for (var j = 0; j < wrappedLines.Count; j++)
-            {
-                List<Cell> wrapLine = wrappedLines [j];
-
-                if (!isRowAndColSet && modelRow == i)
-                {
-                    if (nCol + wrapLine.Count <= modelCol)
-                    {
-                        nCol += wrapLine.Count;
-                        nRow = lines;
-
-                        if (nCol == modelCol)
-                        {
-                            nCol = wrapLine.Count;
-                            isRowAndColSet = true;
-                        }
-                        else if (j == wrappedLines.Count - 1)
-                        {
-                            nCol = wrapLine.Count - j + modelCol - nCol;
-                            isRowAndColSet = true;
-                        }
-                    }
-                    else
-                    {
-                        int offset = nCol + wrapLine.Count - modelCol;
-                        nCol = wrapLine.Count - offset;
-                        nRow = lines;
-                        isRowAndColSet = true;
-                    }
-                }
-
-                if (!isStartRowAndColSet && modelStartRow == i)
-                {
-                    if (nStartCol + wrapLine.Count <= modelStartCol)
-                    {
-                        nStartCol += wrapLine.Count;
-                        nStartRow = lines;
-
-                        if (nStartCol == modelStartCol)
-                        {
-                            nStartCol = wrapLine.Count;
-                            isStartRowAndColSet = true;
-                        }
-                        else if (j == wrappedLines.Count - 1)
-                        {
-                            nStartCol = wrapLine.Count - j + modelStartCol - nStartCol;
-                            isStartRowAndColSet = true;
-                        }
-                    }
-                    else
-                    {
-                        int offset = nStartCol + wrapLine.Count - modelStartCol;
-                        nStartCol = wrapLine.Count - offset;
-                        nStartRow = lines;
-                        isStartRowAndColSet = true;
-                    }
-                }
-
-                for (int k = j; k < wrapLine.Count; k++)
-                {
-                    Cell cell = wrapLine [k];
-                    cell.Attribute = line [k].Attribute;
-                    wrapLine [k] = cell;
-                }
-
-                wrappedModel.AddLine (lines, wrapLine);
-                sumColWidth += wrapLine.Count;
-
-                var wrappedLine = new WrappedLine
-                {
-                    ModelLine = i, Row = lines, RowIndex = j, ColWidth = wrapLine.Count
-                };
-                wModelLines.Add (wrappedLine);
-                lines++;
-            }
-        }
-
-        _wrappedModelLines = wModelLines;
-
-        return wrappedModel;
-    }
-
-    private List<Cell> GetCurrentLine (int row) { return Model.GetLine (row); }
-
-    private class WrappedLine
-    {
-        public int ColWidth;
-        public int ModelLine;
-        public int Row;
-        public int RowIndex;
-    }
-}
-
 /// <summary>Multi-line text editing <see cref="View"/>.</summary>
 /// <remarks>
 ///     <para>
-///         <see cref="TextView"/> provides a multi-line text editor. Users interact with it with the standard Windows,
-///         Mac, and Linux (Emacs) commands.
+///         <see cref="TextView"/> provides a fully featured multi-line text editor.
 ///     </para>
 ///     <list type="table">
 ///         <listheader>
@@ -1851,7 +79,7 @@ private class WrappedLine
 ///         </item>
 ///     </list>
 /// </remarks>
-public class TextView : View
+public class TextView : View, IDesignable
 {
     private readonly HistoryText _historyText = new ();
     private bool _allowsReturn = true;
@@ -2790,7 +1018,7 @@ public bool WordWrap
         }
     }
 
-    /// <summary>Allows clearing the <see cref="HistoryText.HistoryTextItemEventArgs"/> items updating the original text.</summary>
+    /// <summary>Allows clearing the <see cref="HistoryTextItemEventArgs"/> items updating the original text.</summary>
     public void ClearHistoryChanges () { _historyText?.Clear (_model.GetAllLines ()); }
 
     /// <summary>Closes the contents of the stream into the <see cref="TextView"/>.</summary>
@@ -2847,13 +1075,13 @@ internal void ApplyCellsAttribute (Attribute attribute)
 
             _historyText.Add (
                               [.. selectedCellsOriginal],
-                              new (startCol, startRow)
+                              new Point (startCol, startRow)
                              );
 
             _historyText.Add (
                               [.. selectedCellsChanged],
-                              new (startCol, startRow),
-                              HistoryText.LineStatus.Attribute
+                              new Point (startCol, startRow),
+                              TextEditingLineStatus.Attribute
                              );
         }
     }
@@ -2871,7 +1099,7 @@ internal void ApplyCellsAttribute (Attribute attribute)
                 return new (attributeSel);
             }
 
-            return new (ColorScheme!.Focus);
+            return GetAttributeForRole (VisualRole.Active);
         }
 
         line = GetCurrentLine ();
@@ -2881,7 +1109,7 @@ internal void ApplyCellsAttribute (Attribute attribute)
             return new (attribute);
         }
 
-        return new (ColorScheme!.Focus);
+        return GetAttributeForRole (VisualRole.Active);
     }
 
     /// <summary>
@@ -2900,7 +1128,8 @@ out Attribute newAttribute
 
         var attribute = new Attribute (
                                        newAttribute.Foreground,
-                                       newAttribute.Background
+                                       newAttribute.Background,
+                                       newAttribute.Style
                                       );
 
         ApplyCellsAttribute (attribute);
@@ -2947,7 +1176,7 @@ public void Cut ()
             _historyText.Add (
                               [new (GetCurrentLine ())],
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
         }
 
@@ -2993,7 +1222,7 @@ public void DeleteCharLeft ()
             _historyText.Add (
                               new () { new (currentLine) },
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             UpdateWrapModel ();
@@ -3037,7 +1266,7 @@ public void DeleteCharRight ()
             _historyText.Add (
                               new () { new (currentLine) },
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             UpdateWrapModel ();
@@ -3161,7 +1390,17 @@ public bool FindPreviousText (
     public List<Cell> GetLine (int line) { return _model.GetLine (line); }
 
     /// <inheritdoc/>
-    public override Attribute GetNormalColor () { return GetFocusColor (); }
+    protected override bool OnGettingAttributeForRole (in VisualRole role, ref Attribute currentAttribute)
+    {
+        if (role == VisualRole.Normal)
+        {
+            currentAttribute = GetAttributeForRole (VisualRole.Editable);
+
+            return true;
+        }
+
+        return base.OnGettingAttributeForRole (role, ref currentAttribute);
+    }
 
     /// <summary>
     ///     Inserts the given <paramref name="toAdd"/> text at the current cursor position exactly as if the user had just
@@ -3243,7 +1482,7 @@ public void Load (Stream stream)
     public void Load (List<Cell> cells)
     {
         SetWrapModel ();
-        _model.LoadCells (cells, ColorScheme?.Focus);
+        _model.LoadCells (cells, GetAttributeForRole (VisualRole.Focus));
         _historyText.Clear (_model.GetAllLines ());
         ResetPosition ();
         SetNeedsDraw ();
@@ -3257,7 +1496,7 @@ public void Load (List<List<Cell>> cellsList)
     {
         SetWrapModel ();
         InheritsPreviousAttribute = true;
-        _model.LoadListCells (cellsList, ColorScheme?.Focus);
+        _model.LoadListCells (cellsList, GetAttributeForRole (VisualRole.Focus));
         _historyText.Clear (_model.GetAllLines ());
         ResetPosition ();
         SetNeedsDraw ();
@@ -3503,6 +1742,7 @@ protected override bool OnMouseEvent (MouseEventArgs ev)
             ContextMenu!.Y = ev.ScreenPosition.Y;
 
             ShowContextMenu (false);
+
             //ContextMenu.Position = ViewportToScreen ((Viewport with { X = ev.Position.X, Y = ev.Position.Y }).Location);
             //ShowContextMenu ();
         }
@@ -3540,7 +1780,7 @@ public virtual void OnContentsChanged ()
     {
         ContentsChanged?.Invoke (this, new (CurrentRow, CurrentColumn));
 
-        ProcessInheritsPreviousColorScheme (CurrentRow, CurrentColumn);
+        ProcessInheritsPreviousScheme (CurrentRow, CurrentColumn);
         ProcessAutocomplete ();
     }
 
@@ -3549,7 +1789,7 @@ protected override bool OnDrawingContent ()
     {
         _isDrawing = true;
 
-        SetNormalColor ();
+        SetAttributeForRole (Enabled ? VisualRole.Editable : VisualRole.Disabled);
 
         (int width, int height) offB = OffSetBackground ();
         int right = Viewport.Width + offB.width;
@@ -3624,7 +1864,6 @@ protected override bool OnDrawingContent ()
 
             if (col < right)
             {
-                SetNormalColor ();
                 ClearRegion (col, row, right, row + 1);
             }
 
@@ -3633,7 +1872,6 @@ protected override bool OnDrawingContent ()
 
         if (row < bottom)
         {
-            SetNormalColor ();
             ClearRegion (Viewport.Left, row, right, bottom);
         }
 
@@ -3715,7 +1953,7 @@ public virtual void OnUnwrappedCursorPosition (int? cRow = null, int? cCol = nul
             col = _wrapManager.GetModelColFromWrappedLines (CurrentRow, CurrentColumn);
         }
 
-        UnwrappedCursorPosition?.Invoke (this, new Point (col.Value, row.Value));
+        UnwrappedCursorPosition?.Invoke (this, new (col.Value, row.Value));
     }
 
     /// <summary>Paste the clipboard contents into the current selected position.</summary>
@@ -3741,7 +1979,7 @@ public void Paste ()
             _historyText.Add (
                               [.. addedLine],
                               CursorPosition,
-                              HistoryText.LineStatus.Added
+                              TextEditingLineStatus.Added
                              );
 
             _model.AddLine (CurrentRow, runeList);
@@ -3750,7 +1988,7 @@ public void Paste ()
             _historyText.Add (
                               [new (GetCurrentLine ())],
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             SetNeedsDraw ();
@@ -3771,7 +2009,7 @@ public void Paste ()
                 _historyText.ReplaceLast (
                                           [new (GetCurrentLine ())],
                                           CursorPosition,
-                                          HistoryText.LineStatus.Original
+                                          TextEditingLineStatus.Original
                                          );
             }
 
@@ -3957,7 +2195,7 @@ public void Undo ()
     /// <summary>
     ///     Sets the <see cref="View.Driver"/> to an appropriate color for rendering the given <paramref name="idxCol"/>
     ///     of the current <paramref name="line"/>. Override to provide custom coloring by calling
-    ///     <see cref="View.SetAttribute"/> Defaults to <see cref="ColorScheme.Normal"/>.
+    ///     <see cref="View.SetAttribute"/> Defaults to <see cref="Scheme.Normal"/>.
     /// </summary>
     /// <param name="line">The line.</param>
     /// <param name="idxCol">The col index.</param>
@@ -3975,14 +2213,14 @@ protected virtual void OnDrawNormalColor (List<Cell> line, int idxCol, int idxRo
         }
         else
         {
-            SetAttribute (GetNormalColor ());
+            SetAttribute (GetAttributeForRole (VisualRole.Normal));
         }
     }
 
     /// <summary>
     ///     Sets the <see cref="View.Driver"/> to an appropriate color for rendering the given <paramref name="idxCol"/>
     ///     of the current <paramref name="line"/>. Override to provide custom coloring by calling
-    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="ColorScheme.Focus"/>.
+    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="Scheme.Focus"/>.
     /// </summary>
     /// <param name="line">The line.</param>
     /// <param name="idxCol">The col index.</param>
@@ -3994,25 +2232,22 @@ protected virtual void OnDrawReadOnlyColor (List<Cell> line, int idxCol, int idx
         var ev = new CellEventArgs (line, idxCol, unwrappedPos);
         DrawReadOnlyColor?.Invoke (this, ev);
 
-        Attribute? cellAttribute = line [idxCol].Attribute is { } ? line [idxCol].Attribute : ColorScheme?.Disabled;
-        Attribute attribute;
+        Attribute? cellAttribute = line [idxCol].Attribute is { } ? line [idxCol].Attribute : GetAttributeForRole (VisualRole.ReadOnly);
 
         if (cellAttribute!.Value.Foreground == cellAttribute.Value.Background)
         {
-            attribute = new (cellAttribute.Value.Foreground, cellAttribute.Value.Background);
+            SetAttribute (new (cellAttribute.Value.Foreground, cellAttribute.Value.Background, cellAttribute.Value.Style));
         }
         else
         {
-            attribute = new (cellAttribute.Value.Foreground, ColorScheme!.Focus.Background);
+            SetAttributeForRole (VisualRole.ReadOnly);
         }
-
-        SetAttribute (attribute);
     }
 
     /// <summary>
     ///     Sets the <see cref="View.Driver"/> to an appropriate color for rendering the given <paramref name="idxCol"/>
     ///     of the current <paramref name="line"/>. Override to provide custom coloring by calling
-    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="ColorScheme.Focus"/>.
+    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="Scheme.Focus"/>.
     /// </summary>
     /// <param name="line">The line.</param>
     /// <param name="idxCol">The col index.</param>
@@ -4027,26 +2262,19 @@ protected virtual void OnDrawSelectionColor (List<Cell> line, int idxCol, int id
         if (line [idxCol].Attribute is { })
         {
             Attribute? attribute = line [idxCol].Attribute;
-
-            SetAttribute (
-                                 new (attribute!.Value.Background, attribute.Value.Foreground)
-                                );
+            Attribute? active = GetAttributeForRole (VisualRole.Active);
+            SetAttribute (new (active!.Value.Foreground, active.Value.Background, attribute!.Value.Style));
         }
         else
         {
-            SetAttribute (
-                                 new (
-                                      ColorScheme!.Focus.Background,
-                                      ColorScheme!.Focus.Foreground
-                                     )
-                                );
+            SetAttributeForRole (VisualRole.Active);
         }
     }
 
     /// <summary>
     ///     Sets the <see cref="View.Driver"/> to an appropriate color for rendering the given <paramref name="idxCol"/>
     ///     of the current <paramref name="line"/>. Override to provide custom coloring by calling
-    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="ColorScheme.HotFocus"/>.
+    ///     <see cref="View.SetAttribute(Attribute)"/> Defaults to <see cref="Scheme.HotFocus"/>.
     /// </summary>
     /// <param name="line">The line.</param>
     /// <param name="idxCol">The col index.</param>
@@ -4065,16 +2293,10 @@ protected virtual void OnDrawUsedColor (List<Cell> line, int idxCol, int idxRow)
         }
         else
         {
-            SetValidUsedColor (ColorScheme?.Focus);
+            SetValidUsedColor (GetAttributeForRole (VisualRole.Focus));
         }
     }
 
-    /// <summary>
-    ///     Sets the driver to the default color for the control where no text is being rendered. Defaults to
-    ///     <see cref="ColorScheme.Normal"/>.
-    /// </summary>
-    protected virtual void SetNormalColor () { SetAttribute (GetNormalColor ()); }
-
     private void Adjust ()
     {
         (int width, int height) offB = OffSetBackground ();
@@ -4150,16 +2372,17 @@ private void Adjust ()
 
     private PopoverMenu CreateContextMenu ()
     {
-        PopoverMenu menu = new (new List<View> ()
-                    {
-            new MenuItemv2 (this, Command.SelectAll, Strings.ctxSelectAll),
-            new MenuItemv2 (this, Command.DeleteAll, Strings.ctxDeleteAll),
-            new MenuItemv2 (this, Command.Copy, Strings.ctxCopy),
-            new MenuItemv2 (this, Command.Cut, Strings.ctxCut),
-            new MenuItemv2 (this, Command.Paste, Strings.ctxPaste),
-            new MenuItemv2 (this, Command.Undo, Strings.ctxUndo),
-            new MenuItemv2 (this, Command.Redo, Strings.ctxRedo),
-        });
+        PopoverMenu menu = new (
+                                new List<View>
+                                {
+                                    new MenuItemv2 (this, Command.SelectAll, Strings.ctxSelectAll),
+                                    new MenuItemv2 (this, Command.DeleteAll, Strings.ctxDeleteAll),
+                                    new MenuItemv2 (this, Command.Copy, Strings.ctxCopy),
+                                    new MenuItemv2 (this, Command.Cut, Strings.ctxCut),
+                                    new MenuItemv2 (this, Command.Paste, Strings.ctxPaste),
+                                    new MenuItemv2 (this, Command.Undo, Strings.ctxUndo),
+                                    new MenuItemv2 (this, Command.Redo, Strings.ctxRedo)
+                                });
 
         menu.KeyChanged += ContextMenu_KeyChanged;
 
@@ -4221,7 +2444,7 @@ private void ClearRegion ()
             _historyText.Add (
                               new (removedLines),
                               CursorPosition,
-                              HistoryText.LineStatus.Removed
+                              TextEditingLineStatus.Removed
                              );
 
             UpdateWrapModel ();
@@ -4252,7 +2475,7 @@ private void ClearRegion ()
         _historyText.Add (
                           new (removedLines),
                           CursorPosition,
-                          HistoryText.LineStatus.Removed
+                          TextEditingLineStatus.Removed
                          );
 
         UpdateWrapModel ();
@@ -4299,7 +2522,7 @@ private bool DeleteTextBackwards ()
             _historyText.Add (
                               new () { new (currentLine) },
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             if (CurrentColumn < _leftColumn)
@@ -4334,7 +2557,7 @@ private bool DeleteTextBackwards ()
             _historyText.Add (
                               removedLines,
                               new (CurrentColumn, prowIdx),
-                              HistoryText.LineStatus.Removed
+                              TextEditingLineStatus.Removed
                              );
 
             int prevCount = prevRow.Count;
@@ -4351,7 +2574,7 @@ private bool DeleteTextBackwards ()
             _historyText.Add (
                               new () { GetCurrentLine () },
                               new (CurrentColumn, prowIdx),
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             CurrentColumn = prevCount;
@@ -4386,7 +2609,7 @@ private bool DeleteTextForwards ()
 
             removedLines.Add (new (nextLine));
 
-            _historyText.Add (removedLines, CursorPosition, HistoryText.LineStatus.Removed);
+            _historyText.Add (removedLines, CursorPosition, TextEditingLineStatus.Removed);
 
             currentLine.AddRange (nextLine);
             _model.RemoveLine (CurrentRow + 1);
@@ -4394,7 +2617,7 @@ private bool DeleteTextForwards ()
             _historyText.Add (
                               new () { new (currentLine) },
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             if (_wordWrap)
@@ -4413,7 +2636,7 @@ private bool DeleteTextForwards ()
             _historyText.Add (
                               [ [.. currentLine]],
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             if (_wordWrap)
@@ -4422,13 +2645,13 @@ private bool DeleteTextForwards ()
             }
 
             DoSetNeedsDraw (
-                               new (
-                                    CurrentColumn - _leftColumn,
-                                    CurrentRow - _topRow,
-                                    Viewport.Width,
-                                    Math.Max (CurrentRow - _topRow + 1, 0)
-                                   )
-                              );
+                            new (
+                                 CurrentColumn - _leftColumn,
+                                 CurrentRow - _topRow,
+                                 Viewport.Width,
+                                 Math.Max (CurrentRow - _topRow + 1, 0)
+                                )
+                           );
         }
 
         UpdateWrapModel ();
@@ -4646,7 +2869,7 @@ private string GetSelectedRegion ()
         return new ValueTuple<int, int> (line, col);
     }
 
-    private void HistoryText_ChangeText (object sender, HistoryText.HistoryTextItemEventArgs obj)
+    private void HistoryText_ChangeText (object sender, HistoryTextItemEventArgs obj)
     {
         SetWrapModel ();
 
@@ -4682,12 +2905,12 @@ private void HistoryText_ChangeText (object sender, HistoryText.HistoryTextItemE
 
             for (var i = 0; i < obj.Lines.Count; i++)
             {
-                if (i == 0 || obj.LineStatus == HistoryText.LineStatus.Original || obj.LineStatus == HistoryText.LineStatus.Attribute)
+                if (i == 0 || obj.LineStatus == TextEditingLineStatus.Original || obj.LineStatus == TextEditingLineStatus.Attribute)
                 {
                     _model.ReplaceLine (startLine, obj.Lines [i]);
                 }
-                else if (obj is { IsUndoing: true, LineStatus: HistoryText.LineStatus.Removed }
-                                or { IsUndoing: false, LineStatus: HistoryText.LineStatus.Added })
+                else if (obj is { IsUndoing: true, LineStatus: TextEditingLineStatus.Removed }
+                                or { IsUndoing: false, LineStatus: TextEditingLineStatus.Added })
                 {
                     _model.AddLine (startLine, obj.Lines [i]);
                 }
@@ -4776,7 +2999,7 @@ private void InsertAllText (string text, bool fromClipboard = false)
             _historyText.Add (
                               [new (line)],
                               CursorPosition,
-                              HistoryText.LineStatus.Replaced
+                              TextEditingLineStatus.Replaced
                              );
 
             if (!_wordWrap && CurrentColumn - _leftColumn > Viewport.Width)
@@ -4836,7 +3059,7 @@ private void InsertAllText (string text, bool fromClipboard = false)
             addedLines.Last ().InsertRange (addedLines.Last ().Count, rest);
         }
 
-        _historyText.Add (addedLines, CursorPosition, HistoryText.LineStatus.Added);
+        _historyText.Add (addedLines, CursorPosition, TextEditingLineStatus.Added);
 
         // Now adjust column and row positions
         CurrentRow += lines.Count - 1;
@@ -4846,7 +3069,7 @@ private void InsertAllText (string text, bool fromClipboard = false)
         _historyText.Add (
                           [new (line)],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -4903,7 +3126,7 @@ private bool InsertText (Key a, Attribute? attribute = null)
         _historyText.Add (
                           [new (GetCurrentLine ())],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -4954,7 +3177,7 @@ private void KillToEndOfLine ()
                 _historyText.Add (
                                   new (removedLines),
                                   CursorPosition,
-                                  HistoryText.LineStatus.Removed
+                                  TextEditingLineStatus.Removed
                                  );
             }
 
@@ -5000,7 +3223,7 @@ private void KillToEndOfLine ()
         _historyText.Add (
                           [ [.. GetCurrentLine ()]],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -5078,7 +3301,7 @@ private void KillToLeftStart ()
                 _historyText.Add (
                                   [.. removedLine],
                                   CursorPosition,
-                                  HistoryText.LineStatus.Removed
+                                  TextEditingLineStatus.Removed
                                  );
 
                 CurrentColumn = currentLine.Count;
@@ -5107,7 +3330,7 @@ private void KillToLeftStart ()
         _historyText.Add (
                           [ [.. GetCurrentLine ()]],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -5138,7 +3361,7 @@ private void KillWordBackward ()
             _historyText.ReplaceLast (
                                       [ [.. GetCurrentLine ()]],
                                       CursorPosition,
-                                      HistoryText.LineStatus.Replaced
+                                      TextEditingLineStatus.Replaced
                                      );
 
             UpdateWrapModel ();
@@ -5177,7 +3400,7 @@ [ [.. GetCurrentLine ()]],
         _historyText.Add (
                           [ [.. GetCurrentLine ()]],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -5206,7 +3429,7 @@ private void KillWordForward ()
             _historyText.ReplaceLast (
                                       [ [.. GetCurrentLine ()]],
                                       CursorPosition,
-                                      HistoryText.LineStatus.Replaced
+                                      TextEditingLineStatus.Replaced
                                      );
 
             UpdateWrapModel ();
@@ -5236,7 +3459,7 @@ [ [.. GetCurrentLine ()]],
         _historyText.Add (
                           [ [.. GetCurrentLine ()]],
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         UpdateWrapModel ();
@@ -5622,7 +3845,7 @@ private bool ProcessBackTab ()
                 _historyText.Add (
                                   new () { new (GetCurrentLine ()) },
                                   CursorPosition,
-                                  HistoryText.LineStatus.Replaced
+                                  TextEditingLineStatus.Replaced
                                  );
             }
 
@@ -5688,10 +3911,10 @@ private void ProcessDeleteCharRight ()
         return cell.Attribute;
     }
 
-    // If InheritsPreviousColorScheme is enabled this method will check if the rune cell on
-    // the row and col location and around has a not null color scheme. If it's null will set it with
-    // the very most previous valid color scheme.
-    private void ProcessInheritsPreviousColorScheme (int row, int col)
+    // If InheritsPreviousScheme is enabled this method will check if the rune cell on
+    // the row and col location and around has a not null scheme. If it's null will set it with
+    // the very most previous valid scheme.
+    private void ProcessInheritsPreviousScheme (int row, int col)
     {
         if (!InheritsPreviousAttribute || (Lines == 1 && GetLine (Lines).Count == 0))
         {
@@ -6122,7 +4345,7 @@ private bool ProcessEnterKey (ICommandContext? commandContext)
 
         addedLines.Add (new (_model.GetLine (CurrentRow + 1)));
 
-        _historyText.Add (addedLines, CursorPosition, HistoryText.LineStatus.Added);
+        _historyText.Add (addedLines, CursorPosition, TextEditingLineStatus.Added);
 
         CurrentRow++;
 
@@ -6139,7 +4362,7 @@ private bool ProcessEnterKey (ICommandContext? commandContext)
         _historyText.Add (
                           new () { new (GetCurrentLine ()) },
                           CursorPosition,
-                          HistoryText.LineStatus.Replaced
+                          TextEditingLineStatus.Replaced
                          );
 
         if (!_wordWrap && CurrentColumn < _leftColumn)
@@ -6304,8 +4527,8 @@ private void SetOverwrite (bool overwrite)
     private void SetValidUsedColor (Attribute? attribute)
     {
         // BUGBUG: (v2 truecolor) This code depends on 8-bit color names; disabling for now
-        //if ((colorScheme!.HotNormal.Foreground & colorScheme.Focus.Background) == colorScheme.Focus.Foreground) {
-        SetAttribute (new (attribute!.Value.Background, attribute!.Value.Foreground));
+        //if ((scheme!.HotNormal.Foreground & scheme.Focus.Background) == scheme.Focus.Foreground) {
+        SetAttribute (new (attribute!.Value.Background, attribute!.Value.Foreground, attribute!.Value.Style));
     }
 
     /// <summary>Restore from original model.</summary>
@@ -6337,7 +4560,7 @@ private void ShowContextMenu (bool keyboard)
             _currentCulture = Thread.CurrentThread.CurrentUICulture;
         }
 
-        ContextMenu?.MakeVisible(ViewportToScreen(new Point (CursorPosition.X, CursorPosition.Y)));
+        ContextMenu?.MakeVisible (ViewportToScreen (new Point (CursorPosition.X, CursorPosition.Y)));
     }
 
     private void StartSelecting ()
@@ -6387,7 +4610,7 @@ private string StringFromRunes (List<Cell> cells)
 
     private void TextView_SuperViewChanged (object sender, SuperViewChangedEventArgs e)
     {
-        if (e.SuperView is {})
+        if (e.SuperView is { })
         {
             if (Autocomplete.HostControl is null)
             {
@@ -6512,6 +4735,18 @@ private void WrapTextModel ()
     }
 
     /// <inheritdoc />
+    public bool EnableForDesign ()
+    {
+        Text = """
+               TextView provides a fully featured multi-line text editor.
+               It supports word wrap and history for undo.
+               """;
+
+        return true;
+    }
+
+
+    /// <inheritdoc/>
     protected override void Dispose (bool disposing)
     {
         if (disposing && ContextMenu is { })
@@ -6520,6 +4755,7 @@ protected override void Dispose (bool disposing)
             ContextMenu.Dispose ();
             ContextMenu = null;
         }
+
         base.Dispose (disposing);
     }
 }
diff --git a/Terminal.Gui/Views/TimeField.cs b/Terminal.Gui/Views/TextInput/TimeField.cs
similarity index 100%
rename from Terminal.Gui/Views/TimeField.cs
rename to Terminal.Gui/Views/TextInput/TimeField.cs
diff --git a/Terminal.Gui/Views/TextInput/WordWrapManager.cs b/Terminal.Gui/Views/TextInput/WordWrapManager.cs
new file mode 100644
index 0000000000..a167ad6cd3
--- /dev/null
+++ b/Terminal.Gui/Views/TextInput/WordWrapManager.cs
@@ -0,0 +1,421 @@
+#nullable enable
+namespace Terminal.Gui;
+
+/// <summary>
+///     Manages word wrapping for a <see cref="TextModel"/> in a <see cref="TextView"/>.
+/// </summary>
+/// <remarks>
+///     The <see cref="WordWrapManager"/> class provides functionality to handle word wrapping for multi-line text.
+///     It works with a <see cref="TextModel"/> to manage wrapped lines, calculate positions, and update the model
+///     when text is added, removed, or modified. This is used internally by text input controls like
+///     <see cref="TextView"/>
+///     to ensure proper word wrapping behavior.
+/// </remarks>
+internal class WordWrapManager (TextModel model)
+{
+    private int _frameWidth;
+    private bool _isWrapModelRefreshing;
+    private List<WrappedLine> _wrappedModelLines = [];
+    public TextModel Model { get; private set; } = model;
+
+    public void AddLine (int row, int col)
+    {
+        int modelRow = GetModelLineFromWrappedLines (row);
+        int modelCol = GetModelColFromWrappedLines (row, col);
+        List<Cell> line = GetCurrentLine (modelRow);
+        int restCount = line.Count - modelCol;
+        List<Cell> rest = line.GetRange (modelCol, restCount);
+        line.RemoveRange (modelCol, restCount);
+        Model.AddLine (modelRow + 1, rest);
+        _isWrapModelRefreshing = true;
+        WrapModel (_frameWidth, out _, out _, out _, out _, modelRow + 1);
+        _isWrapModelRefreshing = false;
+    }
+
+    public int GetModelColFromWrappedLines (int line, int col)
+    {
+        if (_wrappedModelLines?.Count == 0)
+        {
+            return 0;
+        }
+
+        int modelLine = GetModelLineFromWrappedLines (line);
+        int firstLine = _wrappedModelLines.IndexOf (r => r.ModelLine == modelLine);
+        var modelCol = 0;
+
+        for (int i = firstLine; i <= Math.Min (line, _wrappedModelLines!.Count - 1); i++)
+        {
+            WrappedLine wLine = _wrappedModelLines [i];
+
+            if (i < line)
+            {
+                modelCol += wLine.ColWidth;
+            }
+            else
+            {
+                modelCol += col;
+            }
+        }
+
+        return modelCol;
+    }
+
+    public int GetModelLineFromWrappedLines (int line)
+    {
+        return _wrappedModelLines.Count > 0
+                   ? _wrappedModelLines [Math.Min (
+                                                   line,
+                                                   _wrappedModelLines.Count - 1
+                                                  )].ModelLine
+                   : 0;
+    }
+
+    public int GetWrappedLineColWidth (int line, int col, WordWrapManager wrapManager)
+    {
+        if (_wrappedModelLines?.Count == 0)
+        {
+            return 0;
+        }
+
+        List<WrappedLine> wModelLines = wrapManager._wrappedModelLines;
+        int modelLine = GetModelLineFromWrappedLines (line);
+        int firstLine = _wrappedModelLines.IndexOf (r => r.ModelLine == modelLine);
+        var modelCol = 0;
+        var colWidthOffset = 0;
+        int i = firstLine;
+
+        while (modelCol < col)
+        {
+            WrappedLine wLine = _wrappedModelLines! [i];
+            WrappedLine wLineToCompare = wModelLines [i];
+
+            if (wLine.ModelLine != modelLine || wLineToCompare.ModelLine != modelLine)
+            {
+                break;
+            }
+
+            modelCol += Math.Max (wLine.ColWidth, wLineToCompare.ColWidth);
+            colWidthOffset += wLine.ColWidth - wLineToCompare.ColWidth;
+
+            if (modelCol > col)
+            {
+                modelCol += col - modelCol;
+            }
+
+            i++;
+        }
+
+        return modelCol - colWidthOffset;
+    }
+
+    public bool Insert (int row, int col, Cell cell)
+    {
+        List<Cell> line = GetCurrentLine (GetModelLineFromWrappedLines (row));
+        line.Insert (GetModelColFromWrappedLines (row, col), cell);
+
+        if (line.Count > _frameWidth)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool RemoveAt (int row, int col)
+    {
+        int modelRow = GetModelLineFromWrappedLines (row);
+        List<Cell> line = GetCurrentLine (modelRow);
+        int modelCol = GetModelColFromWrappedLines (row, col);
+
+        if (modelCol > line.Count)
+        {
+            Model.RemoveLine (modelRow);
+            RemoveAt (row, 0);
+
+            return false;
+        }
+
+        if (modelCol < line.Count)
+        {
+            line.RemoveAt (modelCol);
+        }
+
+        if (line.Count > _frameWidth || (row + 1 < _wrappedModelLines.Count && _wrappedModelLines [row + 1].ModelLine == modelRow))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool RemoveLine (int row, int col, out bool lineRemoved, bool forward = true)
+    {
+        lineRemoved = false;
+        int modelRow = GetModelLineFromWrappedLines (row);
+        List<Cell> line = GetCurrentLine (modelRow);
+        int modelCol = GetModelColFromWrappedLines (row, col);
+
+        if (modelCol == 0 && line.Count == 0)
+        {
+            Model.RemoveLine (modelRow);
+
+            return false;
+        }
+
+        if (modelCol < line.Count)
+        {
+            if (forward)
+            {
+                line.RemoveAt (modelCol);
+
+                return true;
+            }
+
+            if (modelCol - 1 > -1)
+            {
+                line.RemoveAt (modelCol - 1);
+
+                return true;
+            }
+        }
+
+        lineRemoved = true;
+
+        if (forward)
+        {
+            if (modelRow + 1 == Model.Count)
+            {
+                return false;
+            }
+
+            List<Cell> nextLine = Model.GetLine (modelRow + 1);
+            line.AddRange (nextLine);
+            Model.RemoveLine (modelRow + 1);
+
+            if (line.Count > _frameWidth)
+            {
+                return true;
+            }
+        }
+        else
+        {
+            if (modelRow == 0)
+            {
+                return false;
+            }
+
+            List<Cell> prevLine = Model.GetLine (modelRow - 1);
+            prevLine.AddRange (line);
+            Model.RemoveLine (modelRow);
+
+            if (prevLine.Count > _frameWidth)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public bool RemoveRange (int row, int index, int count)
+    {
+        int modelRow = GetModelLineFromWrappedLines (row);
+        List<Cell> line = GetCurrentLine (modelRow);
+        int modelCol = GetModelColFromWrappedLines (row, index);
+
+        try
+        {
+            line.RemoveRange (modelCol, count);
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public List<List<Cell>> ToListRune (List<string> textList)
+    {
+        List<List<Cell>> runesList = new ();
+
+        foreach (string text in textList)
+        {
+            runesList.Add (Cell.ToCellList (text));
+        }
+
+        return runesList;
+    }
+
+    public void UpdateModel (
+        TextModel model,
+        out int nRow,
+        out int nCol,
+        out int nStartRow,
+        out int nStartCol,
+        int row,
+        int col,
+        int startRow,
+        int startCol,
+        bool preserveTrailingSpaces
+    )
+    {
+        _isWrapModelRefreshing = true;
+        Model = model;
+
+        WrapModel (
+                   _frameWidth,
+                   out nRow,
+                   out nCol,
+                   out nStartRow,
+                   out nStartCol,
+                   row,
+                   col,
+                   startRow,
+                   startCol,
+                   0,
+                   preserveTrailingSpaces
+                  );
+        _isWrapModelRefreshing = false;
+    }
+
+    public TextModel WrapModel (
+        int width,
+        out int nRow,
+        out int nCol,
+        out int nStartRow,
+        out int nStartCol,
+        int row = 0,
+        int col = 0,
+        int startRow = 0,
+        int startCol = 0,
+        int tabWidth = 0,
+        bool preserveTrailingSpaces = true
+    )
+    {
+        _frameWidth = width;
+
+        int modelRow = _isWrapModelRefreshing ? row : GetModelLineFromWrappedLines (row);
+        int modelCol = _isWrapModelRefreshing ? col : GetModelColFromWrappedLines (row, col);
+        int modelStartRow = _isWrapModelRefreshing ? startRow : GetModelLineFromWrappedLines (startRow);
+
+        int modelStartCol =
+            _isWrapModelRefreshing ? startCol : GetModelColFromWrappedLines (startRow, startCol);
+        var wrappedModel = new TextModel ();
+        var lines = 0;
+        nRow = 0;
+        nCol = 0;
+        nStartRow = 0;
+        nStartCol = 0;
+        bool isRowAndColSet = row == 0 && col == 0;
+        bool isStartRowAndColSet = startRow == 0 && startCol == 0;
+        List<WrappedLine> wModelLines = new ();
+
+        for (var i = 0; i < Model.Count; i++)
+        {
+            List<Cell> line = Model.GetLine (i);
+
+            List<List<Cell>> wrappedLines = ToListRune (
+                                                        TextFormatter.Format (
+                                                                              Cell.ToString (line),
+                                                                              width,
+                                                                              Alignment.Start,
+                                                                              true,
+                                                                              preserveTrailingSpaces,
+                                                                              tabWidth
+                                                                             )
+                                                       );
+            var sumColWidth = 0;
+
+            for (var j = 0; j < wrappedLines.Count; j++)
+            {
+                List<Cell> wrapLine = wrappedLines [j];
+
+                if (!isRowAndColSet && modelRow == i)
+                {
+                    if (nCol + wrapLine.Count <= modelCol)
+                    {
+                        nCol += wrapLine.Count;
+                        nRow = lines;
+
+                        if (nCol == modelCol)
+                        {
+                            nCol = wrapLine.Count;
+                            isRowAndColSet = true;
+                        }
+                        else if (j == wrappedLines.Count - 1)
+                        {
+                            nCol = wrapLine.Count - j + modelCol - nCol;
+                            isRowAndColSet = true;
+                        }
+                    }
+                    else
+                    {
+                        int offset = nCol + wrapLine.Count - modelCol;
+                        nCol = wrapLine.Count - offset;
+                        nRow = lines;
+                        isRowAndColSet = true;
+                    }
+                }
+
+                if (!isStartRowAndColSet && modelStartRow == i)
+                {
+                    if (nStartCol + wrapLine.Count <= modelStartCol)
+                    {
+                        nStartCol += wrapLine.Count;
+                        nStartRow = lines;
+
+                        if (nStartCol == modelStartCol)
+                        {
+                            nStartCol = wrapLine.Count;
+                            isStartRowAndColSet = true;
+                        }
+                        else if (j == wrappedLines.Count - 1)
+                        {
+                            nStartCol = wrapLine.Count - j + modelStartCol - nStartCol;
+                            isStartRowAndColSet = true;
+                        }
+                    }
+                    else
+                    {
+                        int offset = nStartCol + wrapLine.Count - modelStartCol;
+                        nStartCol = wrapLine.Count - offset;
+                        nStartRow = lines;
+                        isStartRowAndColSet = true;
+                    }
+                }
+
+                for (int k = j; k < wrapLine.Count; k++)
+                {
+                    Cell cell = wrapLine [k];
+                    cell.Attribute = line [k].Attribute;
+                    wrapLine [k] = cell;
+                }
+
+                wrappedModel.AddLine (lines, wrapLine);
+                sumColWidth += wrapLine.Count;
+
+                var wrappedLine = new WrappedLine
+                {
+                    ModelLine = i, Row = lines, RowIndex = j, ColWidth = wrapLine.Count
+                };
+                wModelLines.Add (wrappedLine);
+                lines++;
+            }
+        }
+
+        _wrappedModelLines = wModelLines;
+
+        return wrappedModel;
+    }
+
+    private List<Cell> GetCurrentLine (int row) { return Model.GetLine (row); }
+
+    private class WrappedLine
+    {
+        public int ColWidth;
+        public int ModelLine;
+        public int Row;
+        public int RowIndex;
+    }
+}
diff --git a/Terminal.Gui/Views/TextValidateField.cs b/Terminal.Gui/Views/TextValidateField.cs
deleted file mode 100644
index e1560c0771..0000000000
--- a/Terminal.Gui/Views/TextValidateField.cs
+++ /dev/null
@@ -1,753 +0,0 @@
-//
-// TextValidateField.cs: single-line text editor with validation through providers.
-//
-// Authors:
-//	José Miguel Perricone (jmperricone@hotmail.com)
-//
-
-using System.ComponentModel;
-using System.Text.RegularExpressions;
-using Terminal.Gui.TextValidateProviders;
-
-namespace Terminal.Gui
-{
-    namespace TextValidateProviders
-    {
-        /// <summary>TextValidateField Providers Interface. All TextValidateField are created with a ITextValidateProvider.</summary>
-        public interface ITextValidateProvider
-        {
-            /// <summary>Gets the formatted string for display.</summary>
-            string DisplayText { get; }
-
-            /// <summary>Set that this provider uses a fixed width. e.g. Masked ones are fixed.</summary>
-            bool Fixed { get; }
-
-            /// <summary>True if the input is valid, otherwise false.</summary>
-            bool IsValid { get; }
-
-            /// <summary>Set the input text and get the current value.</summary>
-            string Text { get; set; }
-
-            /// <summary>Set Cursor position to <paramref name="pos"/>.</summary>
-            /// <param name="pos"></param>
-            /// <returns>Return first valid position.</returns>
-            int Cursor (int pos);
-
-            /// <summary>Find the last valid character position.</summary>
-            /// <returns>New cursor position.</returns>
-            int CursorEnd ();
-
-            /// <summary>First valid position before <paramref name="pos"/>.</summary>
-            /// <param name="pos"></param>
-            /// <returns>New cursor position if any, otherwise returns <paramref name="pos"/></returns>
-            int CursorLeft (int pos);
-
-            /// <summary>First valid position after <paramref name="pos"/>.</summary>
-            /// <param name="pos">Current position.</param>
-            /// <returns>New cursor position if any, otherwise returns <paramref name="pos"/></returns>
-            int CursorRight (int pos);
-
-            /// <summary>Find the first valid character position.</summary>
-            /// <returns>New cursor position.</returns>
-            int CursorStart ();
-
-            /// <summary>Deletes the current character in <paramref name="pos"/>.</summary>
-            /// <param name="pos"></param>
-            /// <returns>true if the character was successfully removed, otherwise false.</returns>
-            bool Delete (int pos);
-
-            /// <summary>Insert character <paramref name="ch"/> in position <paramref name="pos"/>.</summary>
-            /// <param name="ch"></param>
-            /// <param name="pos"></param>
-            /// <returns>true if the character was successfully inserted, otherwise false.</returns>
-            bool InsertAt (char ch, int pos);
-
-            /// <summary>Method that invoke the <see cref="TextChanged"/> event if it's defined.</summary>
-            /// <param name="oldValue">The previous text before replaced.</param>
-            /// <returns>Returns the <see cref="EventArgs{T}"/></returns>
-            void OnTextChanged (EventArgs<string> oldValue);
-
-            /// <summary>
-            ///     Changed event, raised when the text has changed.
-            ///     <remarks>
-            ///         This event is raised when the <see cref="Text"/> changes. The passed <see cref="EventArgs"/> is a
-            ///         <see cref="string"/> containing the old value.
-            ///     </remarks>
-            /// </summary>
-            event EventHandler<EventArgs<string>> TextChanged;
-        }
-
-        //////////////////////////////////////////////////////////////////////////////
-        // PROVIDERS
-        //////////////////////////////////////////////////////////////////////////////
-
-        #region NetMaskedTextProvider
-
-        /// <summary>
-        ///     .Net MaskedTextProvider Provider for TextValidateField.
-        ///     <para></para>
-        ///     <para>
-        ///         <a
-        ///             href="https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.maskedtextprovider?view=net-5.0">
-        ///             Wrapper around MaskedTextProvider
-        ///         </a>
-        ///     </para>
-        ///     <para>
-        ///         <a
-        ///             href="https://docs.microsoft.com/en-us/dotnet/api/system.windows.forms.maskedtextbox.mask?view=net-5.0">
-        ///             Masking elements
-        ///         </a>
-        ///     </para>
-        /// </summary>
-        public class NetMaskedTextProvider : ITextValidateProvider
-        {
-            private MaskedTextProvider _provider;
-
-            /// <summary>Empty Constructor</summary>
-            public NetMaskedTextProvider (string mask) { Mask = mask; }
-
-            /// <summary>Mask property</summary>
-            public string Mask
-            {
-                get => _provider?.Mask;
-                set
-                {
-                    string current = _provider != null
-                                         ? _provider.ToString (false, false)
-                                         : string.Empty;
-                    _provider = new MaskedTextProvider (value == string.Empty ? "&&&&&&" : value);
-
-                    if (!string.IsNullOrEmpty (current))
-                    {
-                        _provider.Set (current);
-                    }
-                }
-            }
-
-            /// <inheritdoc/>
-            public event EventHandler<EventArgs<string>> TextChanged;
-
-            /// <inheritdoc/>
-            public string Text
-            {
-                get => _provider.ToString ();
-                set => _provider.Set (value);
-            }
-
-            /// <inheritdoc/>
-            public bool IsValid => _provider.MaskCompleted;
-
-            /// <inheritdoc/>
-            public bool Fixed => true;
-
-            /// <inheritdoc/>
-            public string DisplayText => _provider.ToDisplayString ();
-
-            /// <inheritdoc/>
-            public int Cursor (int pos)
-            {
-                if (pos < 0)
-                {
-                    return CursorStart ();
-                }
-
-                if (pos > _provider.Length)
-                {
-                    return CursorEnd ();
-                }
-
-                int p = _provider.FindEditPositionFrom (pos, false);
-
-                if (p == -1)
-                {
-                    p = _provider.FindEditPositionFrom (pos, true);
-                }
-
-                return p;
-            }
-
-            /// <inheritdoc/>
-            public int CursorStart ()
-            {
-                return _provider.IsEditPosition (0)
-                           ? 0
-                           : _provider.FindEditPositionFrom (0, true);
-            }
-
-            /// <inheritdoc/>
-            public int CursorEnd ()
-            {
-                return _provider.IsEditPosition (_provider.Length - 1)
-                           ? _provider.Length - 1
-                           : _provider.FindEditPositionFrom (_provider.Length, false);
-            }
-
-            /// <inheritdoc/>
-            public int CursorLeft (int pos)
-            {
-                int c = _provider.FindEditPositionFrom (pos - 1, false);
-
-                return c == -1 ? pos : c;
-            }
-
-            /// <inheritdoc/>
-            public int CursorRight (int pos)
-            {
-                int c = _provider.FindEditPositionFrom (pos + 1, true);
-
-                return c == -1 ? pos : c;
-            }
-
-            /// <inheritdoc/>
-            public bool Delete (int pos)
-            {
-                string oldValue = Text;
-                bool result = _provider.Replace (' ', pos); // .RemoveAt (pos);
-
-                if (result)
-                {
-                    OnTextChanged (new EventArgs<string> (in oldValue));
-                }
-
-                return result;
-            }
-
-            /// <inheritdoc/>
-            public bool InsertAt (char ch, int pos)
-            {
-                string oldValue = Text;
-                bool result = _provider.Replace (ch, pos);
-
-                if (result)
-                {
-                    OnTextChanged (new EventArgs<string> (in oldValue));
-                }
-
-                return result;
-            }
-
-            /// <inheritdoc/>
-            public void OnTextChanged (EventArgs<string> args) { TextChanged?.Invoke (this, args); }
-        }
-
-        #endregion
-
-        #region TextRegexProvider
-
-        /// <summary>Regex Provider for TextValidateField.</summary>
-        public class TextRegexProvider : ITextValidateProvider
-        {
-            private List<Rune> _pattern;
-            private Regex _regex;
-            private List<Rune> _text;
-
-            /// <summary>Empty Constructor.</summary>
-            public TextRegexProvider (string pattern) { Pattern = pattern; }
-
-            /// <summary>Regex pattern property.</summary>
-            public string Pattern
-            {
-                get => StringExtensions.ToString (_pattern);
-                set
-                {
-                    _pattern = value.ToRuneList ();
-                    CompileMask ();
-                    SetupText ();
-                }
-            }
-
-            /// <summary>When true, validates with the regex pattern on each input, preventing the input if it's not valid.</summary>
-            public bool ValidateOnInput { get; set; } = true;
-
-            /// <inheritdoc/>
-            public event EventHandler<EventArgs<string>> TextChanged;
-
-            /// <inheritdoc/>
-            public string Text
-            {
-                get => StringExtensions.ToString (_text);
-                set
-                {
-                    _text = value != string.Empty ? value.ToRuneList () : null;
-                    SetupText ();
-                }
-            }
-
-            /// <inheritdoc/>
-            public string DisplayText => Text;
-
-            /// <inheritdoc/>
-            public bool IsValid => Validate (_text);
-
-            /// <inheritdoc/>
-            public bool Fixed => false;
-
-            /// <inheritdoc/>
-            public int Cursor (int pos)
-            {
-                if (pos < 0)
-                {
-                    return CursorStart ();
-                }
-
-                if (pos >= _text.Count)
-                {
-                    return CursorEnd ();
-                }
-
-                return pos;
-            }
-
-            /// <inheritdoc/>
-            public int CursorStart () { return 0; }
-
-            /// <inheritdoc/>
-            public int CursorEnd () { return _text.Count; }
-
-            /// <inheritdoc/>
-            public int CursorLeft (int pos)
-            {
-                if (pos > 0)
-                {
-                    return pos - 1;
-                }
-
-                return pos;
-            }
-
-            /// <inheritdoc/>
-            public int CursorRight (int pos)
-            {
-                if (pos < _text.Count)
-                {
-                    return pos + 1;
-                }
-
-                return pos;
-            }
-
-            /// <inheritdoc/>
-            public bool Delete (int pos)
-            {
-                if (_text.Count > 0 && pos < _text.Count)
-                {
-                    string oldValue = Text;
-                    _text.RemoveAt (pos);
-                    OnTextChanged (new EventArgs<string> (in oldValue));
-                }
-
-                return true;
-            }
-
-            /// <inheritdoc/>
-            public bool InsertAt (char ch, int pos)
-            {
-                List<Rune> aux = _text.ToList ();
-                aux.Insert (pos, (Rune)ch);
-
-                if (Validate (aux) || ValidateOnInput == false)
-                {
-                    string oldValue = Text;
-                    _text.Insert (pos, (Rune)ch);
-                    OnTextChanged (new EventArgs<string> (in oldValue));
-
-                    return true;
-                }
-
-                return false;
-            }
-
-            /// <inheritdoc/>
-            public void OnTextChanged (EventArgs<string> args) { TextChanged?.Invoke (this, args); }
-
-            /// <summary>Compiles the regex pattern for validation./></summary>
-            private void CompileMask () { _regex = new Regex (StringExtensions.ToString (_pattern), RegexOptions.Compiled); }
-
-            private void SetupText ()
-            {
-                if (_text is { } && IsValid)
-                {
-                    return;
-                }
-
-                _text = new List<Rune> ();
-            }
-
-            private bool Validate (List<Rune> text)
-            {
-                Match match = _regex.Match (StringExtensions.ToString (text));
-
-                return match.Success;
-            }
-        }
-
-        #endregion
-    }
-
-    /// <summary>Text field that validates input through a  <see cref="ITextValidateProvider"/></summary>
-    public class TextValidateField : View
-    {
-        private readonly int _defaultLength = 10;
-        private int _cursorPosition;
-        private ITextValidateProvider _provider;
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="TextValidateField"/> class.
-        /// </summary>
-        public TextValidateField ()
-        {
-            Height = Dim.Auto (minimumContentDim: 1);
-            CanFocus = true;
-
-            // Things this view knows how to do
-            AddCommand (
-                        Command.LeftStart,
-                        () =>
-                        {
-                            HomeKeyHandler ();
-
-                            return true;
-                        }
-                       );
-
-            AddCommand (
-                        Command.RightEnd,
-                        () =>
-                        {
-                            EndKeyHandler ();
-
-                            return true;
-                        }
-                       );
-
-            AddCommand (
-                        Command.DeleteCharRight,
-                        () =>
-                        {
-                            DeleteKeyHandler ();
-
-                            return true;
-                        }
-                       );
-
-            AddCommand (
-                        Command.DeleteCharLeft,
-                        () =>
-                        {
-                            BackspaceKeyHandler ();
-
-                            return true;
-                        }
-                       );
-
-            AddCommand (
-                        Command.Left,
-                        () =>
-                        {
-                            CursorLeft ();
-
-                            return true;
-                        }
-                       );
-
-            AddCommand (
-                        Command.Right,
-                        () =>
-                        {
-                            CursorRight ();
-
-                            return true;
-                        }
-                       );
-
-            // Default keybindings for this view
-            KeyBindings.Add (Key.Home, Command.LeftStart);
-            KeyBindings.Add (Key.End, Command.RightEnd);
-
-            KeyBindings.Add (Key.Delete, Command.DeleteCharRight);
-
-            KeyBindings.Add (Key.Backspace, Command.DeleteCharLeft);
-            KeyBindings.Add (Key.CursorLeft, Command.Left);
-            KeyBindings.Add (Key.CursorRight, Command.Right);
-        }
-
-        /// <summary>This property returns true if the input is valid.</summary>
-        public virtual bool IsValid
-        {
-            get
-            {
-                if (_provider is null)
-                {
-                    return false;
-                }
-
-                return _provider.IsValid;
-            }
-        }
-
-        /// <summary>Provider</summary>
-        public ITextValidateProvider Provider
-        {
-            get => _provider;
-            set
-            {
-                _provider = value;
-
-                if (_provider.Fixed)
-                {
-                    Width = _provider.DisplayText == string.Empty
-                                ? _defaultLength
-                                : _provider.DisplayText.Length;
-                }
-
-                // HomeKeyHandler already call SetNeedsDisplay
-                HomeKeyHandler ();
-            }
-        }
-
-        /// <summary>Text</summary>
-        public new string Text
-        {
-            get
-            {
-                if (_provider is null)
-                {
-                    return string.Empty;
-                }
-
-                return _provider.Text;
-            }
-            set
-            {
-                if (_provider is null)
-                {
-                    return;
-                }
-
-                _provider.Text = value;
-
-                SetNeedsDraw ();
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
-        {
-            if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed))
-            {
-                int c = _provider.Cursor (mouseEvent.Position.X - GetMargins (Viewport.Width).left);
-
-                if (_provider.Fixed == false && TextAlignment == Alignment.End && Text.Length > 0)
-                {
-                    c++;
-                }
-
-                _cursorPosition = c;
-                SetFocus ();
-                SetNeedsDraw ();
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        protected override bool OnDrawingContent ()
-        {
-            if (_provider is null)
-            {
-                Move (0, 0);
-                Driver?.AddStr ("Error: ITextValidateProvider not set!");
-
-                return true;
-            }
-
-            Color bgcolor = !IsValid ? new Color (Color.BrightRed) : ColorScheme.Focus.Background;
-            var textColor = new Attribute (ColorScheme.Focus.Foreground, bgcolor);
-
-            (int margin_left, int margin_right) = GetMargins (Viewport.Width);
-
-            Move (0, 0);
-
-            // Left Margin
-            SetAttribute (textColor);
-
-            for (var i = 0; i < margin_left; i++)
-            {
-                Driver?.AddRune ((Rune)' ');
-            }
-
-            // Content
-            SetAttribute (textColor);
-
-            // Content
-            for (var i = 0; i < _provider.DisplayText.Length; i++)
-            {
-                Driver?.AddRune ((Rune)_provider.DisplayText [i]);
-            }
-
-            // Right Margin
-            SetAttribute (textColor);
-
-            for (var i = 0; i < margin_right; i++)
-            {
-                Driver?.AddRune ((Rune)' ');
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected override bool OnKeyDownNotHandled (Key a)
-        {
-            if (_provider is null)
-            {
-                return false;
-            }
-
-            if (a.AsRune == default (Rune))
-            {
-                return false;
-            }
-
-            Rune key = a.AsRune;
-
-            bool inserted = _provider.InsertAt ((char)key.Value, _cursorPosition);
-
-            if (inserted)
-            {
-                CursorRight ();
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public override Point? PositionCursor ()
-        {
-            (int left, _) = GetMargins (Viewport.Width);
-
-            // Fixed = true, is for inputs that have fixed width, like masked ones.
-            // Fixed = false, is for normal input.
-            // When it's right-aligned and it's a normal input, the cursor behaves differently.
-            int curPos;
-
-            if (_provider?.Fixed == false && TextAlignment == Alignment.End)
-            {
-                curPos = _cursorPosition + left - 1;
-            }
-            else
-            {
-                curPos = _cursorPosition + left;
-            }
-            Move (curPos, 0);
-
-            return new (curPos, 0);
-        }
-
-        /// <summary>Delete char at cursor position - 1, moving the cursor.</summary>
-        /// <returns></returns>
-        private bool BackspaceKeyHandler ()
-        {
-            if (_provider.Fixed == false && TextAlignment == Alignment.End && _cursorPosition <= 1)
-            {
-                return false;
-            }
-
-            _cursorPosition = _provider.CursorLeft (_cursorPosition);
-            _provider.Delete (_cursorPosition);
-            SetNeedsDraw ();
-
-            return true;
-        }
-
-        /// <summary>Try to move the cursor to the left.</summary>
-        /// <returns>True if moved.</returns>
-        private bool CursorLeft ()
-        {
-            if (_provider is null)
-            {
-                return false;
-            }
-
-            int current = _cursorPosition;
-            _cursorPosition = _provider.CursorLeft (_cursorPosition);
-            SetNeedsDraw ();
-
-            return current != _cursorPosition;
-        }
-
-        /// <summary>Try to move the cursor to the right.</summary>
-        /// <returns>True if moved.</returns>
-        private bool CursorRight ()
-        {
-            if (_provider is null)
-            {
-                return false;
-            }
-
-            int current = _cursorPosition;
-            _cursorPosition = _provider.CursorRight (_cursorPosition);
-            SetNeedsDraw ();
-
-            return current != _cursorPosition;
-        }
-
-        /// <summary>Deletes char at current position.</summary>
-        /// <returns></returns>
-        private bool DeleteKeyHandler ()
-        {
-            if (_provider.Fixed == false && TextAlignment == Alignment.End)
-            {
-                _cursorPosition = _provider.CursorLeft (_cursorPosition);
-            }
-
-            _provider.Delete (_cursorPosition);
-            SetNeedsDraw ();
-
-            return true;
-        }
-
-        /// <summary>Moves the cursor to the last char.</summary>
-        /// <returns></returns>
-        private bool EndKeyHandler ()
-        {
-            _cursorPosition = _provider.CursorEnd ();
-            SetNeedsDraw ();
-
-            return true;
-        }
-
-        /// <summary>Margins for text alignment.</summary>
-        /// <param name="width">Total width</param>
-        /// <returns>Left and right margins</returns>
-        private (int left, int right) GetMargins (int width)
-        {
-            int count = Text.Length;
-            int total = width - count;
-
-            switch (TextAlignment)
-            {
-                case Alignment.Start:
-                    return (0, total);
-                case Alignment.Center:
-                    return (total / 2, total / 2 + total % 2);
-                case Alignment.End:
-                    return (total, 0);
-                default:
-                    return (0, total);
-            }
-        }
-
-        /// <summary>Moves the cursor to first char.</summary>
-        /// <returns></returns>
-        private bool HomeKeyHandler ()
-        {
-            _cursorPosition = _provider.CursorStart ();
-            SetNeedsDraw ();
-
-            return true;
-        }
-    }
-}
diff --git a/Terminal.Gui/Views/TileView.cs b/Terminal.Gui/Views/TileView.cs
index 398474f48a..0f7631373c 100644
--- a/Terminal.Gui/Views/TileView.cs
+++ b/Terminal.Gui/Views/TileView.cs
@@ -181,10 +181,7 @@ public int IndexOf (View toFind, bool recursive = false)
     /// <inheritdoc/>
     protected override void OnDrawComplete (DrawContext? context)
     {
-        if (ColorScheme is { })
-        {
-            SetAttribute (ColorScheme.Normal);
-        }
+        SetAttributeForRole (Enabled ? VisualRole.Normal : VisualRole.Disabled);
 
         var lc = new LineCanvas ();
 
@@ -239,10 +236,7 @@ protected override void OnDrawComplete (DrawContext? context)
             }
         }
 
-        if (ColorScheme is { })
-        {
-            SetAttribute (ColorScheme.Normal);
-        }
+        SetAttributeForRole (Enabled ? VisualRole.Normal : VisualRole.Disabled);
 
         foreach (KeyValuePair<Point, Rune> p in lc.GetMap (Viewport))
         {
diff --git a/Terminal.Gui/Views/Toplevel.cs b/Terminal.Gui/Views/Toplevel.cs
index 47ad49ab33..21dc01f55e 100644
--- a/Terminal.Gui/Views/Toplevel.cs
+++ b/Terminal.Gui/Views/Toplevel.cs
@@ -33,7 +33,8 @@ public Toplevel ()
         Arrangement = ViewArrangement.Overlapped;
         Width = Dim.Fill ();
         Height = Dim.Fill ();
-        base.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Toplevel);
+
         MouseClick += Toplevel_MouseClick;
     }
 
diff --git a/Terminal.Gui/Views/TreeView/Branch.cs b/Terminal.Gui/Views/TreeView/Branch.cs
index 4c348eaff6..8103710f82 100644
--- a/Terminal.Gui/Views/TreeView/Branch.cs
+++ b/Terminal.Gui/Views/TreeView/Branch.cs
@@ -83,8 +83,8 @@ public virtual void Draw (int y, int availableWidth)
         bool isSelected = _tree.IsSelected (Model);
 
         Attribute textColor =
-            isSelected ? _tree.HasFocus ? _tree.GetFocusColor () : _tree.GetHotNormalColor () : _tree.GetNormalColor ();
-        Attribute symbolColor = _tree.Style.HighlightModelTextOnly ? _tree.GetNormalColor () : textColor;
+            isSelected ? _tree.HasFocus ? _tree.GetAttributeForRole (VisualRole.Focus) : _tree.GetAttributeForRole (VisualRole.HotNormal) : _tree.GetAttributeForRole (VisualRole.Normal);
+        Attribute symbolColor = _tree.Style.HighlightModelTextOnly ? _tree.GetAttributeForRole (VisualRole.Normal) : textColor;
 
         // Everything on line before the expansion run and branch text
         Rune [] prefix = GetLinePrefix ().ToArray ();
@@ -120,12 +120,12 @@ public virtual void Draw (int y, int availableWidth)
             {
                 if (isSelected)
                 {
-                    color = _tree.Style.HighlightModelTextOnly ? _tree.GetHotNormalColor () :
-                            _tree.HasFocus ? _tree.GetHotFocusColor () : _tree.GetHotNormalColor ();
+                    color = _tree.Style.HighlightModelTextOnly ? _tree.GetAttributeForRole (VisualRole.HotNormal) :
+                            _tree.HasFocus ? _tree.GetAttributeForRole (VisualRole.HotFocus) : _tree.GetAttributeForRole (VisualRole.HotNormal);
                 }
                 else
                 {
-                    color = _tree.GetHotNormalColor ();
+                    color = _tree.GetAttributeForRole (VisualRole.HotNormal);
                 }
             }
             else
@@ -135,7 +135,7 @@ public virtual void Draw (int y, int availableWidth)
 
             if (_tree.Style.InvertExpandSymbolColors)
             {
-                color = new (color.Background, color.Foreground);
+                color = new (color.Background, color.Foreground, color.Style);
             }
 
             attr = color;
@@ -189,16 +189,16 @@ public virtual void Draw (int y, int availableWidth)
             availableWidth -= lineBody.Length;
         }
 
-        // default behaviour is for model to use the color scheme
+        // default behaviour is for model to use the scheme
         // of the tree view
         Attribute modelColor = textColor;
 
         // if custom color delegate invoke it
         if (_tree.ColorGetter is { })
         {
-            ColorScheme modelScheme = _tree.ColorGetter (Model);
+            Scheme modelScheme = _tree.ColorGetter (Model);
 
-            // if custom color scheme is defined for this Model
+            // if custom scheme is defined for this Model
             if (modelScheme is { })
             {
                 // use it
@@ -246,7 +246,7 @@ public virtual void Draw (int y, int availableWidth)
             }
         }
 
-        _tree.SetAttribute (_tree.GetNormalColor());
+        _tree.SetAttribute (_tree.GetAttributeForRole (VisualRole.Normal));
     }
 
     /// <summary>Expands the current branch if possible.</summary>
@@ -531,5 +531,5 @@ private bool IsLast ()
         return Parent.ChildBranches.LastOrDefault () == this;
     }
 
-    private static Cell NewCell (Attribute attr, Rune r) { return new() { Rune = r, Attribute = new (attr) }; }
+    private static Cell NewCell (Attribute attr, Rune r) { return new () { Rune = r, Attribute = new (attr) }; }
 }
diff --git a/Terminal.Gui/Views/TreeView/DrawTreeViewLineEventArgs.cs b/Terminal.Gui/Views/TreeView/DrawTreeViewLineEventArgs.cs
index 6cd03747d1..3bea431e0e 100644
--- a/Terminal.Gui/Views/TreeView/DrawTreeViewLineEventArgs.cs
+++ b/Terminal.Gui/Views/TreeView/DrawTreeViewLineEventArgs.cs
@@ -28,7 +28,7 @@ public class DrawTreeViewLineEventArgs<T> where T : class
     public T Model { get; init; }
 
     /// <summary>
-    ///     The rune and color of each symbol that will be rendered.  Note that only <see cref="ColorScheme.Normal"/> is
+    ///     The rune and color of each symbol that will be rendered.  Note that only <see cref="Scheme.Normal"/> is
     ///     respected.  You can modify these to change what is rendered.
     /// </summary>
     /// <remarks>Changing the length of this collection may result in corrupt rendering</remarks>
diff --git a/Terminal.Gui/Views/TreeView/TreeView.cs b/Terminal.Gui/Views/TreeView/TreeView.cs
index b3da43d925..11e4e6744f 100644
--- a/Terminal.Gui/Views/TreeView/TreeView.cs
+++ b/Terminal.Gui/Views/TreeView/TreeView.cs
@@ -3,7 +3,6 @@
 // and code to be used in this library under the MIT license.
 
 using System.Collections.ObjectModel;
-using static Terminal.Gui.SpinnerStyle;
 
 namespace Terminal.Gui;
 
@@ -41,7 +40,6 @@ public TreeView ()
         AspectGetter = o => o is null ? "Null" : o.Text ?? o?.ToString () ?? "Unnamed Node";
     }
 
-
     bool IDesignable.EnableForDesign ()
     {
         var root1 = new TreeNode ("Root1");
@@ -56,6 +54,7 @@ bool IDesignable.EnableForDesign ()
         AddObject (root2);
 
         ExpandAll ();
+
         return true;
     }
 }
@@ -338,10 +337,10 @@ public TreeView ()
     public AspectGetterDelegate<T> AspectGetter { get; set; } = o => o.ToString () ?? "";
 
     /// <summary>
-    ///     Delegate for multi-colored tree views. Return the <see cref="ColorScheme"/> to use for each passed object or
+    ///     Delegate for multi-colored tree views. Return the <see cref="Scheme"/> to use for each passed object or
     ///     null to use the default.
     /// </summary>
-    public Func<T, ColorScheme> ColorGetter { get; set; }
+    public Func<T, Scheme> ColorGetter { get; set; }
 
     /// <summary>The current number of rows in the tree (ignoring the controls bounds).</summary>
     public int ContentHeight => BuildLineMap ().Count ();
@@ -350,7 +349,7 @@ public TreeView ()
     ///     Gets the <see cref="CollectionNavigator"/> that searches the <see cref="Objects"/> collection as the user
     ///     types.
     /// </summary>
-    public IListCollectionNavigator KeystrokeNavigator { get; } = new CollectionNavigator();
+    public IListCollectionNavigator KeystrokeNavigator { get; } = new CollectionNavigator ();
 
     /// <summary>Maximum number of nodes that can be expanded in any given branch.</summary>
     public int MaxDepth { get; set; } = 100;
@@ -429,7 +428,7 @@ public T SelectedObject
 
             if (!ReferenceEquals (oldValue, value))
             {
-                OnSelectionChanged (new SelectionChangedEventArgs<T> (this, oldValue, value));
+                OnSelectionChanged (new (this, oldValue, value));
             }
         }
     }
@@ -452,7 +451,7 @@ public void ClearObjects ()
     {
         SelectedObject = default (T);
         multiSelectedRegions.Clear ();
-        roots = new Dictionary<T, Branch<T>> ();
+        roots = new ();
         InvalidateLineMap ();
         SetNeedsDraw ();
     }
@@ -477,8 +476,10 @@ public void ClearObjects ()
             // TODO: Should this be cancelable?
             ObjectActivatedEventArgs<T> e = new (this, o);
             OnObjectActivated (e);
+
             return true;
         }
+
         return false;
     }
 
@@ -488,7 +489,7 @@ public void AddObject (T o)
     {
         if (!roots.ContainsKey (o))
         {
-            roots.Add (o, new Branch<T> (this, null, o));
+            roots.Add (o, new (this, null, o));
             InvalidateLineMap ();
             SetNeedsDraw ();
         }
@@ -505,7 +506,7 @@ public void AddObjects (IEnumerable<T> collection)
         {
             if (!roots.ContainsKey (o))
             {
-                roots.Add (o, new Branch<T> (this, null, o));
+                roots.Add (o, new (this, null, o));
                 objectsAdded = true;
             }
         }
@@ -566,12 +567,12 @@ public void AdjustSelection (int offset, bool expandSelection = false)
                     {
                         // expand the existing head selection
                         TreeSelection<T> head = multiSelectedRegions.Pop ();
-                        multiSelectedRegions.Push (new TreeSelection<T> (head.Origin, newIdx, map));
+                        multiSelectedRegions.Push (new (head.Origin, newIdx, map));
                     }
                     else
                     {
                         // or start a new multi selection region
-                        multiSelectedRegions.Push (new TreeSelection<T> (map.ElementAt (idx), newIdx, map));
+                        multiSelectedRegions.Push (new (map.ElementAt (idx), newIdx, map));
                     }
                 }
 
@@ -1120,7 +1121,7 @@ protected override bool OnMouseEvent (MouseEventArgs me)
             SetNeedsDraw ();
 
             // trigger activation event
-            OnObjectActivated (new ObjectActivatedEventArgs<T> (this, clickedBranch.Model));
+            OnObjectActivated (new (this, clickedBranch.Model));
 
             // mouse event is handled.
             return true;
@@ -1177,8 +1178,8 @@ protected override bool OnDrawingContent ()
             {
                 // Else clear the line to prevent stale symbols due to scrolling etc
                 Move (0, line);
-                SetAttribute (GetNormalColor ());
-                Driver?.AddStr (new string (' ', Viewport.Width));
+                SetAttribute (GetAttributeForRole (VisualRole.Normal));
+                Driver?.AddStr (new (' ', Viewport.Width));
             }
         }
 
@@ -1253,6 +1254,7 @@ protected override bool OnKeyDown (Key key)
                 return MultiSelect ? new (0, idx - ScrollOffsetVertical) : null;
             }
         }
+
         return base.PositionCursor ();
     }
 
@@ -1350,10 +1352,10 @@ public void SelectAll ()
             return;
         }
 
-        multiSelectedRegions.Push (new TreeSelection<T> (map.ElementAt (0), map.Count, map));
+        multiSelectedRegions.Push (new (map.ElementAt (0), map.Count, map));
         SetNeedsDraw ();
 
-        OnSelectionChanged (new SelectionChangedEventArgs<T> (this, SelectedObject, SelectedObject));
+        OnSelectionChanged (new (this, SelectedObject, SelectedObject));
     }
 
     /// <summary>Called when the <see cref="SelectedObject"/> changes.</summary>
@@ -1621,5 +1623,4 @@ public TreeSelection (Branch<T> from, int toIndex, IReadOnlyCollection<Branch<T>
 
     public Branch<T> Origin { get; }
     public bool Contains (T model) { return included.Contains (model); }
-
 }
diff --git a/Terminal.Gui/Views/Window.cs b/Terminal.Gui/Views/Window.cs
index 2bbfc701c6..bab4bdca00 100644
--- a/Terminal.Gui/Views/Window.cs
+++ b/Terminal.Gui/Views/Window.cs
@@ -8,7 +8,7 @@ namespace Terminal.Gui;
 ///     <para>
 ///         Window has <see cref="View.BorderStyle"/> set to <see cref="LineStyle.Single"/>, <see cref="View.Arrangement"/>
 ///         set to <see cref="ViewArrangement.Overlapped"/>, and
-///         uses the Base <see cref="Colors.ColorSchemes"/> color scheme by default.
+///         uses the "Base" <see cref="Scheme"/> scheme by default.
 ///     </para>
 ///     <para>
 ///         To enable Window to be sized and moved by the user, adjust <see cref="View.Arrangement"/>.
@@ -25,7 +25,7 @@ public Window ()
         CanFocus = true;
         TabStop = TabBehavior.TabGroup;
         Arrangement = ViewArrangement.Overlapped;
-        base.ColorScheme = Colors.ColorSchemes ["Base"]; // TODO: make this a theme property
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base);
         BorderStyle = DefaultBorderStyle;
         base.ShadowStyle = DefaultShadow;
     }
@@ -33,7 +33,7 @@ public Window ()
     /// <summary>
     ///     Gets or sets whether all <see cref="Window"/>s are shown with a shadow effect by default.
     /// </summary>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.None;
 
     // TODO: enable this
@@ -43,8 +43,8 @@ public Window ()
     ///// <remarks>
     ///// This property can be set in a Theme to change the default <see cref="LineStyle"/> for all <see cref="Window"/>s. 
     ///// </remarks>
-    /////[SerializableConfigurationProperty (Scope = typeof (ThemeScope)), JsonConverter (typeof (JsonStringEnumConverter))]
-    ////public static ColorScheme DefaultColorScheme { get; set; } = Colors.ColorSchemes ["Base"];
+    /////[ConfigurationProperty (Scope = typeof (ThemeScope)), JsonConverter (typeof (JsonStringEnumConverter))]
+    ////public static Scheme DefaultScheme { get; set; } = Colors.Schemes ["Base"];
 
     /// <summary>
     ///     The default <see cref="LineStyle"/> for <see cref="Window"/>'s border. The default is
@@ -54,6 +54,6 @@ public Window ()
     ///     This property can be set in a Theme to change the default <see cref="LineStyle"/> for all <see cref="Window"/>
     ///     s.
     /// </remarks>
-    [SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
     public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single;
 }
diff --git a/Terminal.Gui/Views/Wizard/Wizard.cs b/Terminal.Gui/Views/Wizard/Wizard.cs
index cbc6caab91..6384da94f2 100644
--- a/Terminal.Gui/Views/Wizard/Wizard.cs
+++ b/Terminal.Gui/Views/Wizard/Wizard.cs
@@ -145,20 +145,11 @@ public WizardStep? CurrentStep
 
             if (base.Modal)
             {
-                ColorScheme = Colors.ColorSchemes ["Dialog"];
+                SchemeName = "Dialog";
                 BorderStyle = LineStyle.Rounded;
             }
             else
             {
-                if (SuperView is { })
-                {
-                    ColorScheme = SuperView.ColorScheme;
-                }
-                else
-                {
-                    ColorScheme = Colors.ColorSchemes ["Base"];
-                }
-
                 CanFocus = true;
                 BorderStyle = LineStyle.None;
             }
diff --git a/Terminal.sln.DotSettings b/Terminal.sln.DotSettings
index eb3995de14..7456c9bf21 100644
--- a/Terminal.sln.DotSettings
+++ b/Terminal.sln.DotSettings
@@ -411,7 +411,9 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/Environment/UnitTesting/ParallelProcessesCount/@EntryValue">5</s:Int64>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gainsboro/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gonek/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guppie/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Justifier/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=langword/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ogonek/@EntryIndexedValue">True</s:Boolean>
diff --git a/Tests/IntegrationTests/FluentTests/BasicFluentAssertionTests.cs b/Tests/IntegrationTests/FluentTests/BasicFluentAssertionTests.cs
index d47ca128e7..966da0e9aa 100644
--- a/Tests/IntegrationTests/FluentTests/BasicFluentAssertionTests.cs
+++ b/Tests/IntegrationTests/FluentTests/BasicFluentAssertionTests.cs
@@ -38,7 +38,7 @@ public void GuiTestContext_QuitKey_Stops (V2TestDriver d)
         Assert.False (top!.Running);
 
         Application.Top?.Dispose ();
-        Application.Shutdown();
+        Application.Shutdown ();
 
         context.WriteOutLogs (_out);
         context.Stop ();
@@ -93,6 +93,17 @@ public void ContextMenu_CrashesOnRight (V2TestDriver d)
 
                                      // Click in main area inside border
                                      .RightClick (1, 1)
+                                     .Then (
+                                            () =>
+                                            {
+                                                // Test depends on menu having a border
+                                                IPopover? popover = Application.Popover!.GetActivePopover ();
+                                                Assert.NotNull (popover);
+                                                var popoverMenu = popover as PopoverMenu;
+                                                popoverMenu!.Root!.BorderStyle = LineStyle.Single;
+
+                                            })
+                                     .WaitIteration ()
                                      .ScreenShot ("After open menu", _out)
                                      .LeftClick (2, 2)
                                      .Stop ()
diff --git a/Tests/IntegrationTests/UICatalog/ScenarioTests.cs b/Tests/IntegrationTests/UICatalog/ScenarioTests.cs
index 2889c66ece..ec8cafc1e6 100644
--- a/Tests/IntegrationTests/UICatalog/ScenarioTests.cs
+++ b/Tests/IntegrationTests/UICatalog/ScenarioTests.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Terminal.Gui;
 using UICatalog;
 using UnitTests;
@@ -34,9 +35,7 @@ public void All_Scenarios_Quit_And_Init_Shutdown_Properly (Type scenarioType)
         Assert.Null (_timeoutLock);
         _timeoutLock = new ();
 
-        // Disable any UIConfig settings
-        ConfigLocations savedConfigLocations = ConfigurationManager.Locations;
-        ConfigurationManager.Locations = ConfigLocations.Default;
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
         // If a previous test failed, this will ensure that the Application is in a clean state
         Application.ResetState (true);
@@ -83,9 +82,7 @@ public void All_Scenarios_Quit_And_Init_Shutdown_Properly (Type scenarioType)
             _timeoutLock = null;
         }
 
-        // Restore the configuration locations
-        ConfigurationManager.Locations = savedConfigLocations;
-        ConfigurationManager.Reset ();
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
         return;
 
@@ -121,9 +118,7 @@ bool ForceCloseCallback ()
                 }
             }
 
-            // Restore the configuration locations
-            ConfigurationManager.Locations = savedConfigLocations;
-            ConfigurationManager.Reset ();
+            ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
             Application.ResetState (true);
 
@@ -154,8 +149,7 @@ void OnApplicationOnIteration (object? s, IterationEventArgs a)
     public void Run_All_Views_Tester_Scenario ()
     {
         // Disable any UIConfig settings
-        ConfigLocations savedConfigLocations = ConfigurationManager.Locations;
-        ConfigurationManager.Locations = ConfigLocations.Default;
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
         View? curView = null;
 
@@ -182,7 +176,7 @@ public void Run_All_Views_Tester_Scenario ()
             Width = 15,
             Height = Dim.Fill (1), // for status bar
             CanFocus = false,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"]
+            SchemeName = "TopLevel"
         };
 
         ListView classListView = new ()
@@ -192,7 +186,7 @@ public void Run_All_Views_Tester_Scenario ()
             Width = Dim.Fill (),
             Height = Dim.Fill (),
             AllowsMarking = false,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Source = new ListWrapper<string> (new (viewClasses.Keys.ToList ()))
         };
         leftPane.Add (classListView);
@@ -204,7 +198,7 @@ public void Run_All_Views_Tester_Scenario ()
             Width = Dim.Fill (),
             Height = 10,
             CanFocus = false,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
+            SchemeName = "TopLevel",
             Title = "Settings"
         };
 
@@ -270,7 +264,7 @@ public void Run_All_Views_Tester_Scenario ()
             Y = Pos.Bottom (settingsPane),
             Width = Dim.Fill (),
             Height = Dim.Fill (1), // + 1 for status bar
-            ColorScheme = Colors.ColorSchemes ["Dialog"]
+            SchemeName = "Dialog"
         };
 
         classListView.OpenSelectedItem += (s, a) => { settingsPane.SetFocus (); };
@@ -378,10 +372,7 @@ public void Run_All_Views_Tester_Scenario ()
 
         top.Dispose ();
         Application.Shutdown ();
-
-        // Restore the configuration locations
-        ConfigurationManager.Locations = savedConfigLocations;
-        ConfigurationManager.Reset ();
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
         void DimPosChanged (View? view)
         {
@@ -554,7 +545,10 @@ void UpdateSettings (View view)
             }
 
             // Set the colorscheme to make it stand out if is null by default
-            view.ColorScheme ??= Colors.ColorSchemes ["Base"];
+            if (!view.HasScheme)
+            {
+                view.SchemeName = "Base";
+            }
 
             // If the view supports a Text property, set it so we have something to look at
             if (view.GetType ().GetProperty ("Text") != null)
@@ -613,9 +607,8 @@ void UpdateSettings (View view)
     [Fact]
     public void Run_Generic ()
     {
-        // Disable any UIConfig settings
-        ConfigLocations savedConfigLocations = ConfigurationManager.Locations;
-        ConfigurationManager.Locations = ConfigLocations.Default;
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
+        Assert.Equal (Key.Esc, Application.QuitKey);
 
         ObservableCollection<Scenario> scenarios = Scenario.GetScenarios ();
         Assert.NotEmpty (scenarios);
@@ -628,6 +621,7 @@ public void Run_Generic ()
         // BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
         // by adding this Space it seems to work.
 
+        Assert.Equal (Key.Esc, Application.QuitKey);
         FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
 
         var ms = 100;
@@ -664,7 +658,7 @@ public void Run_Generic ()
                                      }
                                  };
 
-        Application.KeyDown += (sender, args) => { Assert.Equal (Application.QuitKey, args.KeyCode); };
+        Application.KeyDown += (sender, args) => { Assert.Equal (Application.QuitKey, args); };
 
         generic.Main ();
 
@@ -677,10 +671,7 @@ public void Run_Generic ()
 
         // Shutdown must be called to safely clean up Application if Init has been called
         Application.Shutdown ();
-
-        // Restore the configuration locations
-        ConfigurationManager.Locations = savedConfigLocations;
-        ConfigurationManager.Reset ();
+        ConfigurationManager.Disable (resetToHardCodedDefaults: true);
 
 #if DEBUG_IDISPOSABLE
         Assert.Empty (View.Instances);
diff --git a/Tests/StressTests/ApplicationStressTests.cs b/Tests/StressTests/ApplicationStressTests.cs
index bf1c525b0b..86f1aa77b6 100644
--- a/Tests/StressTests/ApplicationStressTests.cs
+++ b/Tests/StressTests/ApplicationStressTests.cs
@@ -9,7 +9,6 @@ public class ApplicationStressTests : TestsAllViews
     public ApplicationStressTests (ITestOutputHelper output)
     {
         ConsoleDriver.RunningUnitTests = true;
-        ConfigurationManager.Locations = ConfigLocations.Default;
     }
 
     private static volatile int _tbCounter;
diff --git a/Tests/StressTests/ScenariosStressTests.cs b/Tests/StressTests/ScenariosStressTests.cs
index 8f9cbf3084..66f61dcf63 100644
--- a/Tests/StressTests/ScenariosStressTests.cs
+++ b/Tests/StressTests/ScenariosStressTests.cs
@@ -34,9 +34,7 @@ public void All_Scenarios_Benchmark (Type scenarioType)
         Assert.Null (_timeoutLock);
         _timeoutLock = new ();
 
-        // Disable any UIConfig settings
-        ConfigLocations savedConfigLocations = ConfigurationManager.Locations;
-        ConfigurationManager.Locations = ConfigLocations.Default;
+        ConfigurationManager.Disable();
 
         // If a previous test failed, this will ensure that the Application is in a clean state
         Application.ResetState (true);
@@ -89,10 +87,6 @@ public void All_Scenarios_Benchmark (Type scenarioType)
         _output.WriteLine ($"  added {addedCount} views.");
         _output.WriteLine ($"  called View.LayoutComplete {laidOutCount} times.");
 
-        // Restore the configuration locations
-        ConfigurationManager.Locations = savedConfigLocations;
-        ConfigurationManager.Reset ();
-
         return;
 
         void OnApplicationOnInitializedChanged (object? s, EventArgs<bool> a)
diff --git a/Tests/UnitTests/Application/ApplicationPopoverTests.cs b/Tests/UnitTests/Application/ApplicationPopoverTests.cs
index 99a5d6bf1e..422b670e80 100644
--- a/Tests/UnitTests/Application/ApplicationPopoverTests.cs
+++ b/Tests/UnitTests/Application/ApplicationPopoverTests.cs
@@ -2,6 +2,9 @@
 
 public class ApplicationPopoverTests
 {
+
+
+
     [Fact]
     public void Application_Init_Initializes_PopoverManager ()
     {
@@ -142,6 +145,56 @@ public void Application_Shutdown_Does_Not_Dispose_ActiveNotRegistered_Popover ()
         Assert.Equal (1, popover.DisposedCount);
     }
 
+    [Fact]
+    public void Register_SetsTopLevel ()
+    {
+        // Arrange
+        Assert.Null (Application.Popover);
+        Application.Init (new FakeDriver ());
+        Application.Top = new Toplevel ();
+        PopoverTestClass popover = new ();
+
+        // Act
+        Application.Popover?.Register (popover);
+
+        // Assert
+        Assert.Equal (Application.Top, popover.Toplevel);
+
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void Keyboard_Events_Go_Only_To_Popover_Associated_With_Toplevel ()
+    {
+        // Arrange
+        Assert.Null (Application.Popover);
+        Application.Init (new FakeDriver ());
+        Application.Top = new Toplevel () { Id = "initialTop" };
+        PopoverTestClass popover = new ();
+        int keyDownEvents = 0;
+        popover.KeyDown += (s, e) =>
+                           {
+                               keyDownEvents++;
+                               e.Handled = true;
+                           }; // Ensure it handles the key
+
+        Application.Popover?.Register (popover);
+
+        // Act
+        Application.RaiseKeyDownEvent (Key.A); // Goes to initialTop
+
+        Application.Top = new Toplevel () { Id = "secondaryTop" };
+        Application.RaiseKeyDownEvent (Key.A); // Goes to secondaryTop
+
+        // Test
+        Assert.Equal (1, keyDownEvents);
+
+
+        popover.Dispose ();
+        Assert.Equal (1, popover.DisposedCount);
+        Application.ResetState (true);
+    }
+
     public class PopoverTestClass : PopoverBaseImpl
     {
         public List<Key> HandledKeys { get; } = [];
diff --git a/Tests/UnitTests/Application/ApplicationTests.cs b/Tests/UnitTests/Application/ApplicationTests.cs
index 9bc0004595..eafe98e050 100644
--- a/Tests/UnitTests/Application/ApplicationTests.cs
+++ b/Tests/UnitTests/Application/ApplicationTests.cs
@@ -13,7 +13,6 @@ public ApplicationTests (ITestOutputHelper output)
     {
         _output = output;
         ConsoleDriver.RunningUnitTests = true;
-        Locations = ConfigLocations.Default;
 
 #if DEBUG_IDISPOSABLE
         View.EnableDebugIDisposableAsserts = true;
@@ -318,11 +317,14 @@ void CheckReset ()
             Assert.Null (Application.Driver);
             Assert.Null (Application.MainLoop);
             Assert.False (Application.EndAfterFirstIteration);
-            Assert.Equal (Key.Tab.WithShift, Application.PrevTabKey);
-            Assert.Equal (Key.Tab, Application.NextTabKey);
-            Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
-            Assert.Equal (Key.F6, Application.NextTabGroupKey);
-            Assert.Equal (Key.Esc, Application.QuitKey);
+
+            // Commented out because if CM changed the defaults, those changes should
+            // persist across Inits.
+            //Assert.Equal (Key.Tab.WithShift, Application.PrevTabKey);
+            //Assert.Equal (Key.Tab, Application.NextTabKey);
+            //Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
+            //Assert.Equal (Key.F6, Application.NextTabGroupKey);
+            //Assert.Equal (Key.Esc, Application.QuitKey);
 
             // Internal properties
             Assert.False (Application.Initialized);
@@ -331,7 +333,7 @@ void CheckReset ()
             Assert.False (Application._forceFakeConsole);
             Assert.Equal (-1, Application.MainThreadId);
             Assert.Empty (Application.TopLevels);
-            Assert.Empty (Application._cachedViewsUnderMouse);
+            Assert.Empty (Application.CachedViewsUnderMouse);
 
             // Mouse
             // Do not reset _lastMousePosition
@@ -365,7 +367,7 @@ void CheckReset ()
         Application.MainThreadId = 1;
 
         //Application._topLevels = new List<Toplevel> ();
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         //Application.SupportedCultures = new List<CultureInfo> ();
         Application.Force16Colors = true;
@@ -377,12 +379,12 @@ void CheckReset ()
         Application.QuitKey = Key.C;
         Application.KeyBindings.Add (Key.D, Command.Cancel);
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         //Application.WantContinuousButtonPressedView = new View ();
 
         // Mouse
-        Application._lastMousePosition = new Point (1, 1);
+        Application.LastMousePosition = new Point (1, 1);
 
         Application.Navigation = new ();
 
@@ -537,45 +539,26 @@ public void Init_NoParam_ForceDriver_Works ()
     }
 
     [Fact]
-    public void Init_KeyBindings_Set_To_Defaults ()
+    public void Init_KeyBindings_Are_Not_Reset ()
     {
-        // arrange
-        Locations = ConfigLocations.All;
-        ThrowOnJsonErrors = true;
-
-        Application.QuitKey = Key.Q;
-
-        Application.Init (new FakeDriver ());
-
-        Assert.Equal (Key.Esc, Application.QuitKey);
+        Debug.Assert(!IsEnabled);
 
-        Application.Shutdown ();
-    }
-
-    [Fact]
-    public void Init_KeyBindings_Set_To_Custom ()
-    {
-        // arrange
-        Locations = ConfigLocations.Runtime;
-        ThrowOnJsonErrors = true;
-
-        RuntimeConfig = """
-                         {
-                               "Application.QuitKey": "Ctrl-Q"
-                         }
-                 """;
-
-        Assert.Equal (Key.Esc, Application.QuitKey);
-
-        // Act
-        Application.Init (new FakeDriver ());
+        try
+        {
+            // arrange
+            ThrowOnJsonErrors = true;
 
-        Assert.Equal (Key.Q.WithCtrl, Application.QuitKey);
+            Application.QuitKey = Key.Q;
+            Assert.Equal (Key.Q, Application.QuitKey);
 
-        Assert.True (Application.KeyBindings.TryGet (Key.Q.WithCtrl, out _));
+            Application.Init (new FakeDriver ());
 
-        Application.Shutdown ();
-        Locations = ConfigLocations.Default;
+            Assert.Equal (Key.Q, Application.QuitKey);
+        }
+        finally
+        {
+            Application.ResetState (false);
+        }
     }
 
     [Fact]
diff --git a/Tests/UnitTests/Application/CursorTests.cs b/Tests/UnitTests/Application/CursorTests.cs
index 74bf21396c..b2f0c73cb0 100644
--- a/Tests/UnitTests/Application/CursorTests.cs
+++ b/Tests/UnitTests/Application/CursorTests.cs
@@ -45,6 +45,8 @@ public void PositionCursor_No_Focus_Returns_False ()
         };
         view.TestLocation = new Point (0, 0);
         Assert.False (Application.PositionCursor ());
+        Application.ResetState (true);
+
     }
 
     [Fact]
@@ -62,6 +64,7 @@ public void PositionCursor_No_Position_Returns_False ()
         view.CanFocus = true;
         view.SetFocus ();
         Assert.False (Application.PositionCursor ());
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -89,6 +92,7 @@ public void PositionCursor_No_IntersectSuperView_Returns_False ()
         view.SetFocus ();
         view.TestLocation = new Point (0, 0);
         Assert.False (Application.PositionCursor ());
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -116,6 +120,7 @@ public void PositionCursor_Position_OutSide_SuperView_Returns_False ()
         view.SetFocus ();
         view.TestLocation = new Point (1, 1);
         Assert.False (Application.PositionCursor ());
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -133,6 +138,7 @@ public void PositionCursor_Focused_With_Position_Returns_True ()
         view.SetFocus ();
         view.TestLocation = new Point (0, 0);
         Assert.True (Application.PositionCursor ());
+        Application.ResetState (true);
     }
 
     [Fact]
@@ -155,5 +161,7 @@ public void PositionCursor_Defaults_Invisible ()
         {
             Assert.Equal (CursorVisibility.Invisible, cursor);
         }
+
+        Application.ResetState (true);
     }
 }
diff --git a/Tests/UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs b/Tests/UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs
index 60eb8b25eb..967adfecd8 100644
--- a/Tests/UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs
+++ b/Tests/UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs
@@ -53,7 +53,7 @@ public void RaiseMouseEnterLeaveEvents_MouseEntersView_CallsOnMouseEnter ()
             ScreenPosition = mousePosition
         };
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         try
         {
@@ -82,8 +82,8 @@ public void RaiseMouseEnterLeaveEvents_MouseLeavesView_CallsOnMouseLeave ()
         List<View> currentViewsUnderMouse = new ();
         var mouseEvent = new MouseEventArgs ();
 
-        Application._cachedViewsUnderMouse.Clear ();
-        Application._cachedViewsUnderMouse.Add (view);
+        Application.CachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Add (view);
 
         try
         {
@@ -117,7 +117,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
         Application.Top.Add (view1);
         Application.Top.Add (view2);
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         try
         {
@@ -126,7 +126,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (0, view1.OnMouseEnterCalled);
@@ -139,7 +139,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -152,7 +152,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -165,7 +165,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -178,7 +178,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMou
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -205,7 +205,7 @@ public void RaiseMouseEnterLeaveEvents_NoViewsUnderMouse_DoesNotCallOnMouseEnter
         List<View> currentViewsUnderMouse = new ();
         var mouseEvent = new MouseEventArgs ();
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         try
         {
@@ -244,7 +244,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
         Application.Top.Add (view1);
         Application.Top.Add (view2);
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         try
         {
@@ -253,7 +253,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (0, view1.OnMouseEnterCalled);
@@ -266,7 +266,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -279,7 +279,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -292,7 +292,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -305,7 +305,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -318,7 +318,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_Cal
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -360,7 +360,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
         view1.Add (subView);
         Application.Top.Add (view1);
 
-        Application._cachedViewsUnderMouse.Clear ();
+        Application.CachedViewsUnderMouse.Clear ();
 
         try
         {
@@ -372,7 +372,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (0, view1.OnMouseEnterCalled);
@@ -385,7 +385,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -398,7 +398,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -411,7 +411,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (1, view1.OnMouseEnterCalled);
@@ -424,7 +424,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (2, view1.OnMouseEnterCalled);
@@ -437,7 +437,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (2, view1.OnMouseEnterCalled);
@@ -450,7 +450,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (2, view1.OnMouseEnterCalled);
@@ -463,7 +463,7 @@ public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_Call
 
             Application.RaiseMouseEnterLeaveEvents (
                                                     mousePosition,
-                                                    View.GetViewsUnderMouse (mousePosition));
+                                                    View.GetViewsUnderLocation (mousePosition, ViewportSettings.TransparentMouse));
 
             // Assert
             Assert.Equal (3, view1.OnMouseEnterCalled);
diff --git a/Tests/UnitTests/AutoInitShutdownAttribute.cs b/Tests/UnitTests/AutoInitShutdownAttribute.cs
index 3a4e1cc927..ea91dff313 100644
--- a/Tests/UnitTests/AutoInitShutdownAttribute.cs
+++ b/Tests/UnitTests/AutoInitShutdownAttribute.cs
@@ -37,7 +37,6 @@ public class AutoInitShutdownAttribute : BeforeAfterTestAttribute
     ///     Only valid if <paramref name="autoInit"/> is true. Only valid if
     ///     <see cref="IConsoleDriver"/> == <see cref="FakeDriver"/> and <paramref name="autoInit"/> is true.
     /// </param>
-    /// <param name="configLocation">Determines what config file locations <see cref="ConfigurationManager"/> will load from.</param>
     /// <param name="verifyShutdown">If true and <see cref="Application.Initialized"/> is true, the test will fail.</param>
     public AutoInitShutdownAttribute (
         bool autoInit = true,
@@ -45,7 +44,6 @@ public AutoInitShutdownAttribute (
         bool useFakeClipboard = true,
         bool fakeClipboardAlwaysThrowsNotSupportedException = false,
         bool fakeClipboardIsSupportedAlwaysTrue = false,
-        ConfigLocations configLocation = ConfigLocations.Default, // DefaultOnly is the default for tests
         bool verifyShutdown = false
     )
     {
@@ -53,11 +51,9 @@ public AutoInitShutdownAttribute (
         CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo ("en-US");
         _driverType = consoleDriverType ?? typeof (FakeDriver);
         FakeDriver.FakeBehaviors.UseFakeClipboard = useFakeClipboard;
-
         FakeDriver.FakeBehaviors.FakeClipboardAlwaysThrowsNotSupportedException =
             fakeClipboardAlwaysThrowsNotSupportedException;
         FakeDriver.FakeBehaviors.FakeClipboardIsSupportedAlwaysFalse = fakeClipboardIsSupportedAlwaysTrue;
-        ConfigurationManager.Locations = configLocation;
         _verifyShutdown = verifyShutdown;
     }
 
@@ -105,18 +101,21 @@ public override void After (MethodInfo methodUnderTest)
             }
         }
 
-        // Reset to defaults
-        ConfigurationManager.Locations = ConfigLocations.Default;
-        ConfigurationManager.Reset ();
+        Debug.Assert (!CM.IsEnabled, "This test left ConfigurationManager enabled!");
 
-        // Enable subsequent tests that call Init to get all config files (the default).
-        //Locations = ConfigLocations.All;
+        // Force the ConfigurationManager to reset to its hardcoded defaults
+        CM.Disable(true);
     }
 
     public override void Before (MethodInfo methodUnderTest)
     {
         Debug.WriteLine ($"Before: {methodUnderTest.Name}");
 
+        // Disable & force the ConfigurationManager to reset to its hardcoded defaults
+        CM.Disable (true);
+
+        //Debug.Assert(!CM.IsEnabled, "Some other test left ConfigurationManager enabled.");
+
         if (AutoInit)
         {
 #if DEBUG_IDISPOSABLE
diff --git a/Tests/UnitTests/Configuration/AppScopeTests.cs b/Tests/UnitTests/Configuration/AppScopeTests.cs
index 4460681dab..c29f132da4 100644
--- a/Tests/UnitTests/Configuration/AppScopeTests.cs
+++ b/Tests/UnitTests/Configuration/AppScopeTests.cs
@@ -1,87 +1,126 @@
-using System.Text.Json;
+#nullable enable
+using System.Text.Json;
 using UnitTests;
 using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui.ConfigurationTests;
 
-public class AppScopeTests
+public class AppSettingsScopeTests
 {
-    public static readonly JsonSerializerOptions _jsonOptions = new ()
+    [Fact]
+    public void Empty_By_Default_Disabled ()
     {
-        Converters =
-        {
-            //new AttributeJsonConverter (),
-            //new ColorJsonConverter ()
-        }
-    };
+        Assert.False (IsEnabled);
+
+        Assert.NotNull (Settings! ["AppSettings"].PropertyValue);
+
+        AppSettingsScope? appSettings = (Settings! ["AppSettings"].PropertyValue as AppSettingsScope);
+        Assert.Equal (10, appSettings!.Count); // 10 test properties
+
+        Assert.Equal ("test", (((AppSettingsScope)Settings! ["AppSettings"].PropertyValue!)!) ["AppSettingsTestClass.ReferenceProperty"].PropertyValue);
+    }
+
+    [Fact]
+    public void Empty_By_Default_Enabled ()
+    {
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.NotNull (Settings! ["AppSettings"].PropertyValue);
+
+        AppSettingsScope? appSettings = (Settings! ["AppSettings"].PropertyValue as AppSettingsScope);
+        Assert.Equal (10, appSettings!.Count); // 10 test properties
+        Assert.Equal ("test", (((AppSettingsScope)Settings! ["AppSettings"].PropertyValue!)!) ["AppSettingsTestClass.ReferenceProperty"].PropertyValue);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
     public void Apply_ShouldApplyUpdatedProperties ()
     {
-        Reset ();
-        Assert.Null (AppSettingsTestClass.TestProperty);
-        Assert.NotEmpty (AppSettings);
-        Assert.Null (AppSettings ["AppSettingsTestClass.TestProperty"].PropertyValue);
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Null (AppSettingsTestClass.NullableValueProperty);
+        Assert.NotEmpty (AppSettings!);
+        Assert.Null (AppSettings! ["AppSettingsTestClass.NullableValueProperty"].PropertyValue);
 
-        AppSettingsTestClass.TestProperty = true;
-        Reset ();
-        Assert.True (AppSettingsTestClass.TestProperty);
+        AppSettingsTestClass.NullableValueProperty = true;
+        ResetToCurrentValues ();
+        Assert.True (AppSettingsTestClass.NullableValueProperty);
         Assert.NotEmpty (AppSettings);
-        Assert.Null (AppSettings ["AppSettingsTestClass.TestProperty"].PropertyValue as bool?);
+        Assert.True (AppSettings ["AppSettingsTestClass.NullableValueProperty"].PropertyValue as bool?);
 
-        AppSettings ["AppSettingsTestClass.TestProperty"].PropertyValue = false;
-        Assert.False (AppSettings ["AppSettingsTestClass.TestProperty"].PropertyValue as bool?);
+        AppSettings ["AppSettingsTestClass.NullableValueProperty"].PropertyValue = false;
+        Assert.False (AppSettings ["AppSettingsTestClass.NullableValueProperty"].PropertyValue as bool?);
 
         // ConfigurationManager.Settings should NOT apply theme settings
-        Settings.Apply ();
-        Assert.True (AppSettingsTestClass.TestProperty);
+        Settings!.Apply ();
+        Assert.True (AppSettingsTestClass.NullableValueProperty);
 
         // ConfigurationManager.Themes should NOT apply theme settings
-        ThemeManager.Themes! [ThemeManager.SelectedTheme]!.Apply ();
-        Assert.True (AppSettingsTestClass.TestProperty);
+        ThemeManager.Themes! [ThemeManager.Theme]!.Apply ();
+        Assert.True (AppSettingsTestClass.NullableValueProperty);
 
         // ConfigurationManager.AppSettings should NOT apply theme settings
         AppSettings.Apply ();
-        Assert.False (AppSettingsTestClass.TestProperty);
+        Assert.False (AppSettingsTestClass.NullableValueProperty);
+        Disable (resetToHardCodedDefaults: true);
     }
 
     [Fact]
     public void TestNullable ()
     {
-        AppSettingsTestClass.TestProperty = null;
-        Assert.Null (AppSettingsTestClass.TestProperty);
+        Enable (ConfigLocations.HardCoded);
 
-        Initialize ();
-        GetHardCodedDefaults ();
-        Apply ();
-        Assert.Null (AppSettingsTestClass.TestProperty);
+        AppSettingsTestClass.NullableValueProperty = null;
+        Assert.Null (AppSettingsTestClass.NullableValueProperty);
+
+        ResetToCurrentValues ();
+        Assert.Null (AppSettings! ["AppSettingsTestClass.NullableValueProperty"].PropertyValue);
 
-        AppSettingsTestClass.TestProperty = true;
-        Initialize ();
-        GetHardCodedDefaults ();
-        Assert.NotNull (AppSettingsTestClass.TestProperty);
         Apply ();
-        Assert.NotNull (AppSettingsTestClass.TestProperty);
+        Assert.Null (AppSettings! ["AppSettingsTestClass.NullableValueProperty"].PropertyValue);
+        Assert.Null (AppSettingsTestClass.NullableValueProperty);
+
+        AppSettingsTestClass.NullableValueProperty = true;
+        ResetToCurrentValues ();
+        Assert.True ((bool)AppSettings! ["AppSettingsTestClass.NullableValueProperty"].PropertyValue!);
+        Assert.True (AppSettingsTestClass.NullableValueProperty);
+        Assert.NotNull (AppSettingsTestClass.NullableValueProperty);
+        Apply ();
+        Assert.True (AppSettingsTestClass.NullableValueProperty);
+        Assert.NotNull (AppSettingsTestClass.NullableValueProperty);
+
+        Disable (resetToHardCodedDefaults: true);
     }
 
     [Fact]
     public void TestSerialize_RoundTrip ()
     {
-        Reset ();
+        Enable (ConfigLocations.HardCoded);
 
-        AppScope initial = AppSettings;
+        AppSettingsScope initial = AppSettings!;
 
-        string serialized = JsonSerializer.Serialize (AppSettings, _jsonOptions);
-        var deserialized = JsonSerializer.Deserialize<AppScope> (serialized, _jsonOptions);
+        string serialized = JsonSerializer.Serialize (AppSettings, SerializerContext.Options);
+        var deserialized = JsonSerializer.Deserialize<AppSettingsScope> (serialized, SerializerContext.Options);
 
         Assert.NotEqual (initial, deserialized);
-        Assert.Equal (deserialized.Count, initial.Count);
+        Assert.Equal (deserialized!.Count, initial.Count);
+
+        Disable (resetToHardCodedDefaults: true);
     }
 
     public class AppSettingsTestClass
     {
-        [SerializableConfigurationProperty (Scope = typeof (AppScope))]
-        public static bool? TestProperty { get; set; }
+        [ConfigurationProperty (Scope = typeof (AppSettingsScope))]
+        public static bool ValueProperty { get; set; }
+
+        [ConfigurationProperty (Scope = typeof (AppSettingsScope))]
+        public static bool? NullableValueProperty { get; set; }
+
+        [ConfigurationProperty (Scope = typeof (AppSettingsScope))]
+        public static string ReferenceProperty { get; set; } = "test";
+
+        [ConfigurationProperty (Scope = typeof (AppSettingsScope))]
+        public static string? NullableReferenceProperty { get; set; }
     }
 }
diff --git a/Tests/UnitTests/Configuration/AttributeJsonConverterTests.cs b/Tests/UnitTests/Configuration/AttributeJsonConverterTests.cs
deleted file mode 100644
index 81e5b6fe29..0000000000
--- a/Tests/UnitTests/Configuration/AttributeJsonConverterTests.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Text.Json;
-using UnitTests;
-
-namespace Terminal.Gui.ConfigurationTests;
-
-public class AttributeJsonConverterTests
-{
-    [Fact]
-    public void TestDeserialize ()
-    {
-        // Test deserializing from human-readable color names
-        var json = "{\"Foreground\":\"Blue\",\"Background\":\"Green\"}";
-        var attribute = JsonSerializer.Deserialize<Attribute> (json, ConfigurationManagerTests._jsonOptions);
-        Assert.Equal (Color.Blue, attribute.Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (Color.Green, attribute.Background.GetClosestNamedColor16 ());
-
-        // Test deserializing from RGB values
-        json = "{\"Foreground\":\"rgb(255,0,0)\",\"Background\":\"rgb(0,255,0)\"}";
-        attribute = JsonSerializer.Deserialize<Attribute> (json, ConfigurationManagerTests._jsonOptions);
-        Assert.Equal (Color.Red, attribute.Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (Color.BrightGreen, attribute.Background.GetClosestNamedColor16 ());
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void TestSerialize ()
-    {
-        // Test serializing to human-readable color names
-        var attribute = new Attribute (Color.Blue, Color.Green);
-        string json = JsonSerializer.Serialize (attribute, ConfigurationManagerTests._jsonOptions);
-        Assert.Equal ("{\"Foreground\":\"Blue\",\"Background\":\"Green\"}", json);
-    }
-}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/ColorSchemeJsonConverterTests.cs b/Tests/UnitTests/Configuration/ColorSchemeJsonConverterTests.cs
deleted file mode 100644
index 9ab3b06f9f..0000000000
--- a/Tests/UnitTests/Configuration/ColorSchemeJsonConverterTests.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Text.Json;
-using UnitTests;
-
-namespace Terminal.Gui.ConfigurationTests;
-
-public class ColorSchemeJsonConverterTests
-{
-    //string json = @"
-    //	{
-    //	""ColorSchemes"": {
-    //		""Base"": {
-    //			""normal"": {
-    //				""foreground"": ""White"",
-    //				""background"": ""Blue""
-    //   		            },
-    //			""focus"": {
-    //				""foreground"": ""Black"",
-    //				""background"": ""Gray""
-    //			    },
-    //			""hotNormal"": {
-    //				""foreground"": ""BrightCyan"",
-    //				""background"": ""Blue""
-    //			    },
-    //			""hotFocus"": {
-    //				""foreground"": ""BrightBlue"",
-    //				""background"": ""Gray""
-    //			    },
-    //			""disabled"": {
-    //				""foreground"": ""DarkGray"",
-    //				""background"": ""Blue""
-    //			    }
-    //		}
-    //		}
-    //	}";
-    [Fact]
-    [AutoInitShutdown]
-    public void TestColorSchemesSerialization ()
-    {
-        // Arrange
-        var expectedColorScheme = new ColorScheme
-        {
-            Normal = new Attribute (Color.White, Color.Blue),
-            Focus = new Attribute (Color.Black, Color.Gray),
-            HotNormal = new Attribute (Color.BrightCyan, Color.Blue),
-            HotFocus = new Attribute (Color.BrightBlue, Color.Gray),
-            Disabled = new Attribute (Color.DarkGray, Color.Blue)
-        };
-
-        string serializedColorScheme =
-            JsonSerializer.Serialize (expectedColorScheme, ConfigurationManagerTests._jsonOptions);
-
-        // Act
-        var actualColorScheme =
-            JsonSerializer.Deserialize<ColorScheme> (serializedColorScheme, ConfigurationManagerTests._jsonOptions);
-
-        // Assert
-        Assert.Equal (expectedColorScheme, actualColorScheme);
-    }
-}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/ConfigPropertyTests.cs b/Tests/UnitTests/Configuration/ConfigPropertyTests.cs
index f751b3d72b..b742bc9841 100644
--- a/Tests/UnitTests/Configuration/ConfigPropertyTests.cs
+++ b/Tests/UnitTests/Configuration/ConfigPropertyTests.cs
@@ -1,20 +1,18 @@
-using System;
+#nullable enable
+using System.Collections.Concurrent;
 using System.Reflection;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using Terminal.Gui;
-using Xunit;
 
 namespace Terminal.Gui.ConfigurationTests;
 
 public class ConfigPropertyTests
 {
     [Fact]
-    public void Apply_PropertyValueIsAppliedToStatic_String_Property()
+    public void Apply_PropertyValueIsAppliedToStatic_String_Property ()
     {
         // Arrange
         TestConfiguration.Reset ();
-        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestStringProperty));
         var configProperty = new ConfigProperty
         {
             PropertyInfo = propertyInfo,
@@ -22,12 +20,12 @@ public void Apply_PropertyValueIsAppliedToStatic_String_Property()
         };
 
         // Act
-        var result = configProperty.Apply();
+        var result = configProperty.Apply ();
 
         // Assert
         Assert.Equal (1, TestConfiguration.TestStringPropertySetCount);
-        Assert.True(result);
-        Assert.Equal("UpdatedValue", TestConfiguration.TestStringProperty);
+        Assert.True (result);
+        Assert.Equal ("UpdatedValue", TestConfiguration.TestStringProperty);
         TestConfiguration.Reset ();
     }
 
@@ -47,37 +45,37 @@ public void Apply_PropertyValueIsAppliedToStatic_Key_Property ()
         var result = configProperty.Apply ();
 
         // Assert
-        Assert.Equal(1, TestConfiguration.TestKeyPropertySetCount);
+        Assert.Equal (1, TestConfiguration.TestKeyPropertySetCount);
         Assert.True (result);
         Assert.Equal (Key.Q.WithCtrl, TestConfiguration.TestKeyProperty);
         TestConfiguration.Reset ();
     }
 
     [Fact]
-    public void RetrieveValue_GetsCurrentValueOfStaticProperty()
+    public void RetrieveValue_GetsCurrentValueOfStaticProperty ()
     {
         // Arrange
         TestConfiguration.TestStringProperty = "CurrentValue";
-        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestStringProperty));
         var configProperty = new ConfigProperty
         {
             PropertyInfo = propertyInfo
         };
 
         // Act
-        var value = configProperty.RetrieveValue();
+        var value = configProperty.UpdateToCurrentValue ();
 
         // Assert
-        Assert.Equal("CurrentValue", value);
-        Assert.Equal("CurrentValue", configProperty.PropertyValue);
+        Assert.Equal ("CurrentValue", value);
+        Assert.Equal ("CurrentValue", configProperty.PropertyValue);
     }
 
     [Fact]
-    public void UpdateValueFrom_Updates_String_Property_Value ()
+    public void DeepCloneFrom_Updates_String_Property_Value ()
     {
         // Arrange
         TestConfiguration.Reset ();
-        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestStringProperty));
         var configProperty = new ConfigProperty
         {
             PropertyInfo = propertyInfo,
@@ -85,12 +83,12 @@ public void UpdateValueFrom_Updates_String_Property_Value ()
         };
 
         // Act
-        var updatedValue = configProperty.UpdateValueFrom("NewValue");
+        var updatedValue = configProperty.UpdateFrom ("NewValue");
 
         // Assert
         Assert.Equal (0, TestConfiguration.TestStringPropertySetCount);
-        Assert.Equal("NewValue", updatedValue);
-        Assert.Equal("NewValue", configProperty.PropertyValue);
+        Assert.Equal ("NewValue", updatedValue);
+        Assert.Equal ("NewValue", configProperty.PropertyValue);
         TestConfiguration.Reset ();
     }
 
@@ -109,10 +107,10 @@ public void UpdateValueFrom_Updates_String_Property_Value ()
     //}
 
     [Fact]
-    public void Apply_TargetInvocationException_ThrowsJsonException()
+    public void Apply_TargetInvocationException_ThrowsJsonException ()
     {
         // Arrange
-        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestStringProperty));
         var configProperty = new ConfigProperty
         {
             PropertyInfo = propertyInfo,
@@ -120,57 +118,351 @@ public void Apply_TargetInvocationException_ThrowsJsonException()
         };
 
         // Act & Assert
-        var exception = Assert.Throws<JsonException> (() => configProperty.Apply());
+        var exception = Assert.Throws<JsonException> (() => configProperty.Apply ());
     }
 
     [Fact]
-    public void GetJsonPropertyName_ReturnsJsonPropertyNameAttributeValue()
+    public void GetJsonPropertyName_ReturnsJsonPropertyNameAttributeValue ()
     {
         // Arrange
+        var propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestStringProperty));
+
+        // Act
+        var jsonPropertyName = ConfigProperty.GetJsonPropertyName (propertyInfo!);
+
+        // Assert
+        Assert.Equal ("TestStringProperty", jsonPropertyName);
+    }
+    [Fact]
+    public void UpdateFrom_NullSource_ReturnsExistingValue()
+    {
+        // Arrange
+        TestConfiguration.TestStringProperty = "CurrentValue";
         var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = "ExistingValue"
+        };
 
         // Act
-        var jsonPropertyName = ConfigProperty.GetJsonPropertyName(propertyInfo);
+        var result = configProperty.UpdateFrom(null);
 
         // Assert
-        Assert.Equal("TestStringProperty", jsonPropertyName);
+        Assert.Equal("ExistingValue", result);
+        Assert.Equal("ExistingValue", configProperty.PropertyValue);
     }
-}
 
-public class TestConfiguration
-{
-    private static string _testStringProperty = "Default";
-    public static int TestStringPropertySetCount { get; set; }
+    [Fact]
+    public void UpdateFrom_InvalidType_ThrowsArgumentException()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = "ExistingValue"
+        };
 
-    [SerializableConfigurationProperty]
-    public static string TestStringProperty
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => configProperty.UpdateFrom(123));
+    }
+
+    [Fact]
+    public void UpdateFrom_ConfigPropertySource_CopiesValue()
     {
-        get => _testStringProperty;
-        set
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var configProperty = new ConfigProperty
         {
-            TestStringPropertySetCount++;
-            _testStringProperty = value ?? throw new ArgumentNullException (nameof (value));
+            PropertyInfo = propertyInfo,
+            PropertyValue = "ExistingValue"
+        };
+
+        var sourceConfigProperty = new ConfigProperty
+        {
+            PropertyValue = "SourceValue",
+            HasValue = true
+        };
+
+        // Act
+        var result = configProperty.UpdateFrom(sourceConfigProperty);
+
+        // Assert
+        Assert.Equal("SourceValue", result);
+        Assert.Equal("SourceValue", configProperty.PropertyValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_ConfigPropertySource_WithoutValue_KeepsExistingValue()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = "ExistingValue"
+        };
+
+        var sourceConfigProperty = new ConfigProperty
+        {
+            HasValue = false
+        };
+
+        // Act
+        var result = configProperty.UpdateFrom(sourceConfigProperty);
+
+        // Assert
+        Assert.Equal("ExistingValue", result);
+        Assert.Equal("ExistingValue", configProperty.PropertyValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_ConcurrentDictionaryOfThemeScopes_UpdatesValues()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestDictionaryProperty));
+
+        // Create a destination dictionary
+        var destinationDict = new ConcurrentDictionary<string, ThemeScope>(StringComparer.InvariantCultureIgnoreCase);
+        destinationDict.TryAdd("theme1", new ThemeScope());
+
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = destinationDict
+        };
+
+        // Create a source dictionary with one matching key and one new key
+        var sourceDict = new ConcurrentDictionary<string, ThemeScope>(StringComparer.InvariantCultureIgnoreCase);
+        var sourceTheme1 = new ThemeScope();
+        var sourceTheme2 = new ThemeScope();
+
+        // Add a property to sourceTheme1 to verify it gets updated
+        var keyProperty = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestKeyProperty));
+        if (sourceTheme1.TryAdd("TestKey", new ConfigProperty { PropertyInfo = keyProperty, PropertyValue = Key.A.WithCtrl, HasValue = true }))
+        {
+            // Successfully added
         }
+
+        sourceDict.TryAdd("theme1", sourceTheme1);
+        sourceDict.TryAdd("theme2", sourceTheme2);
+
+        // Act
+        var result = configProperty.UpdateFrom(sourceDict);
+
+        // Assert
+        var resultDict = result as ConcurrentDictionary<string, ThemeScope>;
+        Assert.NotNull(resultDict);
+        Assert.Equal(2, resultDict.Count);
+        Assert.True(resultDict.ContainsKey("theme1"));
+        Assert.True(resultDict.ContainsKey("theme2"));
+
+        // Verify the theme1 was updated with the property
+        Assert.True(resultDict["theme1"].ContainsKey("TestKey"));
+        Assert.Equal(Key.A.WithCtrl, resultDict["theme1"]["TestKey"].PropertyValue);
     }
 
-    private static Key _testKeyProperty = Key.Esc;
+    [Fact]
+    public void UpdateFrom_ConcurrentDictionaryOfConfigProperties_UpdatesValues()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestConfigDictionaryProperty));
 
-    public static int TestKeyPropertySetCount { get; set; }
+        // Create a destination dictionary
+        var destinationDict = new ConcurrentDictionary<string, ConfigProperty>(StringComparer.InvariantCultureIgnoreCase);
+        destinationDict.TryAdd("prop1", new ConfigProperty { PropertyValue = "Original", HasValue = true });
 
-    [SerializableConfigurationProperty]
-    public static Key TestKeyProperty
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = destinationDict
+        };
+
+        // Create a source dictionary with one matching key and one new key
+        var sourceDict = new ConcurrentDictionary<string, ConfigProperty>(StringComparer.InvariantCultureIgnoreCase);
+        sourceDict.TryAdd("prop1", new ConfigProperty { PropertyValue = "Updated", HasValue = true });
+        sourceDict.TryAdd("prop2", new ConfigProperty { PropertyValue = "New", HasValue = true });
+
+        // Act
+        var result = configProperty.UpdateFrom(sourceDict);
+
+        // Assert
+        var resultDict = result as ConcurrentDictionary<string, ConfigProperty>;
+        Assert.NotNull(resultDict);
+        Assert.Equal(2, resultDict.Count);
+        Assert.True(resultDict.ContainsKey("prop1"));
+        Assert.True(resultDict.ContainsKey("prop2"));
+        Assert.Equal("Updated", resultDict["prop1"].PropertyValue);
+        Assert.Equal("New", resultDict["prop2"].PropertyValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_DictionaryOfConfigProperties_UpdatesValues()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestConfigDictionaryProperty));
+
+        // Create a destination dictionary
+        var destinationDict = new Dictionary<string, ConfigProperty>(StringComparer.InvariantCultureIgnoreCase);
+        destinationDict.Add("prop1", new ConfigProperty { PropertyValue = "Original", HasValue = true });
+
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = destinationDict
+        };
+
+        // Create a source dictionary with one matching key and one new key
+        var sourceDict = new Dictionary<string, ConfigProperty>(StringComparer.InvariantCultureIgnoreCase);
+        sourceDict.Add("prop1", new ConfigProperty { PropertyValue = "Updated", HasValue = true });
+        sourceDict.Add("prop2", new ConfigProperty { PropertyValue = "New", HasValue = true });
+
+        // Act
+        var result = configProperty.UpdateFrom(sourceDict);
+
+        // Assert
+        var resultDict = result as Dictionary<string, ConfigProperty>;
+        Assert.NotNull(resultDict);
+        Assert.Equal(2, resultDict.Count);
+        Assert.True(resultDict.ContainsKey("prop1"));
+        Assert.True(resultDict.ContainsKey("prop2"));
+        Assert.Equal("Updated", resultDict["prop1"].PropertyValue);
+        Assert.Equal("New", resultDict["prop2"].PropertyValue);
+    }
+
+    [Fact]
+    public void PropertyValue_SetWhenImmutable_ThrowsException()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            Immutable = true
+        };
+
+        // Act & Assert
+        var exception = Assert.Throws<InvalidOperationException>(() => configProperty.PropertyValue = "New Value");
+        Assert.Contains("immutable", exception.Message);
+    }
+
+    [Fact]
+    public void CreateWithAttributeInfo_ReturnsConfigPropertyWithCorrectValues()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+
+        // Act
+        var configProperty = ConfigProperty.CreateImmutableWithAttributeInfo(propertyInfo!);
+
+        // Assert
+        Assert.Equal(propertyInfo, configProperty.PropertyInfo);
+        Assert.False(configProperty.OmitClassName);
+        Assert.True(configProperty.Immutable);
+        Assert.Null(configProperty.PropertyValue);
+        Assert.False(configProperty.HasValue);
+    }
+
+    [Fact]
+    public void HasConfigurationPropertyAttribute_ReturnsTrue_ForDecoratedProperty()
+    {
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringProperty));
+
+        // Act
+        var result = ConfigProperty.HasConfigurationPropertyAttribute(propertyInfo!);
+
+        // Assert
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void HasConfigurationPropertyAttribute_ReturnsFalse_ForNonDecoratedProperty()
     {
-        get => _testKeyProperty;
-        set
+        // Arrange
+        var propertyInfo = typeof(TestConfiguration).GetProperty(nameof(TestConfiguration.TestStringPropertySetCount));
+
+        // Act
+        var result = ConfigProperty.HasConfigurationPropertyAttribute(propertyInfo!);
+
+        // Assert
+        Assert.False(result);
+    }
+    public class TestConfiguration
+    {
+        private static string _testStringProperty = "Default";
+        public static int TestStringPropertySetCount { get; set; }
+
+        [ConfigurationProperty]
+        public static string TestStringProperty
         {
-            TestKeyPropertySetCount++;
-            _testKeyProperty = value ?? throw new ArgumentNullException (nameof (value));
+            get => _testStringProperty;
+            set
+            {
+                TestStringPropertySetCount++;
+                _testStringProperty = value ?? throw new ArgumentNullException (nameof (value));
+            }
+        }
+
+        private static Key _testKeyProperty = Key.Esc;
+        public static int TestKeyPropertySetCount { get; set; }
+
+        [ConfigurationProperty]
+        public static Key TestKeyProperty
+        {
+            get => _testKeyProperty;
+            set
+            {
+                TestKeyPropertySetCount++;
+                _testKeyProperty = value ?? throw new ArgumentNullException (nameof (value));
+            }
+        }
+
+        // Add these new properties for testing dictionaries
+        [ConfigurationProperty]
+        public static ConcurrentDictionary<string, ThemeScope>? TestDictionaryProperty { get; set; }
+
+        [ConfigurationProperty]
+        public static Dictionary<string, ConfigProperty>? TestRegularDictionaryProperty { get; set; }
+
+        [ConfigurationProperty]
+        public static ConcurrentDictionary<string, ConfigProperty>? TestConfigDictionaryProperty { get; set; }
+
+        [ConfigurationProperty]
+        public static Scheme? TestSchemeProperty { get; set; }
+
+
+        public static void Reset ()
+        {
+            TestStringPropertySetCount = 0;
+            TestKeyPropertySetCount = 0;
+            TestDictionaryProperty = null;
+            TestRegularDictionaryProperty = null;
+            TestConfigDictionaryProperty = null;
+            TestSchemeProperty = null;
         }
     }
 
-    public static void Reset ()
+    [Fact]
+    public void UpdateFrom_SchemeSource_UpdatesValue ()
     {
-        TestStringPropertySetCount = 0;
-        TestKeyPropertySetCount = 0;
+        // Arrange
+        PropertyInfo? propertyInfo = typeof (TestConfiguration).GetProperty (nameof (TestConfiguration.TestSchemeProperty));
+        Scheme sourceScheme = new (new Attribute (Color.Red, Color.Blue, TextStyle.Bold));
+
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo!,
+            PropertyValue = new Scheme (new Attribute (Color.White, Color.Black, TextStyle.None))
+        };
+
+        // Act
+        object? result = configProperty.UpdateFrom (sourceScheme);
+
+        // Assert
+        Assert.Equal (sourceScheme, result);
+        Assert.Equal (sourceScheme, configProperty.PropertyValue);
+        Assert.NotSame (sourceScheme, configProperty.PropertyValue); // Prove it's a clone, not a ref
     }
 }
diff --git a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
index 949136de2b..eb00652f04 100644
--- a/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
+++ b/Tests/UnitTests/Configuration/ConfigurationMangerTests.cs
@@ -1,457 +1,465 @@
-using System.Diagnostics;
+using System.Collections.Frozen;
+using System.Diagnostics;
 using System.Reflection;
+using System.Text;
 using System.Text.Json;
-using UnitTests;
+using ColorHelper;
 using Xunit.Abstractions;
 using static Terminal.Gui.ConfigurationManager;
+using File = System.IO.File;
+
 #pragma warning disable IDE1006
 
 namespace Terminal.Gui.ConfigurationTests;
 
-public class ConfigurationManagerTests
+public class ConfigurationManagerTests (ITestOutputHelper output)
 {
-    private readonly ITestOutputHelper _output;
+    [Fact]
+    public void ModuleInitializer_Was_Called ()
+    {
+        Assert.False (IsEnabled);
+        Assert.True (IsInitialized ());
+    }
 
-    public ConfigurationManagerTests (ITestOutputHelper output)
+    [Fact]
+    public void Initialize_Throws_If_Called_Explicitly ()
     {
-        _output = output;
+        Assert.False (IsEnabled);
+
+        Assert.Throws<InvalidOperationException> (Initialize);
     }
 
-    public static readonly JsonSerializerOptions _jsonOptions = new ()
+    [Fact]
+    public void HardCodedDefaultCache_Properties_Are_Copies ()
     {
-        Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
-    };
+        Assert.False (IsEnabled);
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Equal (Key.Esc, Application.QuitKey);
+
+        ConfigProperty fromSettings = Settings! ["Application.QuitKey"];
+
+        FrozenDictionary<string, ConfigProperty> initialCache = GetHardCodedConfigPropertyCache ();
+        Assert.NotNull (initialCache);
+
+        ConfigProperty fromCache = initialCache ["Application.QuitKey"];
+
+        // Assert
+        Assert.NotEqual (fromCache, fromSettings);
+        Disable (true);
+    }
 
     [Fact]
-    public void Apply_Raises_Applied ()
+    public void HardCodedDefaultCache_Properties_Are_Immutable ()
     {
-        Reset ();
-        Applied += ConfigurationManager_Applied;
-        var fired = false;
+        Assert.False (IsEnabled);
 
-        void ConfigurationManager_Applied (object sender, ConfigurationManagerEventArgs obj)
+        try
         {
-            fired = true;
+            Enable (ConfigLocations.HardCoded);
+            Assert.Equal (Key.Esc, Application.QuitKey);
 
-            // assert
-            Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
-            Assert.Equal (KeyCode.F, Application.NextTabGroupKey.KeyCode);
-            Assert.Equal (KeyCode.B, Application.PrevTabGroupKey.KeyCode);
-        }
+            FrozenDictionary<string, ConfigProperty> initialCache = GetHardCodedConfigPropertyCache ();
+            Assert.NotNull (initialCache);
+            Assert.Equal (Key.Esc, (Key)initialCache ["Application.QuitKey"].PropertyValue);
 
-        // act
-        Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
-        Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
-        Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
+            // Act
+            Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
+            Assert.Equal (Key.Q, (Key)Settings ["Application.QuitKey"].PropertyValue);
 
-        Apply ();
+            Settings ["Application.QuitKey"].Apply ();
+            Assert.Equal (Key.Q, Application.QuitKey);
 
-        // assert
-        Assert.True (fired);
+            Application.QuitKey = Key.K;
 
-        Applied -= ConfigurationManager_Applied;
-        Reset ();
+            // Assert
+            FrozenDictionary<string, ConfigProperty> cache = GetHardCodedConfigPropertyCache ();
+            Assert.Equal (initialCache, cache);
+            Assert.True (initialCache ["Application.QuitKey"].Immutable);
+            Assert.Equal (Key.Esc, (Key)initialCache ["Application.QuitKey"].PropertyValue);
+        }
+        finally
+        {
+            Disable (true);
+            Application.ResetState (true);
+        }
     }
 
     [Fact]
-    public void DeepMemberWiseCopyTest ()
+    public void Disable_Settings_Is_NotNull ()
     {
-        // Value types
-        var stringDest = "Destination";
-        var stringSrc = "Source";
-        object stringCopy = DeepMemberWiseCopy (stringSrc, stringDest);
-        Assert.Equal (stringSrc, stringCopy);
-
-        stringDest = "Destination";
-        stringSrc = "Destination";
-        stringCopy = DeepMemberWiseCopy (stringSrc, stringDest);
-        Assert.Equal (stringSrc, stringCopy);
-
-        stringDest = "Destination";
-        stringSrc = null;
-        stringCopy = DeepMemberWiseCopy (stringSrc, stringDest);
-        Assert.Equal (stringSrc, stringCopy);
-
-        stringDest = "Destination";
-        stringSrc = string.Empty;
-        stringCopy = DeepMemberWiseCopy (stringSrc, stringDest);
-        Assert.Equal (stringSrc, stringCopy);
-
-        var boolDest = true;
-        var boolSrc = false;
-        object boolCopy = DeepMemberWiseCopy (boolSrc, boolDest);
-        Assert.Equal (boolSrc, boolCopy);
-
-        boolDest = false;
-        boolSrc = true;
-        boolCopy = DeepMemberWiseCopy (boolSrc, boolDest);
-        Assert.Equal (boolSrc, boolCopy);
-
-        boolDest = true;
-        boolSrc = true;
-        boolCopy = DeepMemberWiseCopy (boolSrc, boolDest);
-        Assert.Equal (boolSrc, boolCopy);
-
-        boolDest = false;
-        boolSrc = false;
-        boolCopy = DeepMemberWiseCopy (boolSrc, boolDest);
-        Assert.Equal (boolSrc, boolCopy);
-
-        // Structs
-        var attrDest = new Attribute (Color.Black);
-        var attrSrc = new Attribute (Color.White);
-        object attrCopy = DeepMemberWiseCopy (attrSrc, attrDest);
-        Assert.Equal (attrSrc, attrCopy);
-
-        // Classes
-        var colorschemeDest = new ColorScheme { Disabled = new Attribute (Color.Black) };
-        var colorschemeSrc = new ColorScheme { Disabled = new Attribute (Color.White) };
-        object colorschemeCopy = DeepMemberWiseCopy (colorschemeSrc, colorschemeDest);
-        Assert.Equal (colorschemeSrc, colorschemeCopy);
-
-        // Dictionaries
-        Dictionary<string, Attribute> dictDest = new () { { "Disabled", new Attribute (Color.Black) } };
-        Dictionary<string, Attribute> dictSrc = new () { { "Disabled", new Attribute (Color.White) } };
-        Dictionary<string, Attribute> dictCopy = (Dictionary<string, Attribute>)DeepMemberWiseCopy (dictSrc, dictDest);
-        Assert.Equal (dictSrc, dictCopy);
-
-        dictDest = new Dictionary<string, Attribute> { { "Disabled", new Attribute (Color.Black) } };
-
-        dictSrc = new Dictionary<string, Attribute>
-        {
-            { "Disabled", new Attribute (Color.White) }, { "Normal", new Attribute (Color.Blue) }
-        };
-        dictCopy = (Dictionary<string, Attribute>)DeepMemberWiseCopy (dictSrc, dictDest);
-        Assert.Equal (dictSrc, dictCopy);
+        Assert.False (IsEnabled);
+
+        Disable ();
+        Assert.NotNull (Settings);
+    }
 
-        // src adds an item
-        dictDest = new Dictionary<string, Attribute> { { "Disabled", new Attribute (Color.Black) } };
 
-        dictSrc = new Dictionary<string, Attribute>
-        {
-            { "Disabled", new Attribute (Color.White) }, { "Normal", new Attribute (Color.Blue) }
-        };
-        dictCopy = (Dictionary<string, Attribute>)DeepMemberWiseCopy (dictSrc, dictDest);
-        Assert.Equal (2, dictCopy!.Count);
-        Assert.Equal (dictSrc ["Disabled"], dictCopy ["Disabled"]);
-        Assert.Equal (dictSrc ["Normal"], dictCopy ["Normal"]);
-
-        // src updates only one item
-        dictDest = new Dictionary<string, Attribute>
-        {
-            { "Disabled", new Attribute (Color.Black) }, { "Normal", new Attribute (Color.White) }
-        };
-        dictSrc = new Dictionary<string, Attribute> { { "Disabled", new Attribute (Color.White) } };
-        dictCopy = (Dictionary<string, Attribute>)DeepMemberWiseCopy (dictSrc, dictDest);
-        Assert.Equal (2, dictCopy!.Count);
-        Assert.Equal (dictSrc ["Disabled"], dictCopy ["Disabled"]);
-        Assert.Equal (dictDest ["Normal"], dictCopy ["Normal"]);
+    [Fact]
+    public void Disable_With_ResetToHardCodedDefaults_True_Works_When_Disabled ()
+    {
+        Assert.False (ConfigurationManager.IsEnabled);
+        ConfigurationManager.Disable (true);
     }
 
-    public class DeepCopyTest ()
+    [Fact]
+    public void Enable_Settings_Is_Valid ()
     {
-        public static Key key = Key.Esc;
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.NotNull (Settings);
+
+        Disable ();
     }
 
+
     [Fact]
-    public void Illustrate_DeepMemberWiseCopy_Breaks_Dictionary ()
+    public void Apply_Applies_Theme ()
     {
-        Assert.Equal (Key.Esc, DeepCopyTest.key);
+        Assert.False (IsEnabled);
+        Enable (ConfigLocations.HardCoded);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        Assert.NotEmpty (theme);
 
-        Dictionary<Key, string> dict = new Dictionary<Key, string> (new KeyEqualityComparer ());
-        dict.Add (new (DeepCopyTest.key), "Esc");
-        Assert.Contains (Key.Esc, dict);
+        Assert.True (ThemeManager.Themes!.TryAdd ("testTheme", theme));
+        Assert.Equal (2, ThemeManager.Themes.Count);
 
-        DeepCopyTest.key = (Key)DeepMemberWiseCopy (Key.Q.WithCtrl, DeepCopyTest.key);
+        Assert.Equal (LineStyle.Rounded, FrameView.DefaultBorderStyle);
+        theme ["FrameView.DefaultBorderStyle"].PropertyValue = LineStyle.Double;
 
-        Assert.Equal (Key.Q.WithCtrl, DeepCopyTest.key);
-        Assert.Equal (Key.Esc, dict.Keys.ToArray () [0]);
+        ThemeManager.Theme = "testTheme";
+        ConfigurationManager.Apply ();
 
-        var eq = new KeyEqualityComparer ();
-        Assert.True (eq.Equals (Key.Q.WithCtrl, DeepCopyTest.key));
-        Assert.Equal (Key.Q.WithCtrl.GetHashCode (), DeepCopyTest.key.GetHashCode ());
-        Assert.Equal (eq.GetHashCode (Key.Q.WithCtrl), eq.GetHashCode (DeepCopyTest.key));
-        Assert.Equal (Key.Q.WithCtrl.GetHashCode (), eq.GetHashCode (DeepCopyTest.key));
-        Assert.True (dict.ContainsKey (Key.Esc));
+        Assert.Equal (LineStyle.Double, FrameView.DefaultBorderStyle);
 
-        dict.Remove (Key.Esc);  
-        dict.Add (new (DeepCopyTest.key), "Ctrl+Q");
-        Assert.True (dict.ContainsKey (Key.Q.WithCtrl));
+        Disable (resetToHardCodedDefaults: true);
     }
 
     [Fact]
-    public void Load_Raises_Updated ()
+    public void Apply_Raises_Applied ()
     {
-        ThrowOnJsonErrors = true;
-        Locations = ConfigLocations.All;
-        Reset ();
-        Assert.Equal (Key.Esc, (((Key)Settings! ["Application.QuitKey"].PropertyValue)!).KeyCode);
+        Assert.False (IsEnabled);
 
-        Updated += ConfigurationManager_Updated;
+        Enable (ConfigLocations.HardCoded);
+
+        Applied += ConfigurationManagerApplied;
         var fired = false;
 
-        void ConfigurationManager_Updated (object sender, ConfigurationManagerEventArgs obj)
+        void ConfigurationManagerApplied (object sender, ConfigurationManagerEventArgs obj)
         {
             fired = true;
+
+            // assert
+            Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
+            Assert.Equal (KeyCode.F, Application.NextTabGroupKey.KeyCode);
+            Assert.Equal (KeyCode.B, Application.PrevTabGroupKey.KeyCode);
         }
 
-        // Act
-        // Reset to cause load to raise event
-        Load (true);
+        // act
+        Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
+        Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
+        Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
+
+        Apply ();
 
         // assert
         Assert.True (fired);
 
-        Updated -= ConfigurationManager_Updated;
+        Applied -= ConfigurationManagerApplied;
 
-        // clean up
-        Locations = ConfigLocations.Default;
-        Reset ();
+        Disable (resetToHardCodedDefaults: true);
+        Application.ResetState (true);
     }
 
     [Fact]
-    public void Load_Performance_Check ()
+    public void Load_Raises_Updated ()
     {
-        Locations = ConfigLocations.All;
-        Reset ();
+        Assert.False (IsEnabled);
 
-        // Start stopwatch
-        Stopwatch stopwatch = new Stopwatch ();
-        stopwatch.Start ();
+        var fired = false;
+        Enable (ConfigLocations.HardCoded);
+
+        ThrowOnJsonErrors = true;
+        Assert.Equal (Key.Esc, ((Key)Settings! ["Application.QuitKey"].PropertyValue)!.KeyCode);
+
+        Updated += ConfigurationManagerUpdated;
 
         // Act
-        Load (true);
-        Apply();
+        // Only select locations under test control
+        Load (ConfigLocations.LibraryResources | ConfigLocations.AppResources | ConfigLocations.Runtime);
+
+        // assert
+        Assert.True (fired);
 
-        // Stop stopwatch
-        stopwatch.Stop ();
+        // clean up
+        Updated -= ConfigurationManagerUpdated;
+        Disable (true);
+        Application.ResetState (true);
 
-        // Assert
-        _output.WriteLine ($"Load took {stopwatch.ElapsedMilliseconds} ms");
+        return;
+
+        void ConfigurationManagerUpdated (object sender, ConfigurationManagerEventArgs obj) { fired = true; }
     }
 
+    [Fact]
+    public void Load_And_Apply_Performance_Check ()
+    {
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        try
+        {
+            // Start stopwatch
+            var stopwatch = new Stopwatch ();
+            stopwatch.Start ();
+
+            // Act
+            Load (ConfigLocations.All);
+            Apply ();
+
+            // Stop stopwatch
+            stopwatch.Stop ();
+
+            // Assert
+            output.WriteLine ($"Load took {stopwatch.ElapsedMilliseconds} ms");
+
+            // Ensure load time is reasonable (adjust threshold as needed)
+            Assert.True (
+                         stopwatch.ElapsedMilliseconds < 1000,
+                         $"Loading configuration took {stopwatch.ElapsedMilliseconds}ms, which exceeds reasonable threshold");
+        }
+        finally
+        {
+            Disable (true);
+            Application.ResetState (true);
+        }
+    }
 
     [Fact]
     public void Load_Loads_Custom_Json ()
     {
-        // arrange
-        Locations = ConfigLocations.Runtime | ConfigLocations.Default;
-        Reset ();
-        ThrowOnJsonErrors = true;
+        Assert.False (IsEnabled);
 
-        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+            ThrowOnJsonErrors = true;
 
-        // act
-        RuntimeConfig = """
-                   
-                           {
-                                 "Application.QuitKey": "Ctrl-Q"
-                           }
-                   """;
-        Load (false);
+            Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
 
-        // assert
-        Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue);
+            // act
+            RuntimeConfig = """
+                            
+                                    {
+                                          "Application.QuitKey": "Ctrl-Q"
+                                    }
+                            """;
+            Load (ConfigLocations.Runtime);
 
-        // clean up
-        Locations = ConfigLocations.Default;
-        Reset ();
+            // assert
+            Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue);
+        }
+        finally
+        {
+            // clean up
+            Disable (true);
+            Application.ResetState (true);
+        }
     }
 
-    //[Fact]
-    //[AutoInitShutdown]
-    //public void LoadConfigurationFromAllSources_ShouldLoadSettingsFromAllSources ()
-    //{
-    //    //var _configFilename = "config.json";
-    //    //// Arrange
-    //    //// Create a mock of the configuration files in all sources
-    //    //// Home directory
-    //    //string homeDir = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), ".tui");
-    //    //if (!Directory.Exists (homeDir)) {
-    //    //	Directory.CreateDirectory (homeDir);
-    //    //}
-    //    //string globalConfigFile = Path.Combine (homeDir, _configFilename);
-    //    //string appSpecificConfigFile = Path.Combine (homeDir, "appname.config.json");
-    //    //File.WriteAllText (globalConfigFile, "{\"Settings\": {\"TestSetting\":\"Global\"}}");
-    //    //File.WriteAllText (appSpecificConfigFile, "{\"Settings\": {\"TestSetting\":\"AppSpecific\"}}");
-
-    //    //// App directory
-    //    //string appDir = Directory.GetCurrentDirectory ();
-    //    //string appDirGlobalConfigFile = Path.Combine (appDir, _configFilename);
-    //    //string appDirAppSpecificConfigFile = Path.Combine (appDir, "appname.config.json");
-    //    //File.WriteAllText (appDirGlobalConfigFile, "{\"Settings\": {\"TestSetting\":\"GlobalAppDir\"}}");
-    //    //File.WriteAllText (appDirAppSpecificConfigFile, "{\"Settings\": {\"TestSetting\":\"AppSpecificAppDir\"}}");
-
-    //    //// App resources
-    //    //// ...
-
-    //    //// Act
-    //    //ConfigurationManager.Locations = ConfigurationManager.ConfigLocation.All;
-    //    //ConfigurationManager.Load ();
-
-    //    //// Assert
-    //    //// Check that the settings from the highest precedence source are loaded
-    //    //Assert.Equal ("AppSpecific", ConfigurationManager.Config.Settings.TestSetting);
-    //}
+    [Fact (Skip = "Events disabled")]
+    public void ResetToCurrentValues_Raises_Updated ()
+    {
+        Assert.False (IsEnabled);
+
+        var fired = false;
+
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+
+            Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
+
+            Updated += ConfigurationManagerUpdated;
+
+            // Act
+            ResetToCurrentValues ();
+
+            // assert
+            Assert.True (fired);
+        }
+        finally
+        {
+            Updated -= ConfigurationManagerUpdated;
+
+            Disable (true);
+            Application.ResetState (true);
+        }
+
+        return;
 
+        void ConfigurationManagerUpdated (object sender, ConfigurationManagerEventArgs obj) { fired = true; }
+    }
 
     [Fact]
-    public void Reset_Raises_Updated ()
+    public void ResetToHardCodedDefaults_and_Load_LibraryResourcesOnly_are_same ()
     {
-        ConfigLocations savedLocations = Locations;
-        Locations = ConfigLocations.All;
-        Reset ();
+        Assert.False (IsEnabled);
 
-        Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
+        try
+        {
+            // arrange
+            Enable (ConfigLocations.HardCoded);
 
-        Updated += ConfigurationManager_Updated;
-        var fired = false;
+            Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
+            Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
+            Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
+            Settings.Apply ();
+
+            // assert apply worked
+            Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
+            Assert.Equal (KeyCode.F, Application.NextTabGroupKey.KeyCode);
+            Assert.Equal (KeyCode.B, Application.PrevTabGroupKey.KeyCode);
+
+            //act
+            ResetToHardCodedDefaults ();
 
-        void ConfigurationManager_Updated (object sender, ConfigurationManagerEventArgs obj)
+            // assert
+            Assert.NotEmpty (ThemeManager.Themes!);
+            Assert.Equal ("Default", ThemeManager.Theme);
+            Assert.Equal (Key.Esc, Application.QuitKey);
+            Assert.Equal (Key.F6, Application.NextTabGroupKey);
+            Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
+
+            // arrange
+            Settings ["Application.QuitKey"].PropertyValue = Key.Q;
+            Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
+            Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
+            Settings.Apply ();
+
+            // act
+            Load (ConfigLocations.LibraryResources);
+            Apply ();
+
+            // assert
+            Assert.NotEmpty (ThemeManager.Themes);
+            Assert.Equal ("Default", ThemeManager.Theme);
+            Assert.Equal (KeyCode.Esc, Application.QuitKey.KeyCode);
+            Assert.Equal (Key.F6, Application.NextTabGroupKey);
+            Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
+        }
+        finally
         {
-            fired = true;
+            Disable (true);
+            Application.ResetState (true);
         }
+    }
+
+    [Fact]
+    public void ResetToCurrentValues_Enabled_Resets ()
+    {
+        Assert.False (IsEnabled);
 
         // Act
-        Reset ();
+        Enable (ConfigLocations.HardCoded);
 
-        // assert
-        Assert.True (fired);
+        Application.QuitKey = Key.A;
 
-        Updated -= ConfigurationManager_Updated;
-        Reset ();
-        Locations = savedLocations;
-    }
+        ResetToCurrentValues ();
 
+        Assert.Equal (Key.A, (Key)Settings! ["Application.QuitKey"].PropertyValue);
+        Assert.NotNull (Settings);
+        Assert.NotNull (AppSettings);
+        Assert.NotNull (ThemeManager.Themes);
+
+        // Default Theme should be "Default"
+        Assert.Single (ThemeManager.Themes);
+        Assert.Equal (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Theme);
+
+        ResetToHardCodedDefaults ();
+        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
+        Disable ();
+        Application.ResetState (true);
+    }
 
     [Fact]
-    public void Reset_and_ResetLoadWithLibraryResourcesOnly_are_same ()
+    public void ConfigurationManager_DefaultPrecedence_IsRespected ()
     {
-        Locations = ConfigLocations.Default;
+        Assert.False (IsEnabled);
 
-        // arrange
-        Reset ();
-        Settings! ["Application.QuitKey"].PropertyValue = Key.Q;
-        Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
-        Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
-        Settings.Apply ();
+        try
+        {
+            // arrange
+            Enable (ConfigLocations.HardCoded);
 
-        // assert apply worked
-        Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
-        Assert.Equal (KeyCode.F, Application.NextTabGroupKey.KeyCode);
-        Assert.Equal (KeyCode.B, Application.PrevTabGroupKey.KeyCode);
+            ThrowOnJsonErrors = true;
 
-        //act
-        Reset ();
+            // Setup multiple configurations with the same setting
+            // with different precedence levels
+            RuntimeConfig = """
+                            {
+                                 "Application.QuitKey": "Alt+Q"  
+                            }
+                            """;
 
-        // assert
-        Assert.NotEmpty (Themes!);
-        Assert.Equal ("Default", Themes.Theme);
-        Assert.Equal (Key.Esc, Application.QuitKey);
-        Assert.Equal (Key.F6, Application.NextTabGroupKey);
-        Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
+            var defaultConfig = """
+                                {
+                                     "Application.QuitKey": "Ctrl+X"
+                                }
+                                """;
 
-        // arrange
-        Settings ["Application.QuitKey"].PropertyValue = Key.Q;
-        Settings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
-        Settings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
-        Settings.Apply ();
+            // Update default config first (lower precedence)
+            SourcesManager?.Load (Settings, defaultConfig, "default-test", ConfigLocations.LibraryResources);
 
-        Locations = ConfigLocations.Default;
+            // Then load runtime config, which should override default
+            Load (ConfigLocations.Runtime);
 
-        // act
-        Reset ();
-        Load ();
+            // Assert - the runtime config should win due to precedence
+            Assert.Equal (Key.Q.WithAlt, (Key)Settings! ["Application.QuitKey"].PropertyValue);
 
-        // assert
-        Assert.NotEmpty (Themes);
-        Assert.Equal ("Default", Themes.Theme);
-        Assert.Equal (KeyCode.Esc, Application.QuitKey.KeyCode);
-        Assert.Equal (Key.F6, Application.NextTabGroupKey);
-        Assert.Equal (Key.F6.WithShift, Application.PrevTabGroupKey);
-        Reset ();
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
+    /// <summary>Save the `config.json` file; this can be used to update the file in `Terminal.Gui.Resources.config.json'.</summary>
+    /// <remarks>
+    ///     IMPORTANT: For the file generated to be valid, this must be the ONLY test run. Config Properties are all
+    ///     static and thus can be overwritten by other tests.
+    /// </remarks>
     [Fact]
-    public void Reset_Resets ()
+    public void Save_HardCodedDefaults_To_config_json ()
     {
-        Locations = ConfigLocations.Default;
-        Reset ();
-        Assert.NotEmpty (Themes!);
-        Assert.Equal ("Default", Themes.Theme);
-    }
+        Assert.False (IsEnabled);
+
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+
+            // Get the hard coded settings
+            ResetToHardCodedDefaults ();
 
-    //[Fact ()]
-    //public void LoadFromJsonTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void ToJsonTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void UpdateConfigurationTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void UpdateConfigurationFromFileTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void SaveHardCodedDefaultsTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadGlobalFromLibraryResourceTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadGlobalFromAppDirectoryTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadGlobalFromHomeDirectoryTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadAppFromAppResourcesTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadAppFromAppDirectoryTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadAppFromHomeDirectoryTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
-
-    //[Fact ()]
-    //public void LoadTest ()
-    //{
-    //	Assert.True (false, "This test needs an implementation");
-    //}
+            // Serialize to a JSON string
+            string json = SourcesManager?.ToJson (Settings);
+
+            // Write the JSON string to the file
+            File.WriteAllText ("hard_coded_defaults_config.json", json);
+
+            // Verify the file was created
+            Assert.True (File.Exists ("hard_coded_defaults_config.json"), "Failed to create config.json file");
+        }
+        finally
+        {
+            Disable (true);
+        }
+    }
 
     /// <summary>Save the `config.json` file; this can be used to update the file in `Terminal.Gui.Resources.config.json'.</summary>
     /// <remarks>
@@ -459,125 +467,203 @@ public void Reset_Resets ()
     ///     static and thus can be overwritten by other tests.
     /// </remarks>
     [Fact]
-    public void SaveDefaults ()
+    public void Save_Library_Defaults_To_config_json ()
     {
-        Initialize ();
-        Reset ();
+        Assert.False (IsEnabled);
 
-        // Get the hard coded settings
-        GetHardCodedDefaults ();
+        try
+        {
+            Enable (ConfigLocations.LibraryResources);
+
+            // Serialize to a JSON string
+            string json = SourcesManager?.ToJson (Settings);
 
-        // Serialize to a JSON string
-        string json = ToJson ();
+            // Write the JSON string to the file
+            File.WriteAllText ("library_defaults_config.json", json);
 
-        // Write the JSON string to the file
-        File.WriteAllText ("config.json", json);
+            // Verify the file was created
+            Assert.True (File.Exists ("library_defaults_config.json"), "Failed to create config.json file");
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
     [Fact]
     public void TestConfigProperties ()
     {
-        Locations = ConfigLocations.All;
-        Reset ();
-
-        Assert.NotEmpty (Settings!);
-
-        // test that all ConfigProperties have our attribute
-        Assert.All (
-                    Settings,
-                    item => Assert.NotEmpty (
-                                             item.Value.PropertyInfo!.CustomAttributes.Where (
-                                                                                              a => a.AttributeType == typeof (SerializableConfigurationProperty)
-                                                                                             )
-                                            )
-                   );
-
-#pragma warning disable xUnit2029
-        Assert.Empty (
-                      Settings.Where (
-                                      cp => cp.Value.PropertyInfo!.GetCustomAttribute (
-                                                                                       typeof (SerializableConfigurationProperty)
-                                                                                      )
-                                            == null
-                                     )
-                     );
-#pragma warning restore xUnit2029
-
-        // Application is a static class
-        PropertyInfo pi = typeof (Application).GetProperty ("QuitKey");
-        Assert.Equal (pi, Settings ["Application.QuitKey"].PropertyInfo);
-
-        // FrameView is not a static class and DefaultBorderStyle is Scope.Scheme
-        pi = typeof (FrameView).GetProperty ("DefaultBorderStyle");
-        Assert.False (Settings.ContainsKey ("FrameView.DefaultBorderStyle"));
-        Assert.True (Themes! ["Default"].ContainsKey ("FrameView.DefaultBorderStyle"));
-        Assert.Equal (pi, Themes! ["Default"] ["FrameView.DefaultBorderStyle"].PropertyInfo);
+        Assert.False (IsEnabled);
+
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+
+            Assert.NotEmpty (Settings!);
+
+            // test that all ConfigProperties have our attribute
+            Assert.All (
+                        Settings,
+                        item => Assert.Contains (item.Value.PropertyInfo!.CustomAttributes, a => a.AttributeType
+                                                                                                       == typeof (ConfigurationPropertyAttribute)
+));
+
+#pragma warning disable xUnit2030
+            Assert.DoesNotContain (Settings, cp => cp.Value.PropertyInfo!.GetCustomAttribute (
+                                                                                           typeof (ConfigurationPropertyAttribute)
+                                                                                          )
+                                                == null
+);
+#pragma warning restore xUnit2030
+
+            // Application is a static class
+            PropertyInfo pi = typeof (Application).GetProperty ("QuitKey");
+            Assert.Equal (pi, Settings ["Application.QuitKey"].PropertyInfo);
+
+            // FrameView is not a static class and DefaultBorderStyle is Scope.Scheme
+            pi = typeof (FrameView).GetProperty ("DefaultBorderStyle");
+            Assert.False (Settings.ContainsKey ("FrameView.DefaultBorderStyle"));
+            Assert.True (ThemeManager.GetCurrentTheme ().ContainsKey ("FrameView.DefaultBorderStyle"));
+            Assert.Equal (pi, ThemeManager.GetCurrentTheme () ["FrameView.DefaultBorderStyle"].PropertyInfo);
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
     [Fact]
-    public void TestConfigPropertyOmitClassName ()
+    public void Load_And_Apply_HardCoded ()
     {
-        ConfigLocations savedLocations = Locations;
-        Locations = ConfigLocations.All;
+        Assert.False (IsEnabled);
+
+        try
+        {
+            // Spot check by setting some of the config properties
+            Application.QuitKey = Key.X.WithCtrl;
+            FileDialog.MaxSearchResults = 1;
+
+            Enable (ConfigLocations.HardCoded);
+            Load (ConfigLocations.HardCoded);
+
+            // Spot check
+            Assert.Equal (Key.Esc, Settings ["Application.QuitKey"].PropertyValue as Key);
+            Assert.Equal (10000, (int)Settings ["FileDialog.MaxSearchResults"].PropertyValue!);
 
-        // Color.ColorSchemes is serialized as "ColorSchemes", not "Colors.ColorSchemes"
-        PropertyInfo pi = typeof (Colors).GetProperty ("ColorSchemes");
-        var scp = (SerializableConfigurationProperty)pi!.GetCustomAttribute (typeof (SerializableConfigurationProperty));
-        Assert.True (scp!.Scope == typeof (ThemeScope));
-        Assert.True (scp.OmitClassName);
+            Assert.Single (ThemeManager.Themes!);
+            Assert.Equal ("Default", ThemeManager.Theme);
+            Assert.NotEmpty (ThemeManager.Themes [ThemeManager.Theme]);
 
-        Reset ();
-        Assert.Equal (pi, Themes! ["Default"] ["ColorSchemes"].PropertyInfo);
+            // Verify schemes are properly initialized
+            Assert.NotNull (SchemeManager.GetSchemes ());
+            Assert.NotEmpty (SchemeManager.GetSchemes ());
 
-        Locations = savedLocations;
+            // Verify "Base" has correct values
+            //Assert.Equal (Color.White, SchemeManager.GetSchemes () ["Base"]!.Normal.Foreground);
+            //Assert.Equal (Color.Blue, SchemeManager.GetSchemes () ["Base"].Normal.Background);
+
+            Apply ();
+            Assert.Equal (Key.Esc, Application.QuitKey);
+            Assert.Equal (10000, FileDialog.MaxSearchResults);
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void TestConfigurationManagerInitDriver ()
+    public void Load_And_Apply_LibraryResources ()
     {
-        Assert.Equal ("Default", Themes!.Theme);
-
-        Assert.Equal (new Color (Color.White), Colors.ColorSchemes ["Base"]!.Normal.Foreground);
-        Assert.Equal (new Color (Color.Blue), Colors.ColorSchemes ["Base"].Normal.Background);
-
-        // Change Base
-        Stream json = ToStream ();
-
-        Settings!.Update (json, "TestConfigurationManagerInitDriver", ConfigLocations.Runtime);
-
-        Dictionary<string, ColorScheme> colorSchemes =
-            (Dictionary<string, ColorScheme>)Themes [Themes.Theme] ["ColorSchemes"].PropertyValue;
-        Assert.Equal (Colors.ColorSchemes ["Base"], colorSchemes! ["Base"]);
-        Assert.Equal (Colors.ColorSchemes ["TopLevel"], colorSchemes ["TopLevel"]);
-        Assert.Equal (Colors.ColorSchemes ["Error"], colorSchemes ["Error"]);
-        Assert.Equal (Colors.ColorSchemes ["Dialog"], colorSchemes ["Dialog"]);
-        Assert.Equal (Colors.ColorSchemes ["Menu"], colorSchemes ["Menu"]);
-
-        Colors.ColorSchemes ["Base"] = colorSchemes ["Base"];
-        Colors.ColorSchemes ["TopLevel"] = colorSchemes ["TopLevel"];
-        Colors.ColorSchemes ["Error"] = colorSchemes ["Error"];
-        Colors.ColorSchemes ["Dialog"] = colorSchemes ["Dialog"];
-        Colors.ColorSchemes ["Menu"] = colorSchemes ["Menu"];
-
-        Assert.Equal (colorSchemes ["Base"], Colors.ColorSchemes ["Base"]);
-        Assert.Equal (colorSchemes ["TopLevel"], Colors.ColorSchemes ["TopLevel"]);
-        Assert.Equal (colorSchemes ["Error"], Colors.ColorSchemes ["Error"]);
-        Assert.Equal (colorSchemes ["Dialog"], Colors.ColorSchemes ["Dialog"]);
-        Assert.Equal (colorSchemes ["Menu"], Colors.ColorSchemes ["Menu"]);
+        Assert.False (IsEnabled);
+
+        try
+        {
+            // Spot check by setting some of the config properties
+            Application.QuitKey = Key.X.WithCtrl;
+            FileDialog.MaxSearchResults = 1;
+
+            Enable (ConfigLocations.HardCoded);
+            Load (ConfigLocations.LibraryResources);
+
+            // Spot check
+            Assert.Equal (Key.Esc, Settings! ["Application.QuitKey"].PropertyValue as Key);
+            Assert.Equal (10000, (int)Settings ["FileDialog.MaxSearchResults"].PropertyValue!);
+
+            Assert.NotEmpty (ThemeManager.Themes!);
+            Assert.Equal ("Default", ThemeManager.Theme);
+            Assert.NotEmpty (ThemeManager.Themes [ThemeManager.Theme]);
+
+            // Verify schemes are properly initialized
+            Assert.NotNull (SchemeManager.GetSchemes ());
+            Assert.NotEmpty (SchemeManager.GetSchemes ());
+
+            // This is too fragile as the default scheme may change
+            // Verify "Base" has correct values
+            //Assert.Equal (Color.White, SchemeManager.Schemes ["Base"]!.Normal.Foreground);
+            //Assert.Equal (Color.Blue, SchemeManager.Schemes ["Base"].Normal.Background);
+
+            Apply ();
+            Assert.Equal (Key.Esc, Application.QuitKey);
+            Assert.Equal (10000, FileDialog.MaxSearchResults);
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.None)]
-    public void TestConfigurationManagerInitDriver_NoLocations ()
+    public void Load_And_Apply_RuntimeConfig ()
     {
-        // TODO: Write this test
+        Assert.False (IsEnabled);
+
+        try
+        {
+            // Spot check by setting some of the config properties
+            Application.QuitKey = Key.X.WithCtrl;
+            FileDialog.MaxSearchResults = 1;
+            Glyphs.Apple = new ('z');
+
+            ThrowOnJsonErrors = true;
+            Enable (ConfigLocations.HardCoded);
+
+            RuntimeConfig = """
+                            {
+                                "Application.QuitKey": "Alt-Q",
+                                "FileDialog.MaxSearchResults":9,
+                                "Themes" : [
+                                    {
+                                        "Default" : {
+                                            "Glyphs.Apple": "a"
+                                        }
+                                    }
+                                ]
+                            }
+                            """;
+            Load (ConfigLocations.Runtime);
+
+            Assert.Equal (Key.Q.WithAlt, Settings! ["Application.QuitKey"].PropertyValue as Key);
+            Assert.Equal (9, (int)Settings ["FileDialog.MaxSearchResults"].PropertyValue!);
+            Assert.Equal (new Rune ('a'), ThemeManager.GetCurrentTheme () ["Glyphs.Apple"].PropertyValue);
+
+            Apply ();
+            Assert.Equal (Key.Q.WithAlt, Application.QuitKey);
+            Assert.Equal (9, FileDialog.MaxSearchResults);
+            Assert.Equal (new ('a'), Glyphs.Apple);
+        }
+        finally
+        {
+            Disable (true);
+        }
     }
 
     [Fact]
-    public void TestConfigurationManagerInvalidJsonLogs ()
+    public void InvalidJsonLogs ()
     {
-        Application.Init (new FakeDriver ());
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
 
         ThrowOnJsonErrors = false;
 
@@ -587,7 +673,7 @@ public void TestConfigurationManagerInvalidJsonLogs ()
 				""Themes"" : [ 
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""hotNormal"": {
@@ -602,15 +688,15 @@ public void TestConfigurationManagerInvalidJsonLogs ()
 				}
 			}";
 
-        Settings!.Update (json, "test", ConfigLocations.Runtime);
+        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
-        // AbNormal is not a ColorScheme attribute
+        // AbNormal is not a Scheme attribute
         json = @"
 			{
 				""Themes"" : [ 
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""AbNormal"": {
@@ -625,7 +711,7 @@ public void TestConfigurationManagerInvalidJsonLogs ()
 				}
 			}";
 
-        Settings.Update (json, "test", ConfigLocations.Runtime);
+        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
         // Modify hotNormal background only
         json = @"
@@ -633,7 +719,7 @@ public void TestConfigurationManagerInvalidJsonLogs ()
 				""Themes"" :  [ 
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""hotNormal"": {
@@ -647,21 +733,23 @@ public void TestConfigurationManagerInvalidJsonLogs ()
 				}
 			}";
 
-        Settings.Update (json, "test", ConfigLocations.Runtime);
+        SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime);
 
-        Settings.Update ("{}}", "test", ConfigLocations.Runtime);
+        SourcesManager?.Load (Settings, "{}}", "test", ConfigLocations.Runtime);
 
         Assert.NotEqual (0, _jsonErrors.Length);
 
-        Application.Shutdown ();
-
         ThrowOnJsonErrors = false;
+
+        Disable (true);
     }
 
     [Fact]
-    [AutoInitShutdown]
-    public void TestConfigurationManagerInvalidJsonThrows ()
+    public void InvalidJsonThrows ()
     {
+        Assert.False (IsEnabled);
+        Enable (ConfigLocations.HardCoded);
+
         ThrowOnJsonErrors = true;
 
         // "yellow" is not a color
@@ -670,7 +758,7 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				""Themes"" : [
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""hotNormal"": {
@@ -685,16 +773,16 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				]
 			}";
 
-        var jsonException = Assert.Throws<JsonException> (() => Settings!.Update (json, "test", ConfigLocations.Runtime));
-        Assert.Equal ("Unexpected color name: brownish.", jsonException.Message);
+        var jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        Assert.StartsWith ("foreground: \"\"brownish\"\"", jsonException.Message);
 
-        // AbNormal is not a ColorScheme attribute
+        // AbNormal is not a Scheme attribute
         json = @"
 			{
 				""Themes"" : [ 
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""AbNormal"": {
@@ -709,8 +797,8 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				]
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => Settings!.Update (json, "test", ConfigLocations.Runtime));
-        Assert.Equal ("Unrecognized ColorScheme Attribute name: AbNormal.", jsonException.Message);
+        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        Assert.StartsWith ("AbNormal:", jsonException.Message);
 
         // Modify hotNormal background only
         json = @"
@@ -718,7 +806,7 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				""Themes"" : [ 
                                         {
 						""Default"" : {
-							""ColorSchemes"": [
+							""Schemes"": [
 							{
 								""UserDefined"": {
 									""hotNormal"": {
@@ -732,8 +820,8 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				]
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => Settings!.Update (json, "test", ConfigLocations.Runtime));
-        Assert.Equal ("Both Foreground and Background colors must be provided.", jsonException.Message);
+        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        Assert.StartsWith ("background:", jsonException.Message);
 
         // Unknown property
         json = @"
@@ -741,33 +829,27 @@ public void TestConfigurationManagerInvalidJsonThrows ()
 				""Unknown"" : ""Not known""
 			}";
 
-        jsonException = Assert.Throws<JsonException> (() => Settings!.Update (json, "test", ConfigLocations.Runtime));
-        Assert.StartsWith ("Unknown property", jsonException.Message);
+        jsonException = Assert.Throws<JsonException> (() => SourcesManager?.Load (Settings, json, "test", ConfigLocations.Runtime));
+        Assert.StartsWith ("Unknown:", jsonException.Message);
 
         Assert.Equal (0, _jsonErrors.Length);
 
         ThrowOnJsonErrors = false;
-    }
-
-    [Fact]
-    [AutoInitShutdown]
-    public void TestConfigurationManagerToJson ()
-    {
-        Reset ();
-        GetHardCodedDefaults ();
-        Stream stream = ToStream ();
 
-        Settings!.Update (stream, "TestConfigurationManagerToJson", ConfigLocations.Runtime);
+        Disable (true);
     }
 
     [Fact]
-    public void TestConfigurationManagerUpdateFromJson ()
+    public void UpdateFromJson ()
     {
-        ConfigLocations savedLocations = Locations;
-        Locations = ConfigLocations.All;
+        Assert.False (IsEnabled);
 
-        // Arrange
-        var json = @"
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+
+            // Arrange
+            var json = @"
 {
   ""$schema"": ""https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json"",
   ""Application.QuitKey"": ""Alt-Z"",
@@ -775,7 +857,8 @@ public void TestConfigurationManagerUpdateFromJson ()
   ""Themes"": [
     {
       ""Default"": {
-        ""ColorSchemes"": [
+        ""MessageBox.DefaultButtonAlignment"": ""End"",
+        ""Schemes"": [
           {
             ""TopLevel"": {
               ""Normal"": {
@@ -903,41 +986,32 @@ public void TestConfigurationManagerUpdateFromJson ()
 }					
 			";
 
-        Reset ();
-        ThrowOnJsonErrors = true;
+            ResetToCurrentValues ();
+            ThrowOnJsonErrors = true;
 
-        Settings!.Update (json, "TestConfigurationManagerUpdateFromJson", ConfigLocations.Runtime);
+            SourcesManager?.Load (Settings, json, "UpdateFromJson", ConfigLocations.Runtime);
 
-        Assert.Equal (KeyCode.Esc, Application.QuitKey.KeyCode);
-        Assert.Equal (KeyCode.Z | KeyCode.AltMask, ((Key)Settings ["Application.QuitKey"].PropertyValue)!.KeyCode);
+            Assert.Equal ("Default", ThemeManager.Theme);
 
-        Assert.Equal ("Default", Themes!.Theme);
+            Assert.Equal (KeyCode.Esc, Application.QuitKey.KeyCode);
+            Assert.Equal (KeyCode.Z | KeyCode.AltMask, ((Key)Settings! ["Application.QuitKey"].PropertyValue)!.KeyCode);
+            Assert.Equal (Alignment.Center, MessageBox.DefaultButtonAlignment);
 
-        Assert.Equal (new Color (Color.White), Colors.ColorSchemes ["Base"]!.Normal.Foreground);
-        Assert.Equal (new Color (Color.Blue), Colors.ColorSchemes ["Base"].Normal.Background);
-
-        Dictionary<string, ColorScheme> colorSchemes =
-            (Dictionary<string, ColorScheme>)Themes.First ().Value ["ColorSchemes"].PropertyValue;
-        Assert.Equal (new Color (Color.White), colorSchemes! ["Base"].Normal.Foreground);
-        Assert.Equal (new Color (Color.Blue), colorSchemes ["Base"].Normal.Background);
-
-        // Now re-apply
-        Apply ();
+            // Now re-apply
+            Apply ();
 
-        Assert.Equal (KeyCode.Z | KeyCode.AltMask, Application.QuitKey.KeyCode);
-        Assert.Equal ("Default", Themes.Theme);
+            Assert.Equal ("Default", ThemeManager.Theme);
+            Assert.Equal (KeyCode.Z | KeyCode.AltMask, Application.QuitKey.KeyCode);
+            Assert.Equal (Alignment.End, MessageBox.DefaultButtonAlignment);
 
-        Assert.Equal (new Color (Color.White), Colors.ColorSchemes ["Base"].Normal.Foreground);
-        Assert.Equal (new Color (Color.Blue), Colors.ColorSchemes ["Base"].Normal.Background);
-        Reset ();
+            Assert.Equal (Color.White, SchemeManager.GetSchemes ()! ["Base"].Normal.Foreground);
+            Assert.Equal (Color.Blue, SchemeManager.GetSchemes ()! ["Base"].Normal.Background);
+        }
+        finally
+        {
+            Disable (resetToHardCodedDefaults: true);
 
-        Locations = savedLocations;
+        }
     }
 
-    [Fact]
-    public void UseWithoutResetDoesNotThrow ()
-    {
-        Initialize ();
-        _ = Settings;
-    }
 }
diff --git a/Tests/UnitTests/Configuration/GlyphTests.cs b/Tests/UnitTests/Configuration/GlyphTests.cs
index c3a7e2d5e5..e61a9a9497 100644
--- a/Tests/UnitTests/Configuration/GlyphTests.cs
+++ b/Tests/UnitTests/Configuration/GlyphTests.cs
@@ -8,21 +8,20 @@ namespace Terminal.Gui.ConfigurationTests;
 public class GlyphTests
 {
     [Fact]
-    public void Overrides_Defaults ()
+    public void Apply_Applies_Over_Defaults ()
     {
         // arrange
-        Locations = ConfigLocations.Default;
-        Load (true);
+        Enable (ConfigLocations.HardCoded);
 
         Assert.Equal ((Rune)'⟦', Glyphs.LeftBracket);
 
-        var glyph = (Rune)Themes ["Default"] ["Glyphs.LeftBracket"].PropertyValue;
+        var glyph = (Rune)ThemeManager.GetCurrentTheme () ["Glyphs.LeftBracket"].PropertyValue!;
         Assert.Equal ((Rune)'⟦', glyph);
 
         ThrowOnJsonErrors = true;
 
         // act
-        var json = """
+        RuntimeConfig = """
                    {
                        "Themes": [
                            {
@@ -35,15 +34,15 @@ public void Overrides_Defaults ()
                    }
                    """;
 
-        Settings!.Update (json, "Overrides_Defaults", ConfigLocations.Runtime);
-        Apply();
+        Load (ConfigLocations.Runtime);
+        Apply ();
 
         // assert
-        glyph = glyph = (Rune)Themes ["Default"] ["Glyphs.LeftBracket"].PropertyValue;
+        glyph = (Rune)ThemeManager.GetCurrentTheme () ["Glyphs.LeftBracket"].PropertyValue!;
         Assert.Equal ((Rune)'[', glyph);
-        Assert.Equal((Rune)'[', Glyphs.LeftBracket);
+        Assert.Equal ((Rune)'[', Glyphs.LeftBracket);
 
         // clean up
-        Reset ();
+        Disable (resetToHardCodedDefaults: true);
     }
 }
diff --git a/Tests/UnitTests/Configuration/KeyJsonConverterTests.cs b/Tests/UnitTests/Configuration/KeyJsonConverterTests.cs
index bb12d1590f..e3191ced1d 100644
--- a/Tests/UnitTests/Configuration/KeyJsonConverterTests.cs
+++ b/Tests/UnitTests/Configuration/KeyJsonConverterTests.cs
@@ -7,94 +7,19 @@ namespace Terminal.Gui.ConfigurationTests;
 
 public class KeyJsonConverterTests
 {
-    [Theory]
-    [InlineData (KeyCode.A, "\"a\"")]
-    [InlineData ((KeyCode)'â', "\"â\"")]
-    [InlineData (KeyCode.A | KeyCode.ShiftMask, "\"A\"")]
-    [InlineData (KeyCode.A | KeyCode.CtrlMask, "\"Ctrl+A\"")]
-    [InlineData (KeyCode.A | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt+A\"")]
-    [InlineData (KeyCode.Delete | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt+Delete\"")]
-    [InlineData (KeyCode.D4, "\"4\"")]
-    [InlineData (KeyCode.Esc, "\"Esc\"")]
-    [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt++\"")]
-    public void TestKey_Serialize (KeyCode key, string expected)
-    {
-        // Arrange
-        var options = new JsonSerializerOptions ();
-        options.Converters.Add (new KeyJsonConverter ());
-        options.Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping;
-
-        // Act
-        string json = JsonSerializer.Serialize ((Key)key, options);
-
-        // Assert
-        Assert.Equal (expected, json);
-    }
-
-    [Theory]
-    [InlineData (KeyCode.A, "a")]
-    [InlineData (KeyCode.A | KeyCode.ShiftMask, "A")]
-    [InlineData (KeyCode.A | KeyCode.CtrlMask, "Ctrl+A")]
-    [InlineData (KeyCode.A | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt+A")]
-    [InlineData (KeyCode.Delete | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt+Delete")]
-    [InlineData (KeyCode.D4, "4")]
-    [InlineData (KeyCode.Esc, "Esc")]
-    [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt++")]
-    public void TestKeyRoundTripConversion (KeyCode key, string expectedStringTo)
-    {
-        // Arrange
-
-        // Act
-        string json = JsonSerializer.Serialize ((Key)key, ConfigurationManager.SerializerOptions);
-        var deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerOptions);
-
-        // Assert
-        Assert.Equal (expectedStringTo, deserializedKey.ToString ());
-    }
-
-    [Fact]
-    public void Deserialized_Key_Equals ()
-    {
-        // Arrange
-        Key key = Key.Q.WithCtrl;
-
-        // Act
-        string json = "\"Ctrl+Q\"";
-        Key deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerOptions);
-
-        // Assert
-        Assert.Equal (key, deserializedKey);
-
-    }
-    [Fact]
-    public void Separator_Property_Serializes_As_Glyph ()
-    {
-        // Act
-        string json = JsonSerializer.Serialize (Key.Separator, ConfigurationManager.SerializerOptions);
-
-        // Assert
-        Assert.Equal ($"\"{Key.Separator}\"", json);
-    }
 
     [Fact]
     public void Separator_Property_Set_Changes_Serialization_Format ()
     {
         Rune savedSeparator = Key.Separator;
 
-        try
-        {
-            // Act
-            Key.Separator = (Rune)'*';
-            string json = JsonSerializer.Serialize (Key.Separator, ConfigurationManager.SerializerOptions);
-
-            // Assert
-            Assert.Equal ("\"*\"", json);
-        }
-        finally
-        {
-            Key.Separator = savedSeparator;
-        }
+        // Act
+        // NOTE: This means this test can't be parallelized
+        Key.Separator = (Rune)'*';
+        string json = JsonSerializer.Serialize (Key.Separator, ConfigurationManager.SerializerContext.Options);
 
+        // Assert
+        Assert.Equal ("\"*\"", json);
         Key.Separator = savedSeparator;
     }
 
@@ -119,22 +44,15 @@ public void Separator_Property_Set_Deserialization_Works_With_Any (char keyChar,
     {
         Rune savedSeparator = Key.Separator;
 
-        try
-        {
-            // Act
-            Key.Separator = (Rune)separator;
-
-            Key deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerOptions);
+        // Act
+        // NOTE: This means this test can't be parallelized
+        Key.Separator = (Rune)separator;
 
-            Key expectedKey = new Key ((KeyCode)keyChar).WithCtrl.WithAlt;
-            // Assert
-            Assert.Equal (expectedKey, deserializedKey);
-        }
-        finally
-        {
-            Key.Separator = savedSeparator;
-        }
+        Key deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerContext.Options);
 
+        Key expectedKey = new Key ((KeyCode)keyChar).WithCtrl.WithAlt;
+        // Assert
+        Assert.Equal (expectedKey, deserializedKey);
         Key.Separator = savedSeparator;
     }
 }
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/MemorySizeEstimator.cs b/Tests/UnitTests/Configuration/MemorySizeEstimator.cs
new file mode 100644
index 0000000000..bbde40a72a
--- /dev/null
+++ b/Tests/UnitTests/Configuration/MemorySizeEstimator.cs
@@ -0,0 +1,253 @@
+#nullable enable
+
+namespace Terminal.Gui.ConfigurationTests;
+
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+
+public static class MemorySizeEstimator
+{
+    public static long EstimateSize<T> (T? source)
+    {
+        if (source is null)
+        {
+            return 0;
+        }
+
+        ConcurrentDictionary<object, long> visited = new (ReferenceEqualityComparer.Instance);
+        return EstimateSizeInternal (source, visited);
+    }
+
+    private const int POINTER_SIZE = 8; // 64-bit system
+    private const int OBJECT_HEADER_SIZE = 16; // 2 pointers for GC
+
+    private static long EstimateSizeInternal (object? source, ConcurrentDictionary<object, long> visited)
+    {
+        if (source is null)
+        {
+            return 0;
+        }
+
+        // Handle already visited objects to avoid circular references
+        if (visited.TryGetValue (source, out long existingSize))
+        {
+            // // Log revisited object (enable for debugging)
+            // Console.WriteLine($"Revisited {source.GetType().FullName}: {existingSize} bytes");
+            return existingSize;
+        }
+
+        Type type = source.GetType ();
+        long size = 0;
+
+        // Handle simple types
+        if (IsSimpleType (type))
+        {
+            size = EstimateSimpleTypeSize (source, type);
+            visited.TryAdd (source, size);
+            // // Log simple type (enable for debugging)
+            // Console.WriteLine($"{type.FullName}: {size} bytes");
+            return size;
+        }
+
+        // Handle arrays
+        if (type.IsArray)
+        {
+            size = EstimateArraySize (source, visited);
+        }
+        // Handle dictionaries
+        else if (source is IDictionary)
+        {
+            size = EstimateDictionarySize (source, visited);
+        }
+        // Handle collections
+        else if (typeof (ICollection).IsAssignableFrom (type))
+        {
+            size = EstimateCollectionSize (source, visited);
+        }
+        // Handle structs and classes
+        else
+        {
+            size = EstimateObjectSize (source, type, visited);
+        }
+
+        visited.TryAdd (source, size);
+        // // Log object size (enable for debugging)
+        // if (size == 0)
+        // {
+        //     Console.WriteLine($"Zero size for {type.FullName}");
+        // }
+        // else
+        // {
+        //     Console.WriteLine($"{type.FullName}: {size} bytes");
+        // }
+
+        return size;
+    }
+
+    private static bool IsSimpleType (Type type)
+    {
+        if (type.IsPrimitive
+            || type.IsEnum
+            || type == typeof (decimal)
+            || type == typeof (DateTime)
+            || type == typeof (DateTimeOffset)
+            || type == typeof (TimeSpan)
+            || type == typeof (Guid)
+            || type == typeof (Rune)
+            || type == typeof (string))
+        {
+            return true;
+        }
+
+        // Treat structs with no writable public properties as simple types
+        if (type.IsValueType)
+        {
+            PropertyInfo [] writableProperties = type.GetProperties (BindingFlags.Instance | BindingFlags.Public)
+                .Where (p => p is { CanRead: true, CanWrite: true } && p.GetIndexParameters ().Length == 0)
+                .ToArray ();
+            return writableProperties.Length == 0;
+        }
+
+        // Treat Property翰Info as simple (metadata, not cloned)
+        if (typeof (PropertyInfo).IsAssignableFrom (type))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static long EstimateSimpleTypeSize (object source, Type type)
+    {
+        if (type == typeof (string))
+        {
+            string str = (string)source;
+            // Header + length (4) + char array ref + chars (2 bytes each)
+            return OBJECT_HEADER_SIZE + 4 + POINTER_SIZE + (str.Length * 2);
+        }
+
+        try
+        {
+            return Marshal.SizeOf (type);
+        }
+        catch (ArgumentException)
+        {
+            // Fallback for enums or other simple types
+            return 4; // Conservative estimate
+        }
+    }
+
+    private static long EstimateArraySize (object source, ConcurrentDictionary<object, long> visited)
+    {
+        Array array = (Array)source;
+        long size = OBJECT_HEADER_SIZE + 4 + POINTER_SIZE; // Header + length + padding
+
+        foreach (object? element in array)
+        {
+            size += EstimateSizeInternal (element, visited);
+        }
+
+        return size;
+    }
+
+    private static long EstimateDictionarySize (object source, ConcurrentDictionary<object, long> visited)
+    {
+        IDictionary dict = (IDictionary)source;
+        long size = OBJECT_HEADER_SIZE + (POINTER_SIZE * 5); // Header + buckets, entries, comparer, fields
+        size += dict.Count * 4; // Bucket array (~4 bytes per entry)
+        size += dict.Count * (4 + 4 + POINTER_SIZE * 2); // Entry array: hashcode, next, key, value
+
+        foreach (object? key in dict.Keys)
+        {
+            size += EstimateSizeInternal (key, visited);
+            size += EstimateSizeInternal (dict [key], visited);
+        }
+
+        return size;
+    }
+
+    private static long EstimateCollectionSize (object source, ConcurrentDictionary<object, long> visited)
+    {
+        Type type = source.GetType ();
+        long size = OBJECT_HEADER_SIZE + (POINTER_SIZE * 3); // Header + internal array + fields
+
+        if (type.IsGenericType && type.GetGenericTypeDefinition () == typeof (Dictionary<,>))
+        {
+            return EstimateDictionarySize (source, visited);
+        }
+
+        if (source is IEnumerable enumerable)
+        {
+            foreach (object? item in enumerable)
+            {
+                size += EstimateSizeInternal (item, visited);
+            }
+        }
+
+        return size;
+    }
+
+    private static long EstimateObjectSize (object source, Type type, ConcurrentDictionary<object, long> visited)
+    {
+        long size = OBJECT_HEADER_SIZE;
+
+        // Size public writable properties
+        foreach (PropertyInfo prop in type.GetProperties (BindingFlags.Instance | BindingFlags.Public)
+            .Where (p => p is { CanRead: true, CanWrite: true } && p.GetIndexParameters ().Length == 0))
+        {
+            try
+            {
+                object? value = prop.GetValue (source);
+                size += EstimateSizeInternal (value, visited);
+            }
+            catch (Exception)
+            {
+                // // Log exception (enable for debugging)
+                // Console.WriteLine($"Error processing property {prop.Name} of {type.FullName}: {ex.Message}");
+                // Continue to avoid crashing
+            }
+        }
+
+        // For structs, also size fields (to handle generic structs)
+        if (type.IsValueType)
+        {
+            FieldInfo [] fields = type.GetFields (BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            foreach (FieldInfo field in fields)
+            {
+                try
+                {
+                    object? fieldValue = field.GetValue (source);
+                    size += EstimateSizeInternal (fieldValue, visited);
+                }
+                catch (Exception)
+                {
+                    // // Log exception (enable for debugging)
+                    // Console.WriteLine($"Error processing field {field.Name} of {type.FullName}: {ex.Message}");
+                    // Continue to avoid crashing
+                }
+            }
+        }
+
+        return size;
+    }
+
+    private sealed class ReferenceEqualityComparer : IEqualityComparer<object>
+    {
+        public static ReferenceEqualityComparer Instance { get; } = new ();
+
+        public new bool Equals (object? x, object? y)
+        {
+            return ReferenceEquals (x, y);
+        }
+
+        public int GetHashCode (object obj)
+        {
+            return RuntimeHelpers.GetHashCode (obj);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/SchemeManagerTests.cs b/Tests/UnitTests/Configuration/SchemeManagerTests.cs
new file mode 100644
index 0000000000..656a84a51c
--- /dev/null
+++ b/Tests/UnitTests/Configuration/SchemeManagerTests.cs
@@ -0,0 +1,489 @@
+#nullable enable
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
+using System.Text.Json;
+using static Terminal.Gui.ConfigurationManager;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class SchemeManagerTests
+{
+    [Fact]
+    public void GetSchemes_Not_Enabled_Gets_Schemes ()
+    {
+        Disable (true);
+
+        Dictionary<string, Scheme?>? schemes = SchemeManager.GetSchemesForCurrentTheme ();
+        Assert.NotNull (schemes);
+        Assert.NotNull (schemes ["Base"]);
+        Assert.True (schemes!.ContainsKey ("Base"));
+        Assert.True (schemes.ContainsKey ("base"));
+
+        Assert.Equal (SchemeManager.GetSchemes (), schemes);
+    }
+
+    [Fact]
+    public void GetSchemes_Enabled_Gets_Current ()
+    {
+        Enable (ConfigLocations.HardCoded);
+
+        Dictionary<string, Scheme?>? schemes = SchemeManager.GetSchemesForCurrentTheme ();
+        Assert.NotNull (schemes);
+        Assert.NotNull (schemes ["Base"]);
+        Assert.True (schemes!.ContainsKey ("Base"));
+        Assert.True (schemes.ContainsKey ("base"));
+
+        Assert.Equal (SchemeManager.GetSchemes (), schemes);
+
+        Disable (true);
+    }
+
+    [Fact]
+    public void GetSchemes_Get_Schemes_After_Load ()
+    {
+        Enable (ConfigLocations.HardCoded);
+        Load (ConfigLocations.All);
+        Apply ();
+
+        Assert.Equal (SchemeManager.GetSchemes (), SchemeManager.GetSchemesForCurrentTheme ());
+    }
+
+
+    [Fact]
+    public void GetHardCodedSchemes_Gets_HardCoded_Theme_Schemes ()
+    {
+        ImmutableSortedDictionary<string, Scheme?>? hardCoded = SchemeManager.GetHardCodedSchemes ();
+
+        Assert.Equal (Scheme.GetHardCodedSchemes (), actual: hardCoded!);
+    }
+
+    [Fact]
+    public void Not_Case_Sensitive_Disabled ()
+    {
+        Assert.False (IsEnabled);
+        Dictionary<string, Scheme?>? current = SchemeManager.GetSchemesForCurrentTheme ();
+        Assert.NotNull (current);
+
+        Assert.True (current!.ContainsKey ("Base"));
+        Assert.True (current.ContainsKey ("base"));
+    }
+
+    [Fact]
+    public void Not_Case_Sensitive_Enabled ()
+    {
+        Assert.False (IsEnabled);
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.True (SchemeManager.GetSchemesForCurrentTheme ()!.ContainsKey ("Base"));
+        Assert.True (SchemeManager.GetSchemesForCurrentTheme ()!.ContainsKey ("base"));
+
+        ResetToHardCodedDefaults ();
+        Dictionary<string, Scheme?>? current = SchemeManager.GetSchemesForCurrentTheme ();
+        Assert.NotNull (current);
+
+        Assert.True (current!.ContainsKey ("Base"));
+        Assert.True (current.ContainsKey ("base"));
+
+        Disable (true);
+    }
+
+    [Fact]
+    public void Load_Adds ()
+    {
+        // arrange
+        Enable (ConfigLocations.HardCoded);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        Assert.NotEmpty (theme);
+
+        Assert.Equal (5, SchemeManager.GetSchemes ().Count);
+
+        theme ["Schemes"].PropertyValue = SchemeManager.GetSchemes ();
+
+        Dictionary<string, Scheme> schemes = (Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!;
+        Assert.Equal (SchemeManager.GetSchemes ().Count, schemes.Count);
+
+        var newTheme = new ThemeScope ();
+        newTheme.LoadHardCodedDefaults ();
+
+        var scheme = new Scheme
+        {
+            // note: Scheme's can't be partial; default for each attribute
+            // is always White/Black
+            Normal = new (Color.Red, Color.Green),
+            Focus = new (Color.Cyan, Color.BrightCyan),
+            HotNormal = new (Color.Yellow, Color.BrightYellow),
+            HotFocus = new (Color.Green, Color.BrightGreen),
+            Disabled = new (Color.Gray, Color.DarkGray)
+        };
+
+        newTheme ["Schemes"].PropertyValue = SchemeManager.GetSchemesForCurrentTheme ();
+        Assert.Equal (5, SchemeManager.GetSchemes ().Count);
+
+        // add a new Scheme to the newTheme
+        ((Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!) ["Test"] = scheme;
+
+        schemes = (Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!;
+        Assert.Equal (SchemeManager.GetSchemes ().Count, schemes.Count);
+
+        // Act
+        theme.UpdateFrom (newTheme);
+
+        // Assert
+        schemes = (Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!;
+        Assert.Equal (schemes ["Test"].Normal, scheme.Normal);
+        Assert.Equal (schemes ["Test"].Focus, scheme.Focus);
+        Disable (true);
+    }
+
+    [Fact]
+    public void Load_Changes ()
+    {
+        // arrange
+        Enable (ConfigLocations.HardCoded);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        Assert.NotEmpty (theme);
+
+        var scheme = new Scheme
+        {
+            // note: Scheme's can't be partial; default for each attribute
+            // is always White/Black
+            Normal = new (Color.Red, Color.Green),
+            Focus = new (Color.Cyan, Color.BrightCyan),
+            HotNormal = new (Color.Yellow, Color.BrightYellow),
+            HotFocus = new (Color.Green, Color.BrightGreen),
+            Disabled = new (Color.Gray, Color.DarkGray)
+        };
+        theme ["Schemes"].PropertyValue = SchemeManager.GetSchemesForCurrentTheme ();
+
+        ((Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!)! ["Test"] = scheme;
+
+        Dictionary<string, Scheme>? schemes = (Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!;
+        Assert.Equal (scheme.Normal, schemes ["Test"].Normal);
+        Assert.Equal (scheme.Focus, schemes ["Test"].Focus);
+
+        // Change just Normal
+        var newTheme = new ThemeScope ();
+        newTheme.LoadHardCodedDefaults ();
+
+        var newScheme = new Scheme
+        {
+            Normal = new (Color.Blue, Color.BrightBlue),
+            Focus = scheme.Focus,
+            HotNormal = scheme.HotNormal,
+            HotFocus = scheme.HotFocus,
+            Disabled = scheme.Disabled
+        };
+        newTheme ["Schemes"].PropertyValue = SchemeManager.GetSchemesForCurrentTheme ();
+        ((Dictionary<string, Scheme>)newTheme ["Schemes"].PropertyValue!)! ["Test"] = newScheme;
+
+        // Act
+        theme.UpdateFrom (newTheme);
+
+        // Assert
+        schemes = (Dictionary<string, Scheme>)theme ["Schemes"].PropertyValue!;
+
+        // Normal should have changed
+        Assert.Equal (new (Color.Blue, Color.BrightBlue), schemes ["Test"].Normal);
+        Assert.Equal (Color.BrightBlue, schemes ["Test"].Normal.Background);
+        Assert.Equal (Color.Cyan, schemes ["Test"].Focus.Foreground);
+        Assert.Equal (Color.BrightCyan, schemes ["Test"].Focus.Background);
+        Disable (true);
+    }
+
+    [Fact]
+    public void Load_Null_Scheme_Throws ()
+    {
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+            ThrowOnJsonErrors = true;
+
+            // Create a test theme
+            RuntimeConfig = """
+                            {
+                                 "Theme": "TestTheme",
+                                 "Themes": [
+                                   {
+                                     "TestTheme": {
+                                     }
+                                   }
+                                 ]
+                            }
+                            """;
+
+            // Load the test theme
+            // TODO: This should throw an exception!
+            Assert.Throws<JsonException> (() => Load (ConfigLocations.Runtime));
+            Assert.Contains ("TestTheme", ThemeManager.Themes!);
+            Assert.Equal ("TestTheme", ThemeManager.Theme);
+            Assert.Throws<System.Collections.Generic.KeyNotFoundException> (SchemeManager.GetSchemes);
+
+            // Now reset everything and reload
+            ResetToCurrentValues ();
+
+            // Verify we're back to default
+            Assert.Equal ("Default", ThemeManager.Theme);
+        }
+        finally
+        {
+            Disable (true);
+        }
+    }
+
+    [Fact]
+    public void Load_Empty_Scheme_Throws ()
+    {
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+            ThrowOnJsonErrors = true;
+
+            // Create a test theme
+            RuntimeConfig = """
+                            {
+                                 "Theme": "TestTheme",
+                                 "Themes": [
+                                   {
+                                     "TestTheme": {
+                                       "Schemes": []
+                                     }
+                                   }
+                                 ]
+                            }
+                            """;
+
+            // Load the test theme
+            Load (ConfigLocations.Runtime);
+            Assert.Equal ("TestTheme", ThemeManager.Theme);
+
+            // Now reset everything and reload
+            ResetToCurrentValues ();
+
+            // Verify we're back to default
+            Assert.Equal ("Default", ThemeManager.Theme);
+        }
+        finally
+        {
+            Disable (true);
+        }
+    }
+
+    [Fact]
+    public void Load_Custom_Scheme_Loads ()
+    {
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+            ThrowOnJsonErrors = true;
+
+            // Create a test theme
+            RuntimeConfig = """
+                            {
+                                 "Theme": "TestTheme",
+                                 "Themes": [
+                                   {
+                                     "TestTheme": {
+                                       "Schemes": [
+                                                   {
+                                          "TopLevel": {
+                                            "Normal": {
+                                              "Foreground": "AntiqueWhite",
+                                              "Background": "DimGray"
+                                            },
+                                            "Focus": {
+                                              "Foreground": "White",
+                                              "Background": "DarkGray"
+                                            },
+                                            "HotNormal": {
+                                              "Foreground": "Wheat",
+                                              "Background": "DarkGray",
+                                              "Style": "Underline"
+                                            },
+                                            "HotFocus": {
+                                              "Foreground": "LightYellow",
+                                              "Background": "DimGray",
+                                              "Style": "Underline"
+                                            },
+                                            "Disabled": {
+                                              "Foreground": "Black",
+                                              "Background": "DimGray"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "Base": {
+                                            "Normal": {
+                                              "Foreground": "White",
+                                              "Background": "Blue"
+                                            },
+                                            "Focus": {
+                                              "Foreground": "DarkBlue",
+                                              "Background": "LightGray"
+                                            },
+                                            "HotNormal": {
+                                              "Foreground": "BrightCyan",
+                                              "Background": "Blue"
+                                            },
+                                            "HotFocus": {
+                                              "Foreground": "BrightBlue",
+                                              "Background": "LightGray"
+                                            },
+                                            "Disabled": {
+                                              "Foreground": "DarkGray",
+                                              "Background": "Blue"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "Dialog": {
+                                            "Normal": {
+                                              "Foreground": "Black",
+                                              "Background": "LightGray"
+                                            },
+                                            "Focus": {
+                                              "Foreground": "DarkGray",
+                                              "Background": "LightGray"
+                                            },
+                                            "HotNormal": {
+                                              "Foreground": "Blue",
+                                              "Background": "LightGray"
+                                            },
+                                            "HotFocus": {
+                                              "Foreground": "BrightBlue",
+                                              "Background": "LightGray"
+                                            },
+                                            "Disabled": {
+                                              "Foreground": "Gray",
+                                              "Background": "DarkGray"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "Menu": {
+                                            "Normal": {
+                                              "Foreground": "White",
+                                              "Background": "DarkBlue",
+                                              "Style": "Bold"
+                                            },
+                                            "Focus": {
+                                            "Foreground": "White",
+                                            "Background": "DarkBlue",
+                                              "Style": "Bold,Reverse"
+                                            },
+                                            "HotNormal": {
+                                              "Foreground": "BrightYellow",
+                                              "Background": "DarkBlue",
+                                              "Style": "Bold,Underline"
+                                            },
+                                            "HotFocus": {
+                                              "Foreground": "Blue",
+                                              "Background": "White",
+                                              "Style": "Bold,Underline"
+                                            },
+                                            "Disabled": {
+                                              "Foreground": "Gray",
+                                              "Background": "DarkGray",
+                                              "Style": "Faint"
+                                            }
+                                          }
+                                        },
+                                        {
+                                          "Error": {
+                                            "Normal": {
+                                              "Foreground": "Red",
+                                              "Background": "Pink"
+                                            },
+                                            "Focus": {
+                                              "Foreground": "White",
+                                              "Background": "BrightRed"
+                                            },
+                                            "HotNormal": {
+                                              "Foreground": "Black",
+                                              "Background": "Pink"
+                                            },
+                                            "HotFocus": {
+                                              "Foreground": "Pink",
+                                              "Background": "BrightRed"
+                                            },
+                                            "Disabled": {
+                                              "Foreground": "DarkGray",
+                                              "Background": "White"
+                                            }
+                                          }
+                                        }
+                                       ]
+                                     }
+                                   }
+                                 ]
+                            }
+                            """;
+
+            // Load the test theme
+            Load (ConfigLocations.Runtime);
+            Assert.Equal ("TestTheme", ThemeManager.Theme);
+
+            TextStyle style = SchemeManager.GetSchemesForCurrentTheme () ["Menu"]!.Normal.Style;
+
+            Assert.Equal (TextStyle.Bold, style);
+
+            // Now reset everything and reload
+            ResetToCurrentValues ();
+
+            // Verify we're back to default
+            Assert.Equal ("Default", ThemeManager.Theme);
+
+        }
+        finally
+        {
+            Disable (true);
+        }
+    }
+
+    [Fact (Skip = "WIP")]
+    public void Apply_UpdatesSchemes ()
+    {
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.False (SchemeManager.GetSchemes ()!.ContainsKey ("test"));
+        Assert.Equal (5, SchemeManager.GetSchemes ().Count); // base, toplevel, menu, error, dialog
+
+        var theme = new ThemeScope ();
+        Assert.NotEmpty (theme);
+
+        ThemeManager.Themes!.TryAdd ("testTheme", theme);
+
+        var scheme = new Scheme { Normal = new (Color.Red, Color.Green) };
+
+        theme ["Schemes"].PropertyValue = new Dictionary<string, Scheme> (StringComparer.InvariantCultureIgnoreCase) { { "test", scheme } };
+
+        Assert.Equal (
+                      new (Color.Red),
+                      ((Dictionary<string, Scheme>)theme["Schemes"].PropertyValue!) ["test"].Normal.Foreground
+                     );
+
+        Assert.Equal (
+                      new (Color.Green),
+                      ((Dictionary<string, Scheme>)theme["Schemes"].PropertyValue!) ["test"].Normal.Background
+                     );
+
+        // Act
+        ThemeManager.Theme = "testTheme";
+        ThemeManager.Themes! [ThemeManager.Theme]!.Apply ();
+        Assert.Equal (5, SchemeManager.GetSchemes ().Count); // base, toplevel, menu, error, dialog
+
+        // Assert
+        Scheme updatedScheme = SchemeManager.GetSchemes () ["test"]!;
+        Assert.Equal (new (Color.Red), updatedScheme.Normal.Foreground);
+        Assert.Equal (new (Color.Green), updatedScheme.Normal.Background);
+
+        // remove test Scheme from Colors to avoid failures on others unit tests with Scheme
+        SchemeManager.GetSchemes ().Remove ("test");
+        Assert.Equal (5, SchemeManager.GetSchemes ().Count);
+
+        Disable (true);
+    }
+}
diff --git a/Tests/UnitTests/Configuration/SettingsScopeTests.cs b/Tests/UnitTests/Configuration/SettingsScopeTests.cs
index e041a885de..e70e0682da 100644
--- a/Tests/UnitTests/Configuration/SettingsScopeTests.cs
+++ b/Tests/UnitTests/Configuration/SettingsScopeTests.cs
@@ -1,4 +1,5 @@
-using UnitTests;
+using System.Collections.Concurrent;
+using UnitTests;
 using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui.ConfigurationTests;
@@ -6,42 +7,111 @@ namespace Terminal.Gui.ConfigurationTests;
 public class SettingsScopeTests
 {
     [Fact]
-    public void Update_Overrides_Defaults ()
+    public void Load_Overrides_Defaults ()
     {
         // arrange
-        Locations = ConfigLocations.Default;
-        Load (true);
+        Enable (ConfigLocations.HardCoded);
 
-        Assert.Equal (Key.Esc, (Key)Settings ["Application.QuitKey"].PropertyValue);
+        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
 
         ThrowOnJsonErrors = true;
 
         // act
-        var json = """
+        RuntimeConfig = """
                    
                            {
                                  "Application.QuitKey": "Ctrl-Q"
                            }
                    """;
 
-        Settings!.Update (json, "test", ConfigLocations.Runtime);
+        Load (ConfigLocations.Runtime);
 
         // assert
         Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue);
 
         // clean up
-        Locations = ConfigLocations.All;
-        Reset ();
+        Disable (resetToHardCodedDefaults: true);
+
+    }
+
+
+    [Fact]
+    public void Load_Dictionary_Property_Overrides_Defaults ()
+    {
+        // arrange
+        Enable (ConfigLocations.HardCoded);
+        ThrowOnJsonErrors = true;
+
+        ConfigProperty themesConfigProperty = Settings! ["Themes"];
+        ConcurrentDictionary<string, ThemeScope> dict = themesConfigProperty.PropertyValue as ConcurrentDictionary<string, ThemeScope>;
+
+        Assert.NotNull (dict);
+        Assert.Single (dict);
+        Assert.NotEmpty ((ConcurrentDictionary<string, ThemeScope>)themesConfigProperty.PropertyValue);
+
+        ThemeScope scope = dict [ThemeManager.DEFAULT_THEME_NAME];
+        Assert.NotNull (scope);
+        Assert.Equal (HighlightStyle.Hover | HighlightStyle.Pressed, scope ["Button.DefaultHighlightStyle"].PropertyValue);
+
+
+        RuntimeConfig = """
+                        {
+                            "Themes": [
+                                {
+                                  "Default": 
+                                     {
+                                         "Button.DefaultHighlightStyle": "None"
+                                     }
+                                },
+                                {
+                                  "NewTheme":
+                                    {
+                                        "Button.DefaultHighlightStyle": "Hover"
+                                    }
+                                }                        
+                            ]
+                        }
+                        """;
+
+        Load (ConfigLocations.Runtime);
+
+        // assert
+        Assert.Equal (2, ThemeManager.GetThemes ().Count);
+        Assert.Equal (HighlightStyle.None, (HighlightStyle)ThemeManager.GetCurrentTheme () ["Button.DefaultHighlightStyle"].PropertyValue!);
+        Assert.Equal (HighlightStyle.Hover, (HighlightStyle)ThemeManager.GetThemes () ["NewTheme"] ["Button.DefaultHighlightStyle"].PropertyValue!);
+
+        RuntimeConfig = """
+                        {
+                            "Themes": [
+                                {
+                                  "Default": 
+                                     {
+                                         "Button.DefaultHighlightStyle": "Pressed"
+                                     }
+                                }
+                            ]
+                        }
+                        """;
+        Load (ConfigLocations.Runtime);
+
+        // assert
+        Assert.Equal (2, ThemeManager.GetThemes ().Count);
+        Assert.Equal (HighlightStyle.Pressed, (HighlightStyle)ThemeManager.Themes! [ThemeManager.DEFAULT_THEME_NAME] ["Button.DefaultHighlightStyle"].PropertyValue!);
+        Assert.Equal (HighlightStyle.Hover, (HighlightStyle)ThemeManager.Themes! ["NewTheme"] ["Button.DefaultHighlightStyle"].PropertyValue!);
+
+        // clean up
+        Disable (resetToHardCodedDefaults: true);
+
     }
 
     [Fact]
     public void Apply_ShouldApplyProperties ()
     {
-        Locations = ConfigLocations.Default;
-        Reset();
+        Enable (ConfigLocations.HardCoded);
+        Load (ConfigLocations.LibraryResources);
 
         // arrange
-        Assert.Equal (Key.Esc, (Key)Settings ["Application.QuitKey"].PropertyValue);
+        Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
 
         Assert.Equal (
                       Key.F6,
@@ -65,53 +135,87 @@ public void Apply_ShouldApplyProperties ()
         Assert.Equal (Key.F, Application.NextTabGroupKey);
         Assert.Equal (Key.B, Application.PrevTabGroupKey);
 
-        Locations = ConfigLocations.All;
-        Reset ();
-
+        Disable (resetToHardCodedDefaults: true);
     }
 
     [Fact]
-    [AutoInitShutdown]
     public void CopyUpdatedPropertiesFrom_ShouldCopyChangedPropertiesOnly ()
     {
+        Enable (ConfigLocations.HardCoded);
         Settings ["Application.QuitKey"].PropertyValue = Key.End;
 
         var updatedSettings = new SettingsScope ();
+        updatedSettings.LoadHardCodedDefaults ();
 
-        ///Don't set Quitkey
+        // Don't set Quitkey
+        updatedSettings ["Application.QuitKey"].HasValue = false;
+        updatedSettings ["Application.QuitKey"].PropertyValue = null;
         updatedSettings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
         updatedSettings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
 
-        Settings.Update (updatedSettings);
+        Settings.UpdateFrom (updatedSettings);
         Assert.Equal (KeyCode.End, ((Key)Settings ["Application.QuitKey"].PropertyValue).KeyCode);
         Assert.Equal (KeyCode.F, ((Key)updatedSettings ["Application.NextTabGroupKey"].PropertyValue).KeyCode);
         Assert.Equal (KeyCode.B, ((Key)updatedSettings ["Application.PrevTabGroupKey"].PropertyValue).KeyCode);
+        Disable (resetToHardCodedDefaults: true);
     }
 
     [Fact]
-    public void GetHardCodedDefaults_ShouldSetProperties ()
+    public void ResetToHardCodedDefaults_Resets_Config_And_Applies ()
     {
-        ConfigLocations savedLocations = Locations;
-        Locations = ConfigLocations.Default;
-        Reset ();
+        Enable (ConfigLocations.HardCoded);
+        Load (ConfigLocations.LibraryResources);
 
-        Assert.Equal (6, ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue).Count);
+        Assert.True (Settings! ["Application.QuitKey"].PropertyValue is Key);
+        Assert.Equal (Key.Esc, Settings ["Application.QuitKey"].PropertyValue as Key);
+        Settings ["Application.QuitKey"].PropertyValue = Key.Q;
+        Apply ();
+        Assert.Equal (Key.Q, Application.QuitKey);
+
+        // Act
+        ResetToHardCodedDefaults ();
+        Assert.Equal (Key.Esc, Settings ["Application.QuitKey"].PropertyValue as Key);
+        Assert.Equal (Key.Esc, Application.QuitKey);
+
+        Disable ();
+    }
+
+
+    [Fact]
+    public void Themes_Property_Exists ()
+    {
+        var settingsScope = new SettingsScope ();
 
-        GetHardCodedDefaults ();
-        Assert.NotEmpty (Themes);
-        Assert.Equal ("Default", Themes.Theme);
+        Assert.NotEmpty (settingsScope);
 
-        Assert.True (Settings ["Application.QuitKey"].PropertyValue is Key);
-        Assert.True (Settings ["Application.NextTabGroupKey"].PropertyValue is Key);
-        Assert.True (Settings ["Application.PrevTabGroupKey"].PropertyValue is Key);
+        // Themes exists, but is not initialized
+        Assert.Null (settingsScope ["Themes"].PropertyValue);
+
+        settingsScope.LoadCurrentValues ();
+
+        Assert.NotEmpty (settingsScope);
+    }
+
+
+    [Fact]
+    public void LoadHardCodedDefaults_Resets ()
+    {
+        // Arrange
+        Assert.Equal (Key.Esc, Application.QuitKey);
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+
+        // Act
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q;
+        settingsScope.Apply ();
+        Assert.Equal (Key.Q, Application.QuitKey);
 
-        Assert.True (Settings ["Theme"].PropertyValue is string);
-        Assert.Equal ("Default", Settings ["Theme"].PropertyValue as string);
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope.Apply ();
 
-        Assert.True (Settings ["Themes"].PropertyValue is Dictionary<string, ThemeScope>);
-        Assert.Single ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue);
+        // Assert
+        Assert.Equal (Key.Esc, Application.QuitKey);
 
-        Locations = ConfigLocations.All;
-        Reset ();
+        Disable (resetToHardCodedDefaults: true);
     }
 }
diff --git a/Tests/UnitTests/Configuration/ThemeManagerTests.cs b/Tests/UnitTests/Configuration/ThemeManagerTests.cs
new file mode 100644
index 0000000000..0710222089
--- /dev/null
+++ b/Tests/UnitTests/Configuration/ThemeManagerTests.cs
@@ -0,0 +1,284 @@
+#nullable enable
+using System.Collections.Concurrent;
+using System.Diagnostics.Metrics;
+using System.Text;
+using Xunit.Abstractions;
+using static Terminal.Gui.ConfigurationManager;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ThemeManagerTests (ITestOutputHelper output)
+{
+    [Fact]
+    public void ResetToCurrentValues_Adds_Default_Theme ()
+    {
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+            Assert.NotEmpty (ThemeManager.Themes!);
+
+            ThemeManager.UpdateToCurrentValues ();
+
+            Assert.NotEmpty (ThemeManager.Themes!);
+
+            // Default theme exists
+            Assert.NotNull (ThemeManager.Themes? [ThemeManager.DEFAULT_THEME_NAME]);
+        }
+        finally
+        {
+            Disable (resetToHardCodedDefaults: true);
+        }
+    }
+
+    // ResetToCurrentValues
+
+    //    OnThemeChanged
+
+    #region Tests Settings["Theme"] and ThemeManager.Theme
+
+    [Fact]
+    public void Theme_Settings_Theme_Equals_ThemeManager_Theme ()
+    {
+        Assert.False (IsEnabled);
+
+        Assert.Equal (Settings! ["Theme"].PropertyValue, ThemeManager.Theme);
+        Assert.Equal (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Theme);
+    }
+
+    [Fact]
+    public void Theme_Enabled_Settings_Theme_Equals_ThemeManager_Theme ()
+    {
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Equal (Settings! ["Theme"].PropertyValue, ThemeManager.Theme);
+        Assert.Equal (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Theme);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Theme_Set_Sets ()
+    {
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Equal (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Theme);
+
+        ThemeManager.Theme = "Test";
+        Assert.Equal ("Test", ThemeManager.Theme);
+        Assert.Equal (Settings! ["Theme"].PropertyValue, ThemeManager.Theme);
+        Assert.Equal ("Test", Settings! ["Theme"].PropertyValue);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Theme_ResetToHardCodedDefaults_Sets_To_Default ()
+    {
+        Assert.False (IsEnabled);
+        Assert.Equal (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Theme);
+
+        Enable (ConfigLocations.HardCoded);
+        Assert.Equal ("Default", ThemeManager.Theme);
+
+        ThemeManager.Theme = "Test";
+        Assert.Equal ("Test", ThemeManager.Theme);
+        Assert.Equal (Settings! ["Theme"].PropertyValue, ThemeManager.Theme);
+        Assert.Equal ("Test", Settings! ["Theme"].PropertyValue);
+
+        ResetToHardCodedDefaults ();
+        Assert.Equal ("Default", ThemeManager.Theme);
+        Disable ();
+    }
+
+    #endregion Tests Settings["Theme"] and ThemeManager.Theme
+
+    #region Tests Settings["Themes"] and ThemeManager.Themes
+
+    [Fact]
+    public void Themes_Set_Throws_If_Not_Enabled ()
+    {
+        Assert.False (IsEnabled);
+
+        Assert.Single (ThemeManager.Themes!);
+        Assert.Throws<InvalidOperationException> (() => ThemeManager.Themes = new ());
+        Assert.Single (ThemeManager.Themes!);
+    }
+
+    [Fact]
+    public void Themes_Set_Sets_If_Enabled ()
+    {
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Single (ThemeManager.Themes!);
+
+        // Use ConcurrentDictionary instead of a regular dictionary
+        ThemeManager.Themes = new ConcurrentDictionary<string, ThemeScope> (
+                                                                            new Dictionary<string, ThemeScope>
+                                                                            {
+                                                                                { "Default", new ThemeScope() },
+                                                                                { "test", new ThemeScope() }
+                                                                            },
+                                                                            StringComparer.InvariantCultureIgnoreCase
+                                                                           );
+
+        Assert.Contains ("test", ThemeManager.Themes!);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+
+    [Fact]
+    public void Themes_Set_Throws_If_No_Default_Theme_In_Dictionary ()
+    {
+        Assert.False (IsEnabled);
+
+        Enable (ConfigLocations.HardCoded);
+
+        Assert.Single (ThemeManager.Themes!);
+
+        Assert.Throws<InvalidOperationException> (
+                                                  () => ThemeManager.Themes = new ConcurrentDictionary<string, ThemeScope> (
+                                                             new Dictionary<string, ThemeScope>
+                                                             {
+                                                                 { "test", new ThemeScope() }
+                                                             },
+                                                             StringComparer.InvariantCultureIgnoreCase
+                                                            ));
+        Assert.Single (ThemeManager.Themes!);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Themes_Get () { }
+
+    #endregion Tests Settings["Themes"] and ThemeManager.Themes
+
+    [Fact]
+    public void Themes_TryAdd_Adds ()
+    {
+        Enable (ConfigLocations.HardCoded);
+
+        // Verify that the Themes dictionary contains only the Default theme
+        Assert.Single (ThemeManager.Themes!);
+        Assert.Contains (ThemeManager.DEFAULT_THEME_NAME, ThemeManager.Themes!);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        Assert.NotEmpty (theme);
+
+        Assert.True (ThemeManager.Themes!.TryAdd ("testTheme", theme));
+        Assert.Equal (2, ThemeManager.Themes.Count);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Apply_Applies ()
+    {
+        Assert.False (IsEnabled);
+        Enable (ConfigLocations.HardCoded);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        Assert.NotEmpty (theme);
+
+        Assert.True (ThemeManager.Themes!.TryAdd ("testTheme", theme));
+        Assert.Equal (2, ThemeManager.Themes.Count);
+
+        Assert.Equal (LineStyle.Rounded, FrameView.DefaultBorderStyle);
+        theme ["FrameView.DefaultBorderStyle"].PropertyValue = LineStyle.Double; // default is Single
+
+        ThemeManager.Theme = "testTheme";
+        ThemeManager.Themes! [ThemeManager.Theme]!.Apply ();
+
+        Assert.Equal (LineStyle.Double, FrameView.DefaultBorderStyle);
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+
+    [Fact]
+    public void Theme_Reload_Consistency ()
+    {
+        try
+        {
+            Enable (ConfigLocations.HardCoded);
+
+            // BUGBUG: Setting Schemes to empty array is not valid!
+            // Create a test theme
+            RuntimeConfig = """
+                            {
+                                 "Theme": "TestTheme",
+                                 "Themes": [
+                                   {
+                                     "TestTheme": {
+                                       "Schemes": []
+                                     }
+                                   }
+                                 ]
+                            }
+                            """;
+
+            // Load the test theme
+            ThrowOnJsonErrors = true;
+            Load (ConfigLocations.Runtime);
+            Assert.Equal ("TestTheme", ThemeManager.Theme);
+
+            // Now reset everything and reload
+            ResetToCurrentValues ();
+
+            // Verify we're back to default
+            Assert.Equal ("Default", ThemeManager.Theme);
+        }
+        finally
+        {
+            Disable (resetToHardCodedDefaults: true);
+        }
+    }
+
+    [Fact]
+    public void In_Memory_Themes_Size_Is_Reasonable ()
+    {
+        output.WriteLine ($"Start: Color size: {(MemorySizeEstimator.EstimateSize (Color.Red))} b");
+
+        output.WriteLine ($"Start: Attribute size: {(MemorySizeEstimator.EstimateSize (Attribute.Default))} b");
+
+        output.WriteLine ($"Start: Base Scheme size: {(MemorySizeEstimator.EstimateSize (Scheme.GetHardCodedSchemes ()))} b");
+
+        output.WriteLine ($"Start: PropertyInfo size: {(MemorySizeEstimator.EstimateSize (ConfigurationManager.Settings! ["Application.QuitKey"]))} b");
+
+        ThemeScope themeScope = new ThemeScope ();
+        output.WriteLine ($"Start: ThemeScope ({themeScope.Count}) size: {(MemorySizeEstimator.EstimateSize (themeScope))} b");
+
+        themeScope.AddValue ("Schemes", Scheme.GetHardCodedSchemes ());
+        output.WriteLine ($"Start: ThemeScope ({themeScope.Count}) size: {(MemorySizeEstimator.EstimateSize (themeScope))} b");
+
+        output.WriteLine ($"Start: HardCoded Schemes ({SchemeManager.Schemes!.Count}) size: {(MemorySizeEstimator.EstimateSize (SchemeManager.Schemes!))} b");
+
+        output.WriteLine ($"Start: Themes dictionary ({ThemeManager.Themes!.Count}) size: {(MemorySizeEstimator.EstimateSize (ThemeManager.Themes!)) / 1024} Kb");
+
+        Enable (ConfigLocations.HardCoded);
+
+        output.WriteLine ($"Enabled: Themes dictionary ({ThemeManager.Themes.Count}) size: {(MemorySizeEstimator.EstimateSize (ThemeManager.Themes!)) / 1024} Kb");
+
+        Load (ConfigLocations.LibraryResources);
+        output.WriteLine ($"After Load: Themes dictionary ({ThemeManager.Themes!.Count}) size: {(MemorySizeEstimator.EstimateSize (ThemeManager.Themes!)) / 1024} Kb");
+
+        output.WriteLine ($"Total Settings Size: {(MemorySizeEstimator.EstimateSize (Settings!)) / 1024} Kb");
+
+        string json = SourcesManager?.ToJson (Settings)!;
+
+        // In memory size should be less than the size of the json
+        output.WriteLine ($"JSON size: {json.Length / 1024} Kb");
+
+        Assert.True (70000 > MemorySizeEstimator.EstimateSize (ThemeManager.Themes!), $"In memory size ({(MemorySizeEstimator.EstimateSize (Settings!)) / 1024} Kb) is > json size ({json.Length / 1024} Kb)");
+
+        Disable (resetToHardCodedDefaults: true);
+    }
+}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/ThemeScopeTests.cs b/Tests/UnitTests/Configuration/ThemeScopeTests.cs
index 497b2ddea2..75e200585a 100644
--- a/Tests/UnitTests/Configuration/ThemeScopeTests.cs
+++ b/Tests/UnitTests/Configuration/ThemeScopeTests.cs
@@ -1,89 +1,106 @@
-using System.Text.Json;
-using UnitTests;
+using System.Collections.Concurrent;
+using System.Text.Json;
 using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui.ConfigurationTests;
 
 public class ThemeScopeTests
 {
-    public static readonly JsonSerializerOptions _jsonOptions = new ()
-    {
-        Converters =
-        {
-            //new AttributeJsonConverter (),
-            //new ColorJsonConverter ()
-        }
-    };
-
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void AllThemesPresent ()
+    public void Load_AllThemesPresent ()
     {
-        Reset ();
-        Assert.True (Themes.ContainsKey ("Default"));
-        Assert.True (Themes.ContainsKey ("Dark"));
-        Assert.True (Themes.ContainsKey ("Light"));
+        Enable (ConfigLocations.HardCoded);
+
+        Load (ConfigLocations.All);
+        Assert.True (ThemeManager.Themes!.ContainsKey ("Default"));
+        Assert.True (ThemeManager.Themes.ContainsKey ("Dark"));
+        Assert.True (ThemeManager.Themes.ContainsKey ("Light"));
+        Disable (true);
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
     public void Apply_ShouldApplyUpdatedProperties ()
     {
-        Reset ();
-        Assert.NotEmpty (Themes);
-        Alignment savedValue = Dialog.DefaultButtonAlignment;
-        Alignment newValue = Alignment.Center != savedValue ? Alignment.Center : Alignment.Start;
+        Enable (ConfigLocations.HardCoded);
+        Assert.NotEmpty (ThemeManager.Themes!);
 
-        Themes ["Default"] ["Dialog.DefaultButtonAlignment"].PropertyValue = newValue;
+        Alignment savedButtonAlignment = Dialog.DefaultButtonAlignment;
+        Alignment newButtonAlignment = Alignment.Center != savedButtonAlignment ? Alignment.Center : Alignment.Start;
+        ThemeManager.GetCurrentTheme () ["Dialog.DefaultButtonAlignment"].PropertyValue = newButtonAlignment;
 
-        ThemeManager.Themes! [ThemeManager.SelectedTheme]!.Apply ();
-        Assert.Equal (newValue, Dialog.DefaultButtonAlignment);
+        LineStyle savedBorderStyle = Dialog.DefaultBorderStyle;
+        LineStyle newBorderStyle = LineStyle.HeavyDotted;
+        ThemeManager.GetCurrentTheme () ["Dialog.DefaultBorderStyle"].PropertyValue = newBorderStyle;
+
+        ThemeManager.Themes! [ThemeManager.Theme]!.Apply ();
+        Assert.Equal (newButtonAlignment, Dialog.DefaultButtonAlignment);
+        Assert.Equal (newBorderStyle, Dialog.DefaultBorderStyle);
 
         // Replace with the savedValue to avoid failures on other unit tests that rely on the default value
-        Themes ["Default"] ["Dialog.DefaultButtonAlignment"].PropertyValue = savedValue;
-        ThemeManager.Themes! [ThemeManager.SelectedTheme]!.Apply ();
-        Assert.Equal (savedValue, Dialog.DefaultButtonAlignment);
+        ThemeManager.GetCurrentTheme () ["Dialog.DefaultButtonAlignment"].PropertyValue = savedButtonAlignment;
+        ThemeManager.GetCurrentTheme () ["Dialog.DefaultBorderStyle"].PropertyValue = savedBorderStyle;
+        ThemeManager.GetCurrentTheme ().Apply ();
+        Assert.Equal (savedButtonAlignment, Dialog.DefaultButtonAlignment);
+        Assert.Equal (savedBorderStyle, Dialog.DefaultBorderStyle);
+        Disable (true);
     }
 
     [Fact]
-    public void GetHardCodedDefaults_ShouldSetProperties ()
+    public void UpdateToHardCodedDefaults_Resets_Config_Does_Not_Apply ()
     {
-        Reset ();
-        GetHardCodedDefaults ();
-        Assert.NotEmpty (Themes);
-        Assert.Equal ("Default", Themes.Theme);
+        Enable (ConfigLocations.HardCoded);
+
+        Load (ConfigLocations.LibraryResources);
+
+        Assert.Equal ("Default", ThemeManager.Theme);
+        ThemeManager.Theme = "Dark";
+        Assert.Equal ("Dark", ThemeManager.Theme);
+        Apply ();
+        Assert.Equal ("Dark", ThemeManager.Theme);
+
+        // Act
+        ThemeManager.ResetToHardCodedDefaults ();
+        Assert.Equal ("Default", ThemeManager.Theme);
+
+        Disable (true);
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void TestSerialize_RoundTrip ()
+    public void Serialize_Themes_RoundTrip ()
     {
-        Reset ();
+        Enable (ConfigLocations.HardCoded);
 
-        Dictionary<string, ThemeScope> initial = ThemeManager.Themes;
+        IDictionary<string, ThemeScope> initial = ThemeManager.Themes;
 
-        string serialized = JsonSerializer.Serialize<IDictionary<string, ThemeScope>> (Themes, _jsonOptions);
+        string serialized = JsonSerializer.Serialize (ThemeManager.Themes, SerializerContext.Options);
 
-        IDictionary<string, ThemeScope> deserialized =
-            JsonSerializer.Deserialize<IDictionary<string, ThemeScope>> (serialized, _jsonOptions);
+        ConcurrentDictionary<string, ThemeScope> deserialized =
+            JsonSerializer.Deserialize<ConcurrentDictionary<string, ThemeScope>> (serialized, SerializerContext.Options);
 
         Assert.NotEqual (initial, deserialized);
-        Assert.Equal (deserialized.Count, initial.Count);
+        Assert.Equal (deserialized.Count, initial!.Count);
+
+        Disable (true);
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void ThemeManager_ClassMethodsWork ()
+    public void Serialize_New_RoundTrip ()
     {
-        Reset ();
-        Assert.Equal (ThemeManager.Instance, Themes);
-        Assert.NotEmpty (ThemeManager.Themes);
+        Enable (ConfigLocations.HardCoded);
+
+        var theme = new ThemeScope ();
+        theme.LoadHardCodedDefaults ();
+        theme ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.End;
+
+        string json = JsonSerializer.Serialize (theme, SerializerContext.Options);
+
+        var deserialized = JsonSerializer.Deserialize<ThemeScope> (json, SerializerContext.Options);
 
-        ThemeManager.SelectedTheme = "foo";
-        Assert.Equal ("foo", ThemeManager.SelectedTheme);
-        ThemeManager.Reset ();
-        Assert.Equal (string.Empty, ThemeManager.SelectedTheme);
+        Assert.Equal (
+                      Alignment.End,
+                      (Alignment)deserialized ["Dialog.DefaultButtonAlignment"].PropertyValue!
+                     );
 
-        Assert.Empty (ThemeManager.Themes);
+        Disable (true);
     }
 }
diff --git a/Tests/UnitTests/Configuration/ThemeTests.cs b/Tests/UnitTests/Configuration/ThemeTests.cs
index 8482b7a0da..a1eabf3f7f 100644
--- a/Tests/UnitTests/Configuration/ThemeTests.cs
+++ b/Tests/UnitTests/Configuration/ThemeTests.cs
@@ -1,9 +1,11 @@
 using System.Text.Json;
-using UnitTests;
 using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui.ConfigurationTests;
 
+/// <summary>
+///     Tests Settings["Theme"] and ThemeManager.Theme
+/// </summary>
 public class ThemeTests
 {
     public static readonly JsonSerializerOptions _jsonOptions = new ()
@@ -11,192 +13,5 @@ public class ThemeTests
         Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
     };
 
-    [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void TestApply ()
-    {
-        Reset ();
-
-        var theme = new ThemeScope ();
-        Assert.NotEmpty (theme);
-
-        Themes.Add ("testTheme", theme);
-
-        Assert.Equal (LineStyle.Single, FrameView.DefaultBorderStyle);
-        theme ["FrameView.DefaultBorderStyle"].PropertyValue = LineStyle.Double; // default is Single
-
-        Themes.Theme = "testTheme";
-        Themes! [ThemeManager.SelectedTheme]!.Apply ();
-
-        Assert.Equal (LineStyle.Double, FrameView.DefaultBorderStyle);
-
-        Reset ();
-    }
-
-    [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
-    public void TestApply_UpdatesColors ()
-    {
-        // Arrange
-        Reset ();
-
-        Assert.False (Colors.ColorSchemes.ContainsKey ("test"));
-
-        var theme = new ThemeScope ();
-        Assert.NotEmpty (theme);
-
-        Themes.Add ("testTheme", theme);
-
-        var colorScheme = new ColorScheme { Normal = new Attribute (Color.Red, Color.Green) };
-
-        theme ["ColorSchemes"].PropertyValue = new Dictionary<string, ColorScheme> { { "test", colorScheme } };
-
-        Assert.Equal (
-                      new Color (Color.Red),
-                      ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"].Normal.Foreground
-                     );
-
-        Assert.Equal (
-                      new Color (Color.Green),
-                      ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"].Normal.Background
-                     );
-
-        // Act
-        Themes.Theme = "testTheme";
-        Themes! [ThemeManager.SelectedTheme]!.Apply ();
-
-        // Assert
-        ColorScheme updatedScheme = Colors.ColorSchemes ["test"];
-        Assert.Equal (new Color (Color.Red), updatedScheme.Normal.Foreground);
-        Assert.Equal (new Color (Color.Green), updatedScheme.Normal.Background);
-
-        // remove test ColorScheme from Colors to avoid failures on others unit tests with ColorScheme
-        Colors.ColorSchemes.Remove ("test");
-        Assert.Equal (5, Colors.ColorSchemes.Count);
-        Reset ();
-    }
-
-    [Fact]
-    public void TestSerialize_RoundTrip ()
-    {
-        // This is needed to test only this alone
-        Reset ();
-
-        var theme = new ThemeScope ();
-        theme ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.End;
-
-        string json = JsonSerializer.Serialize (theme, _jsonOptions);
-
-        var deserialized = JsonSerializer.Deserialize<ThemeScope> (json, _jsonOptions);
-
-        Assert.Equal (
-                      Alignment.End,
-                      (Alignment)deserialized ["Dialog.DefaultButtonAlignment"].PropertyValue
-                     );
-        Reset ();
-    }
-
-    [Fact]
-    public void TestUpdatFrom_Add ()
-    {
-        // arrange
-        Reset ();
-
-        var theme = new ThemeScope ();
-        Assert.NotEmpty (theme);
-
-        Assert.Equal (5, Colors.ColorSchemes.Count);
-
-        theme ["ColorSchemes"].PropertyValue = Colors.ColorSchemes;
-
-        Dictionary<string, ColorScheme> colorSchemes =
-            (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
-        Assert.Equal (Colors.ColorSchemes.Count, colorSchemes.Count);
-
-        var newTheme = new ThemeScope ();
-
-        var colorScheme = new ColorScheme
-        {
-            // note: ColorScheme's can't be partial; default for each attribute
-            // is always White/Black
-            Normal = new Attribute (Color.Red, Color.Green),
-            Focus = new Attribute (Color.Cyan, Color.BrightCyan),
-            HotNormal = new Attribute (Color.Yellow, Color.BrightYellow),
-            HotFocus = new Attribute (Color.Green, Color.BrightGreen),
-            Disabled = new Attribute (Color.Gray, Color.DarkGray)
-        };
-
-        newTheme ["ColorSchemes"].PropertyValue = Colors.Reset ();
-        Assert.Equal (5, Colors.ColorSchemes.Count);
-
-        // add a new ColorScheme to the newTheme
-        ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"] = colorScheme;
-
-        colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
-        Assert.Equal (Colors.ColorSchemes.Count, colorSchemes.Count);
-
-        // Act
-        theme.Update (newTheme);
-
-        // Assert
-        colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
-        Assert.Equal (colorSchemes ["Test"].Normal, colorScheme.Normal);
-        Assert.Equal (colorSchemes ["Test"].Focus, colorScheme.Focus);
-        Reset ();
-    }
-
-    [Fact]
-    public void TestUpdatFrom_Change ()
-    {
-        // arrange
-        Reset ();
-
-        var theme = new ThemeScope ();
-        Assert.NotEmpty (theme);
-
-        var colorScheme = new ColorScheme
-        {
-            // note: ColorScheme's can't be partial; default for each attribute
-            // is always White/Black
-            Normal = new Attribute (Color.Red, Color.Green),
-            Focus = new Attribute (Color.Cyan, Color.BrightCyan),
-            HotNormal = new Attribute (Color.Yellow, Color.BrightYellow),
-            HotFocus = new Attribute (Color.Green, Color.BrightGreen),
-            Disabled = new Attribute (Color.Gray, Color.DarkGray)
-        };
-        theme ["ColorSchemes"].PropertyValue = Colors.Reset ();
-        ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"] = colorScheme;
-
-        Dictionary<string, ColorScheme> colorSchemes =
-            (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
-        Assert.Equal (colorScheme.Normal, colorSchemes ["Test"].Normal);
-        Assert.Equal (colorScheme.Focus, colorSchemes ["Test"].Focus);
-
-        // Change just Normal
-        var newTheme = new ThemeScope ();
-
-        var newColorScheme = new ColorScheme
-        {
-            Normal = new Attribute (Color.Blue, Color.BrightBlue),
-            Focus = colorScheme.Focus,
-            HotNormal = colorScheme.HotNormal,
-            HotFocus = colorScheme.HotFocus,
-            Disabled = colorScheme.Disabled
-        };
-        newTheme ["ColorSchemes"].PropertyValue = Colors.Reset ();
-        ((Dictionary<string, ColorScheme>)newTheme ["ColorSchemes"].PropertyValue) ["test"] = newColorScheme;
-
-        // Act
-        theme.Update (newTheme);
-
-        // Assert
-        colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
 
-        // Normal should have changed
-        Assert.Equal (new Color (Color.Blue), colorSchemes ["Test"].Normal.Foreground);
-        Assert.Equal (new Color (Color.BrightBlue), colorSchemes ["Test"].Normal.Background);
-        Assert.Equal (new Color (Color.Cyan), colorSchemes ["Test"].Focus.Foreground);
-        Assert.Equal (new Color (Color.BrightCyan), colorSchemes ["Test"].Focus.Background);
-        Reset ();
-    }
 }
diff --git a/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs b/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs
index d120e08093..95796f130f 100644
--- a/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs
+++ b/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs
@@ -183,10 +183,10 @@ public void InitRunShutdown_Top_Set_To_Null_After_Shutdown ()
                            if (Application.Top != null)
                            {
                                Application.RequestStop ();
-                               return true;
+                               return false;
                            }
 
-                           return true;
+                           return false;
                        }
                        );
         Assert.Null (Application.Top);
@@ -195,7 +195,8 @@ public void InitRunShutdown_Top_Set_To_Null_After_Shutdown ()
 
         v2.Run (new Window ());
 
-        Assert.True (v2.RemoveTimeout (timeoutToken));
+        // We returned false above, so we should not have to remove the timeout
+        Assert.False(v2.RemoveTimeout (timeoutToken));
 
         Assert.NotNull (Application.Top);
         Application.Top?.Dispose ();
@@ -226,10 +227,10 @@ public void InitRunShutdown_Running_Set_To_False ()
                                               if (Application.Top != null)
                                               {
                                                   Application.RequestStop ();
-                                                  return true;
+                                                  return false;
                                               }
 
-                                              return true;
+                                              return false;
                                           }
                                          );
 
@@ -237,8 +238,8 @@ public void InitRunShutdown_Running_Set_To_False ()
 
         // Blocks until the timeout call is hit
         v2.Run (top);
-
-        Assert.True (v2.RemoveTimeout (timeoutToken));
+        // We returned false above, so we should not have to remove the timeout
+        Assert.False (v2.RemoveTimeout (timeoutToken));
 
         Assert.False (top!.Running);
 
@@ -287,10 +288,10 @@ public void InitRunShutdown_End_Is_Called ()
                                               if (Application.Top != null)
                                               {
                                                   Application.RequestStop ();
-                                                  return true;
+                                                  return false;
                                               }
 
-                                              return true;
+                                              return false;
                                           }
                                          );
 
@@ -303,7 +304,8 @@ public void InitRunShutdown_End_Is_Called ()
         Assert.Equal (1, closedCount);
         Assert.Equal (1, unloadedCount);
 
-        Assert.True (v2.RemoveTimeout (timeoutToken));
+        // We returned false above, so we should not have to remove the timeout
+        Assert.False (v2.RemoveTimeout (timeoutToken));
 
         Application.Top?.Dispose ();
         v2.Shutdown ();
@@ -335,10 +337,10 @@ public void InitRunShutdown_QuitKey_Quits ()
                                               if (Application.Top != null)
                                               {
                                                   Application.RaiseKeyDownEvent (Application.QuitKey);
-                                                  return true;
+                                                  return false;
                                               }
 
-                                              return true;
+                                              return false;
                                           }
                                          );
 
@@ -347,7 +349,8 @@ public void InitRunShutdown_QuitKey_Quits ()
         // Blocks until the timeout call is hit
         v2.Run (top);
 
-        Assert.True (v2.RemoveTimeout (timeoutToken));
+        // We returned false above, so we should not have to remove the timeout
+        Assert.False (v2.RemoveTimeout (timeoutToken));
 
         Assert.False (top!.Running);
 
@@ -542,7 +545,7 @@ public void Open_CallsContinueWithOnUIThread ()
                                                   return false;
                                               }
 
-                                              return true;
+                                              return false;
                                           });
 
         Assert.Null (Application.Top);
diff --git a/Tests/UnitTests/Dialogs/DialogTests.cs b/Tests/UnitTests/Dialogs/DialogTests.cs
index d3da7d88ef..8ab138e6eb 100644
--- a/Tests/UnitTests/Dialogs/DialogTests.cs
+++ b/Tests/UnitTests/Dialogs/DialogTests.cs
@@ -1,25 +1,19 @@
+#nullable enable
 using UnitTests;
 using Xunit.Abstractions;
 using static Terminal.Gui.Application;
 
 namespace Terminal.Gui.DialogTests;
 
-public class DialogTests
+public class DialogTests (ITestOutputHelper output)
 {
-    private readonly ITestOutputHelper _output;
-
-    public DialogTests (ITestOutputHelper output)
-    {
-        _output = output;
-    }
-
     [Fact]
     [AutoInitShutdown]
     public void Add_Button_Works ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
 
         var title = "1234";
         var btn1Text = "yes";
@@ -48,21 +42,21 @@ public void Add_Button_Works ()
         };
 
         // Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
-        dlg.Border.Thickness = new (1, 0, 1, 0);
-        runstate = Begin (dlg);
+        dlg.Border!.Thickness = new (1, 0, 1, 0);
+        runState = Begin (dlg);
         var buttonRow = $"{Glyphs.VLine}    {btn1}     {Glyphs.VLine}";
 
-        RunIteration (ref runstate);
+        RunIteration (ref runState);
 
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
 
         // Now add a second button
         buttonRow = $"{Glyphs.VLine} {btn1} {btn2} {Glyphs.VLine}";
         dlg.AddButton (new () { Text = btn2Text });
 
-        RunIteration (ref runstate);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        RunIteration (ref runState);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
@@ -76,20 +70,20 @@ public void Add_Button_Works ()
         };
 
         // Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
-        dlg.Border.Thickness = new (1, 0, 1, 0);
-        runstate = Begin (dlg);
+        dlg.Border!.Thickness = new (1, 0, 1, 0);
+        runState = Begin (dlg);
 
-        RunIteration (ref runstate);
+        RunIteration (ref runState);
 
         buttonRow = $"{Glyphs.VLine}{btn1}         {Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
 
         // Now add a second button
         buttonRow = $"{Glyphs.VLine}{btn1}   {btn2}{Glyphs.VLine}";
         dlg.AddButton (new () { Text = btn2Text });
-        RunIteration (ref runstate);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        RunIteration (ref runState);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
@@ -103,21 +97,21 @@ public void Add_Button_Works ()
         };
 
         // Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
-        dlg.Border.Thickness = new (1, 0, 1, 0);
-        runstate = Begin (dlg);
+        dlg.Border!.Thickness = new (1, 0, 1, 0);
+        runState = Begin (dlg);
 
-        RunIteration (ref runstate);
+        RunIteration (ref runState);
 
         buttonRow = $"{Glyphs.VLine}{new (' ', width - btn1.Length - 2)}{btn1}{Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
 
         // Now add a second button
         buttonRow = $"{Glyphs.VLine}  {btn1} {btn2}{Glyphs.VLine}";
         dlg.AddButton (new () { Text = btn2Text });
 
-        RunIteration (ref runstate);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        RunIteration (ref runState);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
@@ -131,20 +125,20 @@ public void Add_Button_Works ()
         };
 
         // Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
-        dlg.Border.Thickness = new (1, 0, 1, 0);
-        runstate = Begin (dlg);
-        RunIteration (ref runstate);
+        dlg.Border!.Thickness = new (1, 0, 1, 0);
+        runState = Begin (dlg);
+        RunIteration (ref runState);
 
         buttonRow = $"{Glyphs.VLine}{btn1}{new (' ', width - btn1.Length - 2)}{Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
 
         // Now add a second button
         buttonRow = $"{Glyphs.VLine}{btn1} {btn2}  {Glyphs.VLine}";
         dlg.AddButton (new () { Text = btn2Text });
 
-        RunIteration (ref runstate);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        RunIteration (ref runState);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -152,9 +146,9 @@ public void Add_Button_Works ()
     [AutoInitShutdown]
     public void ButtonAlignment_Four ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -175,7 +169,7 @@ public void ButtonAlignment_Four ()
         d.SetBufferSize (buttonRow.Length, 3);
 
         // Default - Center
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -184,15 +178,15 @@ public void ButtonAlignment_Four ()
                                                         new Button { Text = btn3Text },
                                                         new Button { Text = btn4Text }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow = $"{Glyphs.VLine}{btn1}  {btn2}  {btn3} {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
@@ -201,15 +195,15 @@ public void ButtonAlignment_Four ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $"{Glyphs.VLine}  {btn1} {btn2} {btn3} {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
@@ -218,15 +212,15 @@ public void ButtonAlignment_Four ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $"{Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}  {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
@@ -235,8 +229,8 @@ public void ButtonAlignment_Four ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -244,9 +238,9 @@ public void ButtonAlignment_Four ()
     [AutoInitShutdown]
     public void ButtonAlignment_Four_On_Too_Small_Width ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -270,7 +264,7 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
         buttonRow =
             $"{Glyphs.VLine} yes {Glyphs.RightBracket}{btn2}{btn3}{Glyphs.LeftBracket} never{Glyphs.VLine}";
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -280,15 +274,15 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
                                                         new Button { Text = btn4Text }
                                                        );
         Assert.Equal (new (width, 1), dlg.Frame.Size);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow =
             $"{Glyphs.VLine}{Glyphs.LeftBracket} yes {Glyphs.LeftBracket} no {Glyphs.LeftBracket} maybe {Glyphs.LeftBracket} never {Glyphs.RightBracket}{Glyphs.VLine}";
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
@@ -297,15 +291,15 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $"{Glyphs.VLine}es {Glyphs.RightBracket}{btn2}{btn3}{btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
@@ -314,14 +308,14 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $"{Glyphs.VLine}{btn1}{btn2}{btn3}{Glyphs.LeftBracket} neve{Glyphs.VLine}";
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
@@ -330,8 +324,8 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -339,9 +333,9 @@ public void ButtonAlignment_Four_On_Too_Small_Width ()
     [AutoInitShutdown]
     public void ButtonAlignment_Four_WideOdd ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -364,7 +358,7 @@ public void ButtonAlignment_Four_WideOdd ()
         d.SetBufferSize (buttonRow.Length, 1);
 
         // Default - Center
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -373,15 +367,15 @@ public void ButtonAlignment_Four_WideOdd ()
                                                         new Button { Text = btn3Text },
                                                         new Button { Text = btn4Text }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow = $"{Glyphs.VLine}{btn1}     {btn2}     {btn3}     {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
@@ -390,15 +384,15 @@ public void ButtonAlignment_Four_WideOdd ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $"{Glyphs.VLine}            {btn1} {btn2} {btn3} {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
@@ -407,15 +401,15 @@ public void ButtonAlignment_Four_WideOdd ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $"{Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}            {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
@@ -424,8 +418,8 @@ public void ButtonAlignment_Four_WideOdd ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -433,9 +427,9 @@ public void ButtonAlignment_Four_WideOdd ()
     [AutoInitShutdown]
     public void ButtonAlignment_Four_Wider ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -460,7 +454,7 @@ public void ButtonAlignment_Four_Wider ()
         d.SetBufferSize (width, 3);
 
         // Default - Center
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -469,15 +463,15 @@ public void ButtonAlignment_Four_Wider ()
                                                         new Button { Text = btn3Text },
                                                         new Button { Text = btn4Text }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow = $"{Glyphs.VLine}{btn1}     {btn2}     {btn3}     {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.GetColumns ());
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
@@ -486,15 +480,15 @@ public void ButtonAlignment_Four_Wider ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $"{Glyphs.VLine}            {btn1} {btn2} {btn3} {btn4}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.GetColumns ());
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
@@ -503,15 +497,15 @@ public void ButtonAlignment_Four_Wider ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $"{Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}            {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.GetColumns ());
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
@@ -520,8 +514,8 @@ public void ButtonAlignment_Four_Wider ()
                                                  new Button { Text = btn3Text },
                                                  new Button { Text = btn4Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -529,8 +523,8 @@ public void ButtonAlignment_Four_Wider ()
     [AutoInitShutdown]
     public void ButtonAlignment_One ()
     {
-        var d = (FakeDriver)Driver;
-        RunState runstate = null;
+        var d = (FakeDriver)Driver!;
+        RunState? runState = null;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -545,7 +539,7 @@ public void ButtonAlignment_One ()
 
         d.SetBufferSize (width, 1);
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -553,8 +547,8 @@ public void ButtonAlignment_One ()
                                                        );
 
         // Center
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify 
@@ -562,14 +556,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}{Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}    {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
@@ -577,14 +571,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}    {Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
@@ -592,14 +586,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}{Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}    {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Wider
@@ -609,14 +603,14 @@ public void ButtonAlignment_One ()
 
         d.SetBufferSize (width, 1);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Center,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
@@ -624,14 +618,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}{Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}      {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
@@ -639,14 +633,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}      {Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
@@ -654,14 +648,14 @@ public void ButtonAlignment_One ()
             $"{Glyphs.VLine}{Glyphs.LeftBracket} {btnText} {Glyphs.RightBracket}      {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
                                                  new Button { Text = btnText }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -669,9 +663,9 @@ public void ButtonAlignment_One ()
     [AutoInitShutdown]
     public void ButtonAlignment_Three ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -690,7 +684,7 @@ public void ButtonAlignment_Three ()
 
         d.SetBufferSize (buttonRow.Length, 3);
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
@@ -698,15 +692,15 @@ public void ButtonAlignment_Three ()
                                                         new Button { Text = btn2Text },
                                                         new Button { Text = btn3Text }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow = $@"{Glyphs.VLine}{btn1}  {btn2}  {btn3}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
@@ -714,15 +708,15 @@ public void ButtonAlignment_Three ()
                                                  new Button { Text = btn2Text },
                                                  new Button { Text = btn3Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $@"{Glyphs.VLine}  {btn1} {btn2} {btn3}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
@@ -730,15 +724,15 @@ public void ButtonAlignment_Three ()
                                                  new Button { Text = btn2Text },
                                                  new Button { Text = btn3Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $@"{Glyphs.VLine}{btn1} {btn2} {btn3}  {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
@@ -746,8 +740,8 @@ public void ButtonAlignment_Three ()
                                                  new Button { Text = btn2Text },
                                                  new Button { Text = btn3Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -755,9 +749,9 @@ public void ButtonAlignment_Three ()
     [AutoInitShutdown]
     public void ButtonAlignment_Two ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -774,60 +768,60 @@ public void ButtonAlignment_Two ()
 
         d.SetBufferSize (buttonRow.Length, 3);
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
                                                         new Button { Text = btn1Text },
                                                         new Button { Text = btn2Text }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         buttonRow = $@"{Glyphs.VLine}{btn1}   {btn2}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Fill,
                                                  new Button { Text = btn1Text },
                                                  new Button { Text = btn2Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         buttonRow = $@"{Glyphs.VLine}  {btn1} {btn2}{Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.End,
                                                  new Button { Text = btn1Text },
                                                  new Button { Text = btn2Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         buttonRow = $@"{Glyphs.VLine}{btn1} {btn2}  {Glyphs.VLine}";
         Assert.Equal (width, buttonRow.Length);
 
-        (runstate, dlg) = BeginButtonTestDialog (
+        (runState, dlg) = BeginButtonTestDialog (
                                                  title,
                                                  width,
                                                  Alignment.Start,
                                                  new Button { Text = btn1Text },
                                                  new Button { Text = btn2Text }
                                                 );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -835,10 +829,10 @@ public void ButtonAlignment_Two ()
     [AutoInitShutdown]
     public void ButtonAlignment_Two_Hidden ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
         var firstIteration = false;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -861,47 +855,47 @@ public void ButtonAlignment_Two_Hidden ()
         // Default (Center)
         button1 = new () { Text = btn1Text };
         button2 = new () { Text = btn2Text };
-        (runstate, dlg) = BeginButtonTestDialog (title, width, Alignment.Center, button1, button2);
+        (runState, dlg) = BeginButtonTestDialog (title, width, Alignment.Center, button1, button2);
         button1.Visible = false;
-        RunIteration (ref runstate, firstIteration);
+        RunIteration (ref runState, firstIteration);
         buttonRow = $@"{Glyphs.VLine}         {btn2} {Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Justify
         Assert.Equal (width, buttonRow.Length);
         button1 = new () { Text = btn1Text };
         button2 = new () { Text = btn2Text };
-        (runstate, dlg) = BeginButtonTestDialog (title, width, Alignment.Fill, button1, button2);
+        (runState, dlg) = BeginButtonTestDialog (title, width, Alignment.Fill, button1, button2);
         button1.Visible = false;
-        RunIteration (ref runstate, firstIteration);
+        RunIteration (ref runState, firstIteration);
         buttonRow = $@"{Glyphs.VLine}          {btn2}{Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Right
         Assert.Equal (width, buttonRow.Length);
         button1 = new () { Text = btn1Text };
         button2 = new () { Text = btn2Text };
-        (runstate, dlg) = BeginButtonTestDialog (title, width, Alignment.End, button1, button2);
+        (runState, dlg) = BeginButtonTestDialog (title, width, Alignment.End, button1, button2);
         button1.Visible = false;
-        RunIteration (ref runstate, firstIteration);
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        RunIteration (ref runState, firstIteration);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
 
         // Left
         Assert.Equal (width, buttonRow.Length);
         button1 = new () { Text = btn1Text };
         button2 = new () { Text = btn2Text };
-        (runstate, dlg) = BeginButtonTestDialog (title, width, Alignment.Start, button1, button2);
+        (runState, dlg) = BeginButtonTestDialog (title, width, Alignment.Start, button1, button2);
         button1.Visible = false;
-        RunIteration (ref runstate, firstIteration);
+        RunIteration (ref runState, firstIteration);
         buttonRow = $@"{Glyphs.VLine}        {btn2}  {Glyphs.VLine}";
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -909,7 +903,7 @@ public void ButtonAlignment_Two_Hidden ()
     [AutoInitShutdown]
     public void Dialog_In_Window_With_Size_One_Button_Aligns ()
     {
-        ((FakeDriver)Driver).SetBufferSize (20, 5);
+        ((FakeDriver)Driver!).SetBufferSize (20, 5);
 
         // Override CM
         Window.DefaultBorderStyle = LineStyle.Single;
@@ -945,7 +939,7 @@ public void Dialog_In_Window_With_Size_One_Button_Aligns ()
 ││     {btn}     ││
 │└────────────────┘│
 └──────────────────┘";
-                                            _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, _output);
+                                            _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
                                         };
 
                           Run (dlg);
@@ -1014,7 +1008,7 @@ public void Dialog_In_Window_With_Size_One_Button_Aligns ()
                 )]
     public void Dialog_In_Window_Without_Size_One_Button_Aligns (int height, string expected)
     {
-        ((FakeDriver)Driver).SetBufferSize (20, height);
+        ((FakeDriver)Driver!).SetBufferSize (20, height);
         var win = new Window ();
 
         int iterations = -1;
@@ -1045,7 +1039,7 @@ public void Dialog_In_Window_Without_Size_One_Button_Aligns (int height, string
                              LayoutAndDraw ();
 
                              // BUGBUG: This seems wrong; is it a bug in Dim.Percent(85)?? No
-                             _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, _output);
+                             _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
                          }
                          else
                          {
@@ -1061,7 +1055,7 @@ public void Dialog_In_Window_Without_Size_One_Button_Aligns (int height, string
     [AutoInitShutdown]
     public void Dialog_Opened_From_Another_Dialog ()
     {
-        ((FakeDriver)Driver).SetBufferSize (30, 10);
+        ((FakeDriver)Driver!).SetBufferSize (30, 10);
 
         // Override CM
         Dialog.DefaultButtonAlignment = Alignment.Center;
@@ -1070,9 +1064,9 @@ public void Dialog_Opened_From_Another_Dialog ()
         Button.DefaultShadow = ShadowStyle.None;
 
         var btn1 = new Button { Text = "press me 1" };
-        Button btn2 = null;
-        Button btn3 = null;
-        string expected = null;
+        Button? btn2 = null;
+        Button? btn3 = null;
+        string? expected = null;
 
         btn1.Accepting += (s, e) =>
                           {
@@ -1112,7 +1106,7 @@ public void Dialog_Opened_From_Another_Dialog ()
                          switch (iterations)
                          {
                              case 0:
-                                 Top.SetNeedsLayout ();
+                                 Top!.SetNeedsLayout ();
                                  Top.SetNeedsDraw ();
                                  LayoutAndDraw ();
 
@@ -1134,9 +1128,9 @@ public void Dialog_Opened_From_Another_Dialog ()
   │                       │
   │{Glyphs.LeftBracket} Show Sub {Glyphs.RightBracket} {Glyphs.LeftBracket} Close {Glyphs.RightBracket} │
   └───────────────────────┘";
-                                 DriverAssert.AssertDriverContentsWithFrameAre (expected, _output);
+                                 DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
 
-                                 Assert.False (btn2.NewKeyDownEvent (Key.Space));
+                                 Assert.False (btn2!.NewKeyDownEvent (Key.Space));
 
                                  break;
                              case 3:
@@ -1152,22 +1146,22 @@ public void Dialog_Opened_From_Another_Dialog ()
   │  └──────────────────┘ │
   │{Glyphs.LeftBracket} Show Sub {Glyphs.RightBracket} {Glyphs.LeftBracket} Close {Glyphs.RightBracket} │
   └───────────────────────┘",
-                                                                                _output
+                                                                                output
                                                                                );
 
-                                 Assert.False (Top.NewKeyDownEvent (Key.Enter));
+                                 Assert.False (Top!.NewKeyDownEvent (Key.Enter));
 
                                  break;
                              case 4:
                                  LayoutAndDraw ();
 
-                                 DriverAssert.AssertDriverContentsWithFrameAre (expected, _output);
+                                 DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
 
-                                 Assert.False (btn3.NewKeyDownEvent (Key.Space));
+                                 Assert.False (btn3!.NewKeyDownEvent (Key.Space));
 
                                  break;
                              case 5:
-                                 DriverAssert.AssertDriverContentsWithFrameAre ("", _output);
+                                 DriverAssert.AssertDriverContentsWithFrameAre ("", output);
 
                                  RequestStop ();
 
@@ -1204,7 +1198,7 @@ public void Location_Default ()
             Height = Dim.Percent (85)
         };
         Begin (d);
-        ((FakeDriver)Driver).SetBufferSize (100, 100);
+        ((FakeDriver)Driver!).SetBufferSize (100, 100);
 
         // Default location is centered, so 100 / 2 - 85 / 2 = 7
         var expected = 7;
@@ -1218,7 +1212,7 @@ public void Location_Not_Default ()
     {
         var d = new Dialog { X = 1, Y = 1 };
         Begin (d);
-        ((FakeDriver)Driver).SetBufferSize (100, 100);
+        ((FakeDriver)Driver!).SetBufferSize (100, 100);
 
         // Default location is centered, so 100 / 2 - 85 / 2 = 7
         var expected = 1;
@@ -1240,7 +1234,7 @@ public void Location_When_Application_Top_Not_Default ()
         var expected = 5;
         var d = new Dialog { X = expected, Y = expected, Height = 5, Width = 5 };
         Begin (d);
-        ((FakeDriver)Driver).SetBufferSize (20, 10);
+        ((FakeDriver)Driver!).SetBufferSize (20, 10);
 
         // Default location is centered, so 100 / 2 - 85 / 2 = 7
         Assert.Equal (new (expected, expected), d.Frame.Location);
@@ -1252,7 +1246,7 @@ public void Location_When_Application_Top_Not_Default ()
      │   │
      │   │
      └───┘",
-                                                       _output
+                                                       output
                                                       );
         d.Dispose ();
     }
@@ -1261,9 +1255,9 @@ public void Location_When_Application_Top_Not_Default ()
     [AutoInitShutdown]
     public void One_Button_Works ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
 
         Button.DefaultShadow = ShadowStyle.None;
 
@@ -1276,14 +1270,14 @@ public void One_Button_Works ()
         int width = buttonRow.Length;
         d.SetBufferSize (buttonRow.Length, 10);
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (
+        (runState, Dialog dlg) = BeginButtonTestDialog (
                                                         title,
                                                         width,
                                                         Alignment.Center,
                                                         new Button { Text = btnText }
                                                        );
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
-        End (runstate);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -1298,7 +1292,7 @@ public void Size_Default ()
         };
 
         Begin (d);
-        ((FakeDriver)Driver).SetBufferSize (100, 100);
+        ((FakeDriver)Driver!).SetBufferSize (100, 100);
 
         // Default size is Percent(85) 
         Assert.Equal (new ((int)(100 * .85), (int)(100 * .85)), d.Frame.Size);
@@ -1314,7 +1308,7 @@ public void Size_Not_Default ()
         var d = new Dialog { Width = 50, Height = 50 };
 
         Begin (d);
-        ((FakeDriver)Driver).SetBufferSize (100, 100);
+        ((FakeDriver)Driver!).SetBufferSize (100, 100);
 
         // Default size is Percent(85) 
         Assert.Equal (new (50, 50), d.Frame.Size);
@@ -1325,9 +1319,9 @@ public void Size_Not_Default ()
     [SetupFakeDriver]
     public void Zero_Buttons_Works ()
     {
-        RunState runstate = null;
+        RunState? runState = null;
 
-        var d = (FakeDriver)Driver;
+        var d = (FakeDriver)Driver!;
 
         var title = "1234";
 
@@ -1335,11 +1329,11 @@ public void Zero_Buttons_Works ()
         int width = buttonRow.Length;
         d.SetBufferSize (buttonRow.Length, 3);
 
-        (runstate, Dialog dlg) = BeginButtonTestDialog (title, width, Alignment.Center, null);
+        (runState, Dialog dlg) = BeginButtonTestDialog (title, width, Alignment.Center, null);
 
-        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
+        DriverAssert.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
 
-        End (runstate);
+        End (runState);
         dlg.Dispose ();
     }
 
@@ -1368,7 +1362,7 @@ params Button [] btns
         };
 
         // Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
-        dlg.Border.Thickness = new (1, 0, 1, 0);
+        dlg.Border!.Thickness = new (1, 0, 1, 0);
 
         RunState runState = Begin (dlg);
 
@@ -1394,7 +1388,7 @@ public void Run_Does_Not_Dispose_Dialog ()
 
 #if DEBUG_IDISPOSABLE
         Assert.False (dlg.WasDisposed);
-        Assert.False (Top.WasDisposed);
+        Assert.False (Top!.WasDisposed);
         Assert.NotEqual (top, Top);
         Assert.Equal (dlg, Top);
 #endif
@@ -1418,7 +1412,7 @@ public void Run_Does_Not_Dispose_Dialog ()
 
         return;
 
-        void Dlg_Ready (object sender, EventArgs e) { RequestStop (); }
+        void Dlg_Ready (object? sender, EventArgs e) { RequestStop (); }
     }
 
     [Fact]
@@ -1433,7 +1427,7 @@ public void Can_Access_Cancel_Property_After_Run ()
 
 #if DEBUG_IDISPOSABLE
         Assert.False (dlg.WasDisposed);
-        Assert.False (Top.WasDisposed);
+        Assert.False (Top!.WasDisposed);
         Assert.Equal (dlg, Top);
 #endif
 
@@ -1462,7 +1456,7 @@ public void Can_Access_Cancel_Property_After_Run ()
         dlg2.Dispose ();
 
         // Now an assertion will throw accessing the Canceled property
-        exception = Record.Exception (() => Assert.True (dlg.Canceled));
+        exception = Record.Exception (() => Assert.True (dlg.Canceled))!;
         Assert.NotNull (exception);
         Assert.True (Top.WasDisposed);
         Shutdown ();
@@ -1472,10 +1466,63 @@ public void Can_Access_Cancel_Property_After_Run ()
 
         return;
 
-        void Dlg_Ready (object sender, EventArgs e)
+        void Dlg_Ready (object? sender, EventArgs e)
         {
-            ((Dialog)sender).Canceled = true;
+            ((Dialog)sender!).Canceled = true;
             RequestStop ();
         }
     }
+
+
+    [Fact]
+    [AutoInitShutdown]
+    public void Modal_Captures_All_Mouse ()
+    {
+        Toplevel top = new Toplevel ()
+        {
+            Id = "top",
+        };
+
+        var d = new Dialog
+        {
+            Width = 10,
+            Height = 10,
+            X = 1,
+            Y = 1
+        };
+
+        ((FakeDriver)Driver!).SetBufferSize (20, 20);
+
+        int iterations = 0;
+        Iteration += (s, a) =>
+                     {
+                         if (++iterations > 2)
+                         {
+                             RequestStop ();
+                         }
+
+                         if (iterations == 1)
+                         {
+                             Application.Run (d);
+                             d.Dispose ();
+                         }
+                         else if (iterations == 2)
+                         {
+                             // Mouse click outside of dialog
+                             Application.RaiseMouseEvent (new MouseEventArgs () { Flags = MouseFlags.Button1Clicked, ScreenPosition = new Point (0, 0) });
+                         }
+
+
+                     };
+
+        top.MouseEvent += (s, e) =>
+                          {
+                              // This should not be called because the dialog is modal
+                              Assert.False (true, "Mouse event should not be captured by the top level when a dialog is modal.");
+                          };
+
+        Application.Run (top);
+        top.Dispose ();
+        Application.Shutdown ();
+    }
 }
diff --git a/Tests/UnitTests/Drawing/ThicknessTests.cs b/Tests/UnitTests/Drawing/ThicknessTests.cs
index 40aae866ce..24f7394087 100644
--- a/Tests/UnitTests/Drawing/ThicknessTests.cs
+++ b/Tests/UnitTests/Drawing/ThicknessTests.cs
@@ -119,7 +119,7 @@ T                                    TTT
     public void DrawTests_Ruler ()
     {
         // Add a frame so we can see the ruler
-        var f = new FrameView { X = 0, Y = 0, Width = Dim.Fill (), Height = Dim.Fill () };
+        var f = new FrameView { X = 0, Y = 0, Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single};
 
         var top = new Toplevel ();
         top.Add (f);
diff --git a/Tests/UnitTests/DriverAssert.cs b/Tests/UnitTests/DriverAssert.cs
index a9ec89a8d6..0174d75884 100644
--- a/Tests/UnitTests/DriverAssert.cs
+++ b/Tests/UnitTests/DriverAssert.cs
@@ -43,7 +43,7 @@ params Attribute [] expectedAttributes
         expectedLook = expectedLook.Trim ();
         driver ??= Application.Driver;
 
-        Cell [,] contents = driver.Contents;
+        Cell [,] contents = driver!.Contents;
 
         var line = 0;
 
@@ -51,7 +51,7 @@ params Attribute [] expectedAttributes
         {
             for (var c = 0; c < lineString.Length; c++)
             {
-                Attribute? val = contents [line, c].Attribute;
+                Attribute? val = contents! [line, c].Attribute;
 
                 List<Attribute> match = expectedAttributes.Where (e => e == val).ToList ();
 
@@ -60,9 +60,9 @@ params Attribute [] expectedAttributes
                     case 0:
                         output.WriteLine (
                                           $"{Application.ToString (driver)}\n"
-                                          + $"Expected Attribute {val} (PlatformColor = {val.Value.PlatformColor}) at Contents[{line},{c}] {contents [line, c]} ((PlatformColor = {contents [line, c].Attribute.Value.PlatformColor}) was not found.\n"
-                                          + $" Expected: {string.Join (",", expectedAttributes.Select (c => c))}\n"
-                                          + $"  But Was: <not found>"
+                                          + $"Expected Attribute {val} (PlatformColor = {val!.Value.PlatformColor}) at Contents[{line},{c}] {contents [line, c]} ((PlatformColor = {contents [line, c].Attribute.Value.PlatformColor}) was not found.\n"
+                                          + $" Expected: {string.Join (",", expectedAttributes.Select (attr => attr))}\n"
+                                          + $" But Was: <not found>"
                                          );
                         Assert.Empty (match);
 
@@ -79,9 +79,55 @@ params Attribute [] expectedAttributes
                 if (colorUsed != userExpected)
                 {
                     output.WriteLine ($"{Application.ToString (driver)}");
-                    output.WriteLine ($"Unexpected Attribute at Contents[{line},{c}] {contents [line, c]}.");
+                    output.WriteLine ($"Unexpected Attribute at Contents[{line},{c}] = {contents [line, c]}.");
                     output.WriteLine ($" Expected: {userExpected} ({expectedAttributes [int.Parse (userExpected.ToString ())]})");
-                    output.WriteLine ($"  But Was:   {colorUsed} ({val})");
+                    output.WriteLine ($"  But Was: {colorUsed} ({val})");
+
+                    // Print `contents` as the expected and actual attribute indexes in a grid where each cell is of the form "e:a" (e = expected, a = actual)
+                    // e.g:
+                    // 0:1 0:0 1:1
+                    // 0:0 1:1 0:0
+                    // 0:0 1:1 0:0
+
+                    //// Use StringBuilder since output only has .WriteLine
+                    //var sb = new StringBuilder ();
+                    //// for each line in `contents`
+                    //for (var r = 0; r < driver.Rows; r++)
+                    //{
+                    //    // for each column in `contents`
+                    //    for (var cc = 0; cc < driver.Cols; cc++)
+                    //    {
+                    //        // get the attribute at the current location
+                    //        Attribute? val2 = contents [r, cc].Attribute;
+                    //        // if the attribute is not null
+                    //        if (val2.HasValue)
+                    //        {
+                    //            // get the index of the attribute in `expectedAttributes`
+                    //            int index = Array.IndexOf (expectedAttributes, val2.Value);
+                    //            // if the index is -1, it means the attribute was not found in `expectedAttributes`
+
+                    //            // get the index of the actual attribute in `expectedAttributes`
+
+
+                    //            if (index == -1)
+                    //            {
+                    //                sb.Append ("x:x ");
+                    //            }
+                    //            else
+                    //            {
+                    //                sb.Append ($"{index}:{val2.Value} ");
+                    //            }
+                    //        }
+                    //        else
+                    //        {
+                    //            sb.Append ("x:x ");
+                    //        }
+                    //    }
+                    //    sb.AppendLine ();
+                    //}
+
+                    //output.WriteLine ($"Contents:\n{sb}");
+
                     Assert.Equal (userExpected, colorUsed);
 
                     return;
diff --git a/Tests/UnitTests/Input/Keyboard/KeyTests.cs b/Tests/UnitTests/Input/Keyboard/KeyTests.cs
new file mode 100644
index 0000000000..2a6e96b2d7
--- /dev/null
+++ b/Tests/UnitTests/Input/Keyboard/KeyTests.cs
@@ -0,0 +1,24 @@
+using System.Text;
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.InputTests;
+
+public class KeyTests
+{
+    [Fact]
+    public void Set_Key_Separator_With_Rune_Default_Ensure_Using_The_Default_Plus ()
+    {
+        Key key = new (Key.A.WithCtrl);
+        Assert.Equal ((Rune)'+', Key.Separator);
+        Assert.Equal ("Ctrl+A", key.ToString ());
+
+        // NOTE: This means this test can't be parallelized
+        Key.Separator = new ('-');
+        Assert.Equal ((Rune)'-', Key.Separator);
+        Assert.Equal ("Ctrl-A", key.ToString ());
+
+        Key.Separator = new ();
+        Assert.Equal ((Rune)'+', Key.Separator);
+        Assert.Equal ("Ctrl+A", key.ToString ());
+    }
+}
diff --git a/Tests/UnitTests/Resources/ResourceManagerTests.cs b/Tests/UnitTests/Resources/ResourceManagerTests.cs
index a77848da54..75767f1445 100644
--- a/Tests/UnitTests/Resources/ResourceManagerTests.cs
+++ b/Tests/UnitTests/Resources/ResourceManagerTests.cs
@@ -3,6 +3,7 @@
 using System.Collections;
 using System.Globalization;
 using System.Resources;
+using System.Runtime.CompilerServices;
 using Terminal.Gui.Resources;
 
 namespace Terminal.Gui.ResourcesTests;
@@ -16,10 +17,20 @@ public class ResourceManagerTests
     private const string NO_TRANSLATED_VALUE = "Delete {0}";
     private const string TRANSLATED_KEY = "ctxSelectAll";
     private const string TRANSLATED_VALUE = "_Selecionar Tudo";
-    private static readonly string _stringsNoTranslatedKey = Strings.fdDeleteTitle;
-    private static readonly string _stringsTranslatedKey = Strings.ctxSelectAll;
-    private static readonly CultureInfo _savedCulture = CultureInfo.CurrentCulture;
-    private static readonly CultureInfo _savedUICulture = CultureInfo.CurrentUICulture;
+
+
+    [ModuleInitializer]
+    internal static void SaveOriginalCultureInfo ()
+    {
+        _savedCulture = CultureInfo.CurrentCulture;
+        _savedUICulture = CultureInfo.CurrentUICulture;
+    }
+
+    private static CultureInfo? _savedCulture;
+    private static CultureInfo? _savedUICulture;
+    private static string? _stringsNoTranslatedKey;
+    // ReSharper disable once NotAccessedField.Local
+    private static string? _stringsTranslatedKey;
 
     [Fact]
     public void GetObject_Does_Not_Overflows_If_Key_Does_Not_Exist () { Assert.Null (GlobalResources.GetObject (NO_EXISTENT_KEY, CultureInfo.CurrentCulture)); }
@@ -32,7 +43,7 @@ public void GetObject_FallBack_To_Default_For_No_Existent_Culture_File ()
 
         Assert.Equal (NO_TRANSLATED_VALUE, GlobalResources.GetObject (NO_TRANSLATED_KEY, CultureInfo.CurrentCulture));
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
     [Fact]
@@ -43,7 +54,7 @@ public void GetObject_FallBack_To_Default_For_Not_Translated_Existent_Culture_Fi
 
         Assert.Equal (NO_TRANSLATED_VALUE, GlobalResources.GetObject (NO_TRANSLATED_KEY, CultureInfo.CurrentCulture));
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
     [Fact]
@@ -76,7 +87,7 @@ public void GetString_FallBack_To_Default_For_No_Existent_Culture_File ()
 
         Assert.Equal (NO_TRANSLATED_VALUE, GlobalResources.GetString (NO_TRANSLATED_KEY, CultureInfo.CurrentCulture));
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
     [Fact]
@@ -92,7 +103,7 @@ public void GetString_FallBack_To_Default_For_Not_Translated_Existent_Culture_Fi
         // Calling Strings.fdDeleteBody return always the invariant culture
         Assert.Equal (NO_TRANSLATED_VALUE, GlobalResources.GetString (NO_TRANSLATED_KEY, CultureInfo.CurrentCulture));
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
     [Fact]
@@ -103,27 +114,32 @@ public void Strings_Always_FallBack_To_Default_For_No_Existent_Culture_File ()
 
         Assert.Equal (NO_TRANSLATED_VALUE, _stringsNoTranslatedKey);
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
     [Fact]
     public void Strings_Always_FallBack_To_Default_For_Not_Translated_Existent_Culture_File ()
     {
+        ResetCultureInfo ();
+
         CultureInfo.CurrentCulture = new (EXISTENT_CULTURE);
         CultureInfo.CurrentUICulture = new (EXISTENT_CULTURE);
 
         // This is really already translated
-        Assert.Equal (TRANSLATED_VALUE, _stringsTranslatedKey);
+        Assert.Equal (TRANSLATED_VALUE, Strings.ctxSelectAll);
 
         // This isn't already translated
         Assert.Equal (NO_TRANSLATED_VALUE, _stringsNoTranslatedKey);
 
-        RestoreCurrentCultures ();
+        ResetCultureInfo ();
     }
 
-    private void RestoreCurrentCultures ()
+    private void ResetCultureInfo ()
     {
-        CultureInfo.CurrentCulture = _savedCulture;
-        CultureInfo.CurrentUICulture = _savedUICulture;
+        CultureInfo.CurrentCulture = _savedCulture!;
+        CultureInfo.CurrentUICulture = _savedUICulture!;
+
+        _stringsNoTranslatedKey = Strings.fdDeleteTitle;
+        _stringsTranslatedKey = Strings.ctxSelectAll;
     }
 }
diff --git a/Tests/UnitTests/TestRespondersDisposedAttribute.cs b/Tests/UnitTests/TestRespondersDisposedAttribute.cs
index 69e8f607cd..d9ccfa3d8d 100644
--- a/Tests/UnitTests/TestRespondersDisposedAttribute.cs
+++ b/Tests/UnitTests/TestRespondersDisposedAttribute.cs
@@ -20,6 +20,9 @@ public class TestRespondersDisposedAttribute : BeforeAfterTestAttribute
     public override void After (MethodInfo methodUnderTest)
     {
         Debug.WriteLine ($"After: {methodUnderTest.Name}");
+
+        Debug.Assert (!CM.IsEnabled, "This test left ConfigurationManager enabled!");
+
         base.After (methodUnderTest);
 
 #if DEBUG_IDISPOSABLE
diff --git a/Tests/UnitTests/Text/AutocompleteTests.cs b/Tests/UnitTests/Text/AutocompleteTests.cs
index 69d230cf56..451eb0acec 100644
--- a/Tests/UnitTests/Text/AutocompleteTests.cs
+++ b/Tests/UnitTests/Text/AutocompleteTests.cs
@@ -276,27 +276,27 @@ public void Test_GenerateSuggestions_Simple ()
     }
 
     [Fact]
-    public void TestSettingColorSchemeOnAutocomplete ()
+    public void TestSettingSchemeOnAutocomplete ()
     {
         var tv = new TextView ();
 
-        // to begin with we should be using the default menu color scheme
-        Assert.Same (Colors.ColorSchemes ["Menu"], tv.Autocomplete.ColorScheme);
+        // to begin with we should be using the default menu scheme
+        Assert.Same (SchemeManager.GetSchemes () ["Menu"], tv.Autocomplete.Scheme);
 
         // allocate a new custom scheme
-        tv.Autocomplete.ColorScheme = new ()
+        tv.Autocomplete.Scheme = new ()
         {
             Normal = new (Color.Black, Color.Blue), Focus = new (Color.Black, Color.Cyan)
         };
 
         // should be separate instance
-        Assert.NotSame (Colors.ColorSchemes ["Menu"], tv.Autocomplete.ColorScheme);
+        Assert.NotSame (SchemeManager.GetSchemes () ["Menu"], tv.Autocomplete.Scheme);
 
         // with the values we set on it
-        Assert.Equal (new (Color.Black), tv.Autocomplete.ColorScheme.Normal.Foreground);
-        Assert.Equal (new (Color.Blue), tv.Autocomplete.ColorScheme.Normal.Background);
+        Assert.Equal (new (Color.Black), tv.Autocomplete.Scheme.Normal.Foreground);
+        Assert.Equal (new (Color.Blue), tv.Autocomplete.Scheme.Normal.Background);
 
-        Assert.Equal (new (Color.Black), tv.Autocomplete.ColorScheme.Focus.Foreground);
-        Assert.Equal (new (Color.Cyan), tv.Autocomplete.ColorScheme.Focus.Background);
+        Assert.Equal (new (Color.Black), tv.Autocomplete.Scheme.Focus.Foreground);
+        Assert.Equal (new (Color.Cyan), tv.Autocomplete.Scheme.Focus.Background);
     }
 }
diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj
index 9bfd1b2db5..f1558775d2 100644
--- a/Tests/UnitTests/UnitTests.csproj
+++ b/Tests/UnitTests/UnitTests.csproj
@@ -58,7 +58,6 @@
 		<Using Include="Xunit" />
 	</ItemGroup>
 	<ItemGroup>
-		<Folder Include="Input\Keyboard\" />
 		<Folder Include="Input\Mouse\" />
 	</ItemGroup>
 	<PropertyGroup Label="FineCodeCoverage">
diff --git a/Tests/UnitTests/View/Adornment/AdornmentSubViewTests.cs b/Tests/UnitTests/View/Adornment/AdornmentSubViewTests.cs
index b7de7d31c2..953836673c 100644
--- a/Tests/UnitTests/View/Adornment/AdornmentSubViewTests.cs
+++ b/Tests/UnitTests/View/Adornment/AdornmentSubViewTests.cs
@@ -12,7 +12,7 @@ public class AdornmentSubViewTests (ITestOutputHelper output)
     [InlineData (1, 0, true)]
     [InlineData (1, 1, true)]
     [InlineData (2, 1, true)]
-    public void Adornment_WithSubView_GetViewsUnderMouse_Finds (int viewMargin, int subViewMargin, bool expectedFound)
+    public void Adornment_WithSubView_Finds (int viewMargin, int subViewMargin, bool expectedFound)
     {
         Application.Top = new Toplevel()
         {
@@ -20,6 +20,8 @@ public void Adornment_WithSubView_GetViewsUnderMouse_Finds (int viewMargin, int
             Height = 10
         };
         Application.Top.Margin.Thickness = new Thickness (viewMargin);
+        // Turn of TransparentMouse for the test
+        Application.Top.Margin.ViewportSettings = ViewportSettings.None;
 
         var subView = new View ()
         {
@@ -29,10 +31,13 @@ public void Adornment_WithSubView_GetViewsUnderMouse_Finds (int viewMargin, int
             Height = 5
         };
         subView.Margin.Thickness = new Thickness (subViewMargin);
+        // Turn of TransparentMouse for the test
+        subView.Margin.ViewportSettings = ViewportSettings.None;
+
         Application.Top.Margin.Add (subView);
         Application.Top.Layout ();
 
-        var foundView = View.GetViewsUnderMouse (new Point(0, 0)).LastOrDefault ();
+        var foundView = View.GetViewsUnderLocation (new Point(0, 0), ViewportSettings.None).LastOrDefault ();
 
         bool found = foundView == subView || foundView == subView.Margin;
         Assert.Equal (expectedFound, found);
@@ -41,7 +46,7 @@ public void Adornment_WithSubView_GetViewsUnderMouse_Finds (int viewMargin, int
     }
 
     [Fact]
-    public void Adornment_WithNonVisibleSubView_GetViewsUnderMouse_Finds_Adornment ()
+    public void Adornment_WithNonVisibleSubView_Finds_Adornment ()
     {
         Application.Top = new Toplevel ()
         {
@@ -61,7 +66,7 @@ public void Adornment_WithNonVisibleSubView_GetViewsUnderMouse_Finds_Adornment (
         Application.Top.Padding.Add (subView);
         Application.Top.Layout ();
 
-        Assert.Equal (Application.Top.Padding, View.GetViewsUnderMouse (new Point(0, 0)).LastOrDefault ());
+        Assert.Equal (Application.Top.Padding, View.GetViewsUnderLocation (new Point(0, 0), ViewportSettings.None).LastOrDefault ());
         Application.Top?.Dispose ();
         Application.ResetState (ignoreDisposed: true);
     }
diff --git a/Tests/UnitTests/View/Adornment/BorderTests.cs b/Tests/UnitTests/View/Adornment/BorderTests.cs
index 0d0bf676b9..406a8dec31 100644
--- a/Tests/UnitTests/View/Adornment/BorderTests.cs
+++ b/Tests/UnitTests/View/Adornment/BorderTests.cs
@@ -19,15 +19,15 @@ public void Border_Parent_HasFocus_Title_Uses_FocusAttribute ()
         view.Border!.Thickness = new (0, 1, 0, 0);
         view.Border.LineStyle = LineStyle.Single;
 
-        view.ColorScheme = new ()
+        view.SetScheme (new ()
         {
             Normal = new (Color.Red, Color.Green),
             Focus = new (Color.Green, Color.Red)
-        };
-        Assert.NotEqual (view.ColorScheme.Normal.Foreground, view.ColorScheme.Focus.Foreground);
-        Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
+        });
+        Assert.NotEqual (view.GetScheme ().Normal.Foreground, view.GetScheme ().Focus.Foreground);
+        Assert.Equal (ColorName16.Red, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Green, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
 
         superView.BeginInit ();
         superView.EndInit ();
@@ -35,34 +35,34 @@ public void Border_Parent_HasFocus_Title_Uses_FocusAttribute ()
 
         var expected = @"─┤A├─";
         DriverAssert.AssertDriverContentsAre (expected, output);
-        DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.ColorScheme.Normal);
+        DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.GetScheme ().Normal);
 
         view.CanFocus = true;
         view.SetFocus ();
         View.SetClipToScreen ();
         view.Draw ();
-        Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
-        Assert.Equal (view.ColorScheme.Focus.Foreground, view.Border.GetFocusColor ().Foreground);
-        Assert.Equal (view.ColorScheme.Normal.Foreground, view.Border.GetNormalColor ().Foreground);
-        DriverAssert.AssertDriverAttributesAre ("00100", output, null, view.ColorScheme.Normal, view.GetFocusColor ());
+        Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
+        Assert.Equal (view.GetScheme ().Focus.Foreground, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground);
+        Assert.Equal (view.GetScheme ().Normal.Foreground, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground);
+        DriverAssert.AssertDriverAttributesAre ("00100", output, null, view.GetScheme ().Normal, view.GetAttributeForRole (VisualRole.Focus));
     }
 
     [Fact]
     [SetupFakeDriver]
-    public void Border_Uses_Parent_ColorScheme ()
+    public void Border_Uses_Parent_Scheme ()
     {
         var view = new View { Title = "A", Height = 2, Width = 5 };
         view.Border.Thickness = new (0, 1, 0, 0);
         view.Border.LineStyle = LineStyle.Single;
 
-        view.ColorScheme = new ()
+        view.SetScheme (new ()
         {
             Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
-        };
-        Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (view.GetNormalColor (), view.Border.GetNormalColor ());
-        Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
+        });
+        Assert.Equal (ColorName16.Red, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Green, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (view.GetAttributeForRole (VisualRole.Normal), view.Border.GetAttributeForRole (VisualRole.Normal));
+        Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
 
         view.BeginInit ();
         view.EndInit ();
@@ -70,7 +70,7 @@ public void Border_Uses_Parent_ColorScheme ()
 
         var expected = @"─┤A├─";
         DriverAssert.AssertDriverContentsAre (expected, output);
-        DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.ColorScheme.Normal);
+        DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.GetScheme ().Normal);
     }
 
     [Theory]
@@ -727,7 +727,7 @@ public void HasSuperView ()
         var top = new Toplevel ();
         top.BorderStyle = LineStyle.Double;
 
-        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single};
 
         top.Add (frame);
         RunState rs = Application.Begin (top);
@@ -755,7 +755,7 @@ public void HasSuperView_Title ()
         var top = new Toplevel ();
         top.BorderStyle = LineStyle.Double;
 
-        var frame = new FrameView { Title = "1234", Width = Dim.Fill (), Height = Dim.Fill () };
+        var frame = new FrameView { Title = "1234", Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
 
         top.Add (frame);
         RunState rs = Application.Begin (top);
diff --git a/Tests/UnitTests/View/Adornment/MarginTests.cs b/Tests/UnitTests/View/Adornment/MarginTests.cs
index 4efeff432f..2cd0faa170 100644
--- a/Tests/UnitTests/View/Adornment/MarginTests.cs
+++ b/Tests/UnitTests/View/Adornment/MarginTests.cs
@@ -18,27 +18,63 @@ public void Margin_Is_Transparent ()
         Application.Top = new Toplevel ();
         Application.TopLevels.Push (Gui.Application.Top);
 
-        Application.Top.ColorScheme = new()
+        Application.Top.SetScheme (new()
         {
             Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
-        };
+        });
 
         Application.Top.Add (view);
-        Assert.Equal (ColorName16.Red, view.Margin.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (ColorName16.Red, Application.Top.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Red, view.Margin.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Red, Application.Top.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
 
         Application.Top.BeginInit ();
         Application.Top.EndInit ();
         Application.LayoutAndDraw();
 
         DriverAssert.AssertDriverContentsAre (
-                                             @"
+                                             @"",
+                                             output
+                                            );
+        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Top.GetAttributeForRole (VisualRole.Normal));
+
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    [SetupFakeDriver]
+    public void Margin_ViewPortSettings_Not_Transparent_Is_NotTransparent ()
+    {
+        ((FakeDriver)Application.Driver!).SetBufferSize (5, 5);
+
+        var view = new View { Height = 3, Width = 3 };
+        view.Margin!.Diagnostics = ViewDiagnosticFlags.Thickness;
+        view.Margin.Thickness = new (1);
+        view.Margin.ViewportSettings = ViewportSettings.None;
+
+        Application.Top = new Toplevel ();
+        Application.TopLevels.Push (Gui.Application.Top);
+
+        Application.Top.SetScheme (new ()
+        {
+            Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
+        });
+
+        Application.Top.Add (view);
+        Assert.Equal (ColorName16.Red, view.Margin.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Red, Application.Top.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+
+        Application.Top.BeginInit ();
+        Application.Top.EndInit ();
+        Application.LayoutAndDraw ();
+
+        DriverAssert.AssertDriverContentsAre (
+                                              @"
 MMM
 M M
 MMM",
-                                             output
-                                            );
-        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Top.GetNormalColor ());
+                                              output
+                                             );
+        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Top.GetAttributeForRole (VisualRole.Normal));
 
         Application.ResetState (true);
     }
diff --git a/Tests/UnitTests/View/Adornment/PaddingTests.cs b/Tests/UnitTests/View/Adornment/PaddingTests.cs
index e246d22f68..6e0ebb0983 100644
--- a/Tests/UnitTests/View/Adornment/PaddingTests.cs
+++ b/Tests/UnitTests/View/Adornment/PaddingTests.cs
@@ -7,20 +7,20 @@ public class PaddingTests (ITestOutputHelper output)
 {
     [Fact]
     [SetupFakeDriver]
-    public void Padding_Uses_Parent_ColorScheme ()
+    public void Padding_Uses_Parent_Scheme ()
     {
         ((FakeDriver)Application.Driver!).SetBufferSize (5, 5);
         var view = new View { Height = 3, Width = 3 };
         view.Padding!.Thickness = new (1);
         view.Padding.Diagnostics = ViewDiagnosticFlags.Thickness;
 
-        view.ColorScheme = new()
+        view.SetScheme (new()
         {
             Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
-        };
+        });
 
-        Assert.Equal (ColorName16.Red, view.Padding.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (view.GetNormalColor (), view.Padding.GetNormalColor ());
+        Assert.Equal (ColorName16.Red, view.Padding.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (view.GetAttributeForRole (VisualRole.Normal), view.Padding.GetAttributeForRole (VisualRole.Normal));
 
         view.BeginInit ();
         view.EndInit ();
@@ -33,6 +33,6 @@ P P
 PPP",
                                              output
                                             );
-        DriverAssert.AssertDriverAttributesAre ("0", output, null, view.GetNormalColor ());
+        DriverAssert.AssertDriverAttributesAre ("0", output, null, view.GetAttributeForRole (VisualRole.Normal));
     }
 }
diff --git a/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs b/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
index b0a4e3057f..1a0efb5eae 100644
--- a/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
+++ b/Tests/UnitTests/View/Adornment/ShadowStyleTests.cs
@@ -43,7 +43,7 @@ public void ShadowView_Colors (ShadowStyle style, string expectedAttrs)
             Attribute.Default,
             new (fg, bg),
             new (Color.Black, bg),
-            new (fg.GetDarkerColor (), bg.GetDarkerColor ())
+            new (fg.GetDimColor (), bg.GetDimColor ())
         };
 
         var superView = new Toplevel
@@ -51,8 +51,8 @@ public void ShadowView_Colors (ShadowStyle style, string expectedAttrs)
             Height = 3,
             Width = 3,
             Text = "012ABC!@#",
-            ColorScheme = new (new Attribute (fg, bg))
         };
+        superView.SetScheme (new (new Attribute (fg, bg)));
         superView.TextFormatter.WordWrap = true;
 
         View view = new ()
@@ -61,8 +61,9 @@ public void ShadowView_Colors (ShadowStyle style, string expectedAttrs)
             Height = Dim.Auto (),
             Text = "*",
             ShadowStyle = style,
-            ColorScheme = new (Attribute.Default)
         };
+        view.SetScheme (new (Attribute.Default));
+
         superView.Add (view);
         Application.TopLevels.Push (superView);
         Application.LayoutAndDraw (true);
@@ -132,6 +133,7 @@ public void Visual_Test (ShadowStyle style, string expected)
     [InlineData (ShadowStyle.Transparent, 1, 0, 0, 1)]
     public void ShadowStyle_Button1Pressed_Causes_Movement (ShadowStyle style, int expectedLeft, int expectedTop, int expectedRight, int expectedBottom)
     {
+        Application.Init (new FakeDriver ());
         var superView = new View
         {
             Height = 10, Width = 10
diff --git a/Tests/UnitTests/View/Draw/ClearViewportTests.cs b/Tests/UnitTests/View/Draw/ClearViewportTests.cs
index 8b13583beb..3be3326e2f 100644
--- a/Tests/UnitTests/View/Draw/ClearViewportTests.cs
+++ b/Tests/UnitTests/View/Draw/ClearViewportTests.cs
@@ -188,7 +188,7 @@ public void Clear_WithClearVisibleContentOnly_ClearsVisibleContentOnly ()
     [AutoInitShutdown]
     public void Clear_Viewport_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
     {
-        var view = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var view = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
 
         view.DrawingContent += (s, e) =>
                                {
@@ -253,7 +253,7 @@ public void Clear_Viewport_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
     [AutoInitShutdown]
     public void Clear_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
     {
-        var view = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var view = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
 
         view.DrawingContent += (s, e) =>
                                {
@@ -314,13 +314,15 @@ public void Clear_Can_Use_Driver_AddRune_Or_AddStr_Methods ()
         top.Dispose ();
     }
 
-    [Theory]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [Theory (Skip = "This test is too fragile; depends on Library Resoruces/Themes which can easily change.")]
+    [AutoInitShutdown]
     [InlineData (true)]
     [InlineData (false)]
     public void Clear_Does_Not_Spillover_Its_Parent (bool label)
     {
-        var root = new View { Width = 20, Height = 10, ColorScheme = Colors.ColorSchemes ["Base"] };
+        ConfigurationManager.Enable (ConfigLocations.LibraryResources);
+
+        var root = new View { Width = 20, Height = 10 };
 
         string text = new ('c', 100);
 
@@ -358,9 +360,9 @@ public void Clear_Does_Not_Spillover_Its_Parent (bool label)
 
         Attribute [] attributes =
         {
-            Colors.ColorSchemes ["TopLevel"]!.Normal,
-            Colors.ColorSchemes ["Base"]!.Normal,
-            Colors.ColorSchemes ["Base"]!.Focus
+            SchemeManager.GetSchemes () ["TopLevel"]!.Normal,
+            SchemeManager.GetSchemes () ["Base"]!.Normal,
+            SchemeManager.GetSchemes () ["Base"]!.Focus
         };
 
         if (label)
@@ -407,5 +409,7 @@ Colors.ColorSchemes ["Base"]!.Focus
 
         Application.End (runState);
         top.Dispose ();
+
+        CM.Disable (resetToHardCodedDefaults: true);
     }
 }
diff --git a/Tests/UnitTests/View/Draw/DrawTests.cs b/Tests/UnitTests/View/Draw/DrawTests.cs
index fc60b7b9a0..f39e54719e 100644
--- a/Tests/UnitTests/View/Draw/DrawTests.cs
+++ b/Tests/UnitTests/View/Draw/DrawTests.cs
@@ -60,7 +60,6 @@ public void Colors_On_TextAlignment_Right_And_Bottom ()
             Width = 6,
             Height = 1,
             TextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Base"]
         };
 
         var viewBottom = new View
@@ -71,7 +70,6 @@ public void Colors_On_TextAlignment_Right_And_Bottom ()
             Width = 1,
             Height = 6,
             VerticalTextAlignment = Alignment.End,
-            ColorScheme = Colors.ColorSchemes ["Base"]
         };
         Toplevel top = new ();
         top.Add (viewRight, viewBottom);
@@ -107,7 +105,7 @@ public void Colors_On_TextAlignment_Right_And_Bottom ()
                                                """,
                                                output,
                                                Application.Driver,
-                                               Colors.ColorSchemes ["Base"]!.Normal
+                                               SchemeManager.GetSchemes () ["Base"]!.Normal
                                               );
         top.Dispose ();
     }
@@ -701,7 +699,7 @@ and also with two lines.  "
         view.Frame = new (3, 3, 10, 1);
         Assert.Equal (new (3, 3, 10, 1), view.Frame);
         Assert.Equal (new (0, 0, 10, 1), view.Viewport);
-        Assert.Equal (new (0, 0, 10, 1), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
         //Application.Refresh();
         top.Draw ();
 
@@ -753,7 +751,7 @@ and also with two lines.  "
         view.Height = 1;
         Assert.Equal (new (3, 3, 10, 1), view.Frame);
         Assert.Equal (new (0, 0, 10, 1), view.Viewport);
-        Assert.Equal (new (0, 0, 10, 1), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
         View.SetClipToScreen ();
         top.Draw ();
 
@@ -802,7 +800,7 @@ and also with two lines.  "
         view.Frame = new (1, 1, 10, 1);
         Assert.Equal (new (1, 1, 10, 1), view.Frame);
         Assert.Equal (new (0, 0, 10, 1), view.Viewport);
-        Assert.Equal (new (0, 0, 10, 1), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
         top.Draw ();
 
         DriverAssert.AssertDriverContentsWithFrameAre (
@@ -852,7 +850,7 @@ and also with two lines.  "
         view.Height = 1;
         Assert.Equal (new (1, 1, 10, 1), view.Frame);
         Assert.Equal (new (0, 0, 10, 1), view.Viewport);
-        Assert.Equal (new (0, 0, 10, 1), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 1), view.NeedsDrawRect);
         View.SetClipToScreen ();
 
         top.Draw ();
diff --git a/Tests/UnitTests/View/Draw/NeedsDrawTests.cs b/Tests/UnitTests/View/Draw/NeedsDrawTests.cs
index 4d2a9af45f..eeec74f708 100644
--- a/Tests/UnitTests/View/Draw/NeedsDrawTests.cs
+++ b/Tests/UnitTests/View/Draw/NeedsDrawTests.cs
@@ -14,7 +14,7 @@ public void Frame_Set_After_Initialize_Update_NeededDisplay ()
 
         var label = new Label
         {
-            ColorScheme = Colors.ColorSchemes ["Menu"], X = 0, Y = 0, Text = "This should be the first line."
+            SchemeName = "Menu", X = 0, Y = 0, Text = "This should be the first line."
         };
 
         var view = new View
@@ -39,13 +39,13 @@ public void Frame_Set_After_Initialize_Update_NeededDisplay ()
 
         RunState runState = Application.Begin (top);
 
-        top.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 80, 25), top._needsDrawRect); };
+        top.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 80, 25), top.NeedsDrawRect); };
 
-        frame.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 40, 8), frame._needsDrawRect); };
+        frame.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 40, 8), frame.NeedsDrawRect); };
 
-        label.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 38, 1), label._needsDrawRect); };
+        label.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 38, 1), label.NeedsDrawRect); };
 
-        view.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 13, 1), view._needsDrawRect); };
+        view.SubViewsLaidOut += (s, e) => { Assert.Equal (new (0, 0, 13, 1), view.NeedsDrawRect); };
 
         Assert.Equal (new (0, 0, 80, 25), top.Frame);
         Assert.Equal (new (20, 8, 40, 8), frame.Frame);
diff --git a/Tests/UnitTests/View/Layout/Dim.FillTests.cs b/Tests/UnitTests/View/Layout/Dim.FillTests.cs
index e09033e8c8..db9d6a9642 100644
--- a/Tests/UnitTests/View/Layout/Dim.FillTests.cs
+++ b/Tests/UnitTests/View/Layout/Dim.FillTests.cs
@@ -1,5 +1,4 @@
-using UnitTests;
-using Xunit.Abstractions;
+using Xunit.Abstractions;
 
 namespace Terminal.Gui.LayoutTests;
 
@@ -8,21 +7,17 @@ public class DimFillTests (ITestOutputHelper output)
     private readonly ITestOutputHelper _output = output;
 
     [Fact]
-    [AutoInitShutdown]
     public void DimFill_SizedCorrectly ()
     {
         var view = new View { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
         var top = new Toplevel ();
         top.Add (view);
-        RunState rs = Application.Begin (top);
-        ((FakeDriver)Application.Driver!).SetBufferSize (32, 5);
 
         top.Layout ();
 
-        //view.SetRelativeLayout (new (0, 0, 32, 5));
+        view.SetRelativeLayout (new (32, 5));
         Assert.Equal (32, view.Frame.Width);
         Assert.Equal (5, view.Frame.Height);
         top.Dispose ();
     }
-
 }
diff --git a/Tests/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs b/Tests/UnitTests/View/Layout/GetViewsUnderLocationTests.cs
similarity index 51%
rename from Tests/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs
rename to Tests/UnitTests/View/Layout/GetViewsUnderLocationTests.cs
index ac37e62aa3..ca06d66b07 100644
--- a/Tests/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs
+++ b/Tests/UnitTests/View/Layout/GetViewsUnderLocationTests.cs
@@ -3,62 +3,62 @@
 namespace Terminal.Gui.ViewMouseTests;
 
 [Trait ("Category", "Input")]
-public class GetViewsUnderMouseTests
+public class GetViewsUnderLocationTests
 {
     [Theory]
-    [InlineData (0, 0, 0, 0, 0, -1, -1, null)]
-    [InlineData (0, 0, 0, 0, 0, 0, 0, typeof (Toplevel))]
-    [InlineData (0, 0, 0, 0, 0, 1, 1, typeof (Toplevel))]
-    [InlineData (0, 0, 0, 0, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (0, 0, 0, 0, 0, 9, 9, typeof (Toplevel))]
-    [InlineData (0, 0, 0, 0, 0, 10, 10, null)]
-    [InlineData (1, 1, 0, 0, 0, -1, -1, null)]
-    [InlineData (1, 1, 0, 0, 0, 0, 0, null)]
-    [InlineData (1, 1, 0, 0, 0, 1, 1, typeof (Toplevel))]
-    [InlineData (1, 1, 0, 0, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (1, 1, 0, 0, 0, 9, 9, typeof (Toplevel))]
-    [InlineData (1, 1, 0, 0, 0, 10, 10, typeof (Toplevel))]
-    [InlineData (0, 0, 1, 0, 0, -1, -1, null)]
-    [InlineData (0, 0, 1, 0, 0, 0, 0, typeof (Margin))]
-    [InlineData (0, 0, 1, 0, 0, 1, 1, typeof (Toplevel))]
-    [InlineData (0, 0, 1, 0, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (0, 0, 1, 0, 0, 9, 9, typeof (Margin))]
-    [InlineData (0, 0, 1, 0, 0, 10, 10, null)]
-    [InlineData (0, 0, 1, 1, 0, -1, -1, null)]
-    [InlineData (0, 0, 1, 1, 0, 0, 0, typeof (Margin))]
-    [InlineData (0, 0, 1, 1, 0, 1, 1, typeof (Border))]
-    [InlineData (0, 0, 1, 1, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (0, 0, 1, 1, 0, 9, 9, typeof (Margin))]
-    [InlineData (0, 0, 1, 1, 0, 10, 10, null)]
-    [InlineData (0, 0, 1, 1, 1, -1, -1, null)]
-    [InlineData (0, 0, 1, 1, 1, 0, 0, typeof (Margin))]
-    [InlineData (0, 0, 1, 1, 1, 1, 1, typeof (Border))]
-    [InlineData (0, 0, 1, 1, 1, 2, 2, typeof (Padding))]
-    [InlineData (0, 0, 1, 1, 1, 4, 4, typeof (Toplevel))]
-    [InlineData (0, 0, 1, 1, 1, 9, 9, typeof (Margin))]
-    [InlineData (0, 0, 1, 1, 1, 10, 10, null)]
-    [InlineData (1, 1, 1, 0, 0, -1, -1, null)]
-    [InlineData (1, 1, 1, 0, 0, 0, 0, null)]
-    [InlineData (1, 1, 1, 0, 0, 1, 1, typeof (Margin))]
-    [InlineData (1, 1, 1, 0, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (1, 1, 1, 0, 0, 9, 9, typeof (Toplevel))]
-    [InlineData (1, 1, 1, 0, 0, 10, 10, typeof (Margin))]
-    [InlineData (1, 1, 1, 1, 0, -1, -1, null)]
-    [InlineData (1, 1, 1, 1, 0, 0, 0, null)]
-    [InlineData (1, 1, 1, 1, 0, 1, 1, typeof (Margin))]
-    [InlineData (1, 1, 1, 1, 0, 4, 4, typeof (Toplevel))]
-    [InlineData (1, 1, 1, 1, 0, 9, 9, typeof (Border))]
-    [InlineData (1, 1, 1, 1, 0, 10, 10, typeof (Margin))]
-    [InlineData (1, 1, 1, 1, 1, -1, -1, null)]
-    [InlineData (1, 1, 1, 1, 1, 0, 0, null)]
-    [InlineData (1, 1, 1, 1, 1, 1, 1, typeof (Margin))]
-    [InlineData (1, 1, 1, 1, 1, 2, 2, typeof (Border))]
-    [InlineData (1, 1, 1, 1, 1, 3, 3, typeof (Padding))]
-    [InlineData (1, 1, 1, 1, 1, 4, 4, typeof (Toplevel))]
-    [InlineData (1, 1, 1, 1, 1, 8, 8, typeof (Padding))]
-    [InlineData (1, 1, 1, 1, 1, 9, 9, typeof (Border))]
-    [InlineData (1, 1, 1, 1, 1, 10, 10, typeof (Margin))]
-    public void GetViewsUnderMouse_Top_Adornments_Returns_Correct_View (
+    [InlineData (0, 0, 0, 0, 0, -1, -1, new string [] { })]
+    [InlineData (0, 0, 0, 0, 0, 0, 0, new [] { "Top" })]
+    [InlineData (0, 0, 0, 0, 0, 1, 1, new [] { "Top" })]
+    [InlineData (0, 0, 0, 0, 0, 4, 4, new [] { "Top" })]
+    [InlineData (0, 0, 0, 0, 0, 9, 9, new [] { "Top" })]
+    [InlineData (0, 0, 0, 0, 0, 10, 10, new string [] { })]
+    [InlineData (1, 1, 0, 0, 0, -1, -1, new string [] { })]
+    [InlineData (1, 1, 0, 0, 0, 0, 0, new string [] { })]
+    [InlineData (1, 1, 0, 0, 0, 1, 1, new [] { "Top" })]
+    [InlineData (1, 1, 0, 0, 0, 4, 4, new [] { "Top" })]
+    [InlineData (1, 1, 0, 0, 0, 9, 9, new [] { "Top" })]
+    [InlineData (1, 1, 0, 0, 0, 10, 10, new [] { "Top" })]
+    [InlineData (0, 0, 1, 0, 0, -1, -1, new string [] { })]
+    [InlineData (0, 0, 1, 0, 0, 0, 0, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 0, 0, 1, 1, new [] { "Top" })]
+    [InlineData (0, 0, 1, 0, 0, 4, 4, new [] { "Top" })]
+    [InlineData (0, 0, 1, 0, 0, 9, 9, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 0, 0, 10, 10, new string [] { })]
+    [InlineData (0, 0, 1, 1, 0, -1, -1, new string [] { })]
+    [InlineData (0, 0, 1, 1, 0, 0, 0, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 1, 0, 1, 1, new [] { "Top", "Border" })]
+    [InlineData (0, 0, 1, 1, 0, 4, 4, new [] { "Top" })]
+    [InlineData (0, 0, 1, 1, 0, 9, 9, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 1, 0, 10, 10, new string [] { })]
+    [InlineData (0, 0, 1, 1, 1, -1, -1, new string [] { })]
+    [InlineData (0, 0, 1, 1, 1, 0, 0, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 1, 1, 1, 1, new [] { "Top", "Border" })]
+    [InlineData (0, 0, 1, 1, 1, 2, 2, new [] { "Top", "Padding" })]
+    [InlineData (0, 0, 1, 1, 1, 4, 4, new [] { "Top" })]
+    [InlineData (0, 0, 1, 1, 1, 9, 9, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (0, 0, 1, 1, 1, 10, 10, new string [] { })]
+    [InlineData (1, 1, 1, 0, 0, -1, -1, new string [] { })]
+    [InlineData (1, 1, 1, 0, 0, 0, 0, new string [] { })]
+    [InlineData (1, 1, 1, 0, 0, 1, 1, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (1, 1, 1, 0, 0, 4, 4, new [] { "Top" })]
+    [InlineData (1, 1, 1, 0, 0, 9, 9, new [] { "Top" })]
+    [InlineData (1, 1, 1, 0, 0, 10, 10, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (1, 1, 1, 1, 0, -1, -1, new string [] { })]
+    [InlineData (1, 1, 1, 1, 0, 0, 0, new string [] { })]
+    [InlineData (1, 1, 1, 1, 0, 1, 1, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (1, 1, 1, 1, 0, 4, 4, new [] { "Top" })]
+    [InlineData (1, 1, 1, 1, 0, 9, 9, new [] { "Top", "Border" })]
+    [InlineData (1, 1, 1, 1, 0, 10, 10, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (1, 1, 1, 1, 1, -1, -1, new string [] { })]
+    [InlineData (1, 1, 1, 1, 1, 0, 0, new string [] { })]
+    [InlineData (1, 1, 1, 1, 1, 1, 1, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    [InlineData (1, 1, 1, 1, 1, 2, 2, new [] { "Top", "Border" })]
+    [InlineData (1, 1, 1, 1, 1, 3, 3, new [] { "Top", "Padding" })]
+    [InlineData (1, 1, 1, 1, 1, 4, 4, new [] { "Top" })]
+    [InlineData (1, 1, 1, 1, 1, 8, 8, new [] { "Top", "Padding" })]
+    [InlineData (1, 1, 1, 1, 1, 9, 9, new [] { "Top", "Border" })]
+    [InlineData (1, 1, 1, 1, 1, 10, 10, new string [] { })] //margin is ViewportSettings.TransparentToMouse
+    public void Top_Adornments_Returns_Correct_View (
         int frameX,
         int frameY,
         int marginThickness,
@@ -66,31 +66,36 @@ public void GetViewsUnderMouse_Top_Adornments_Returns_Correct_View (
         int paddingThickness,
         int testX,
         int testY,
-        Type? expectedViewType
+        string [] expectedViewsFound
     )
     {
         // Arrange
         Application.Top = new ()
         {
+            Id = "Top",
             Frame = new (frameX, frameY, 10, 10)
         };
         Application.Top.Margin!.Thickness = new (marginThickness);
+        Application.Top.Margin.Id = "Margin";
         Application.Top.Border!.Thickness = new (borderThickness);
+        Application.Top.Border.Id = "Border";
         Application.Top.Padding!.Thickness = new (paddingThickness);
+        Application.Top.Padding.Id = "Padding";
 
         var location = new Point (testX, testY);
 
         // Act
-        List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.TransparentMouse);
 
         // Assert
-        if (expectedViewType == null)
+        if (expectedViewsFound.Length == 0)
         {
             Assert.Empty (viewsUnderMouse);
         }
         else
         {
-            Assert.Contains (viewsUnderMouse, v => v?.GetType () == expectedViewType);
+            string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
+            Assert.Equal (expectedViewsFound, foundIds);
         }
 
         Application.Top.Dispose ();
@@ -101,7 +106,7 @@ public void GetViewsUnderMouse_Top_Adornments_Returns_Correct_View (
     [InlineData (0, 0)]
     [InlineData (1, 1)]
     [InlineData (2, 2)]
-    public void GetViewsUnderMouse_Returns_Top_If_No_SubViews (int testX, int testY)
+    public void Returns_Top_If_No_SubViews (int testX, int testY)
     {
         // Arrange
         Application.Top = new ()
@@ -112,7 +117,7 @@ public void GetViewsUnderMouse_Returns_Top_If_No_SubViews (int testX, int testY)
         var location = new Point (testX, testY);
 
         // Act
-        List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.TransparentMouse);
 
         // Assert
         Assert.Contains (viewsUnderMouse, v => v == Application.Top);
@@ -120,102 +125,26 @@ public void GetViewsUnderMouse_Returns_Top_If_No_SubViews (int testX, int testY)
         Application.ResetState (true);
     }
 
-    [Theory]
-    [InlineData (0, 0, false)]
-    [InlineData (1, 1, true)]
-    [InlineData (9, 9, false)]
-    [InlineData (10, 10, false)]
-    [InlineData (6, 7, true)]
-    [InlineData (1, 2, true)]
-    [InlineData (5, 6, true)]
-    public void GetViewsUnderMouse_Returns_Correct_If_SubViews (int testX, int testY, bool expected)
-    {
-        // Arrange
-        Application.Top = new ()
-        {
-            Frame = new (0, 0, 10, 10)
-        };
-
-        var subView = new View
-        {
-            Frame = new (1, 1, 8, 8)
-        };
-
-        Application.Top.Add (subView);
-
-        var location = new Point (testX, testY);
-
-        // Act
-        List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
-
-        // Assert
-        if (expected)
-        {
-            Assert.Contains (viewsUnderMouse, v => v == subView);
-        }
-        else
-        {
-            Assert.DoesNotContain (viewsUnderMouse, v => v == subView);
-        }
-
-        Application.Top.Dispose ();
-        Application.ResetState (true);
-    }
-
-    // Test that GetViewsUnderMouse returns the correct view if the start view has no subviews
+    // Test that GetViewsUnderLocation returns the correct view if the start view has no subviews
     [Theory]
     [InlineData (0, 0)]
     [InlineData (1, 1)]
     [InlineData (2, 2)]
     public void Returns_Start_If_No_SubViews (int testX, int testY)
     {
-        Application.Top = new ()
-        {
-            Width = 10, Height = 10
-        };
-
-        Assert.Same (Application.Top, View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ());
-        Application.Top.Dispose ();
         Application.ResetState (true);
-    }
 
-    // Test that GetViewsUnderMouse returns null if the start view has no subviews and coords are outside the view
-    [Theory]
-    [InlineData (0, 0)]
-    [InlineData (2, 1)]
-    [InlineData (20, 20)]
-    public void Returns_Null_If_No_SubViews_Coords_Outside (int testX, int testY)
-    {
         Application.Top = new ()
         {
-            X = 1, Y = 2,
             Width = 10, Height = 10
         };
 
-        Assert.Null (View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ());
-        Application.Top.Dispose ();
-        Application.ResetState (true);
-    }
-
-    [Theory]
-    [InlineData (0, 0)]
-    [InlineData (2, 1)]
-    [InlineData (20, 20)]
-    public void Returns_Null_If_Start_Not_Visible (int testX, int testY)
-    {
-        Application.Top = new ()
-        {
-            X = 1, Y = 2,
-            Width = 10, Height = 10,
-            Visible = false
-        };
-
-        Assert.Null (View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ());
+        Assert.Same (Application.Top, View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ());
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
 
-    // Test that GetViewsUnderMouse returns the correct view if the start view has subviews
+    // Test that GetViewsUnderLocation returns the correct view if the start view has subviews
     [Theory]
     [InlineData (0, 0, false)]
     [InlineData (1, 1, false)]
@@ -238,7 +167,7 @@ public void Returns_Correct_If_SubViews (int testX, int testY, bool expectedSubV
         };
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
@@ -268,7 +197,7 @@ public void Returns_Null_If_SubView_NotVisible (int testX, int testY, bool expec
         };
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
@@ -300,14 +229,14 @@ public void Returns_Null_If_Not_Visible_And_SubView_Visible (int testX, int test
         subview.Visible = true;
         Assert.True (subview.Visible);
         Assert.False (Application.Top.Visible);
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
 
-    // Test that GetViewsUnderMouse works if the start view has positive Adornments
+    // Test that GetViewsUnderLocation works if the start view has positive Adornments
     [Theory]
     [InlineData (0, 0, false)]
     [InlineData (1, 1, false)]
@@ -333,14 +262,14 @@ public void Returns_Correct_If_Start_Has_Adornments (int testX, int testY, bool
         };
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
 
-    // Test that GetViewsUnderMouse works if the start view has offset Viewport location
+    // Test that GetViewsUnderLocation works if the start view has offset Viewport location
     [Theory]
     [InlineData (1, 0, 0, true)]
     [InlineData (1, 1, 1, true)]
@@ -365,7 +294,7 @@ public void Returns_Correct_If_Start_Has_Offset_Viewport (int offset, int testX,
         };
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
@@ -399,7 +328,7 @@ public void Returns_Correct_If_Start_Has_Adornment_WithSubView (int testX, int t
         Application.Top.BeginInit ();
         Application.Top.EndInit ();
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
         Application.Top.Dispose ();
@@ -407,65 +336,116 @@ public void Returns_Correct_If_Start_Has_Adornment_WithSubView (int testX, int t
     }
 
     [Theory]
-    [InlineData (0, 0, typeof (Margin))]
-    [InlineData (9, 9, typeof (Margin))]
-    [InlineData (1, 1, typeof (Border))]
-    [InlineData (8, 8, typeof (Border))]
-    [InlineData (2, 2, typeof (Padding))]
-    [InlineData (7, 7, typeof (Padding))]
-    [InlineData (5, 5, typeof (Toplevel))]
-    public void Returns_Adornment_If_Start_Has_Adornments (int testX, int testY, Type expectedAdornmentType)
+    [InlineData (0, 0, new string [] { })]
+    [InlineData (9, 9, new string [] { })]
+    [InlineData (1, 1, new [] { "Top", "Border" })]
+    [InlineData (8, 8, new [] { "Top", "Border" })]
+    [InlineData (2, 2, new [] { "Top", "Padding" })]
+    [InlineData (7, 7, new [] { "Top", "Padding" })]
+    [InlineData (5, 5, new [] { "Top" })]
+    public void Returns_Adornment_If_Start_Has_Adornments (int testX, int testY, string [] expectedViewsFound)
     {
+        Application.ResetState (true);
+
         Application.Top = new ()
         {
+            Id = "Top",
             Width = 10, Height = 10
         };
         Application.Top.Margin!.Thickness = new (1);
+        Application.Top.Margin.Id = "Margin";
         Application.Top.Border!.Thickness = new (1);
+        Application.Top.Border.Id = "Border";
         Application.Top.Padding!.Thickness = new (1);
+        Application.Top.Padding.Id = "Padding";
 
         var subview = new View
         {
+            Id = "SubView",
             X = 1, Y = 1,
             Width = 1, Height = 1
         };
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
-        Assert.Equal (expectedAdornmentType, found!.GetType ());
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse);
+        string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
+
+        Assert.Equal (expectedViewsFound, foundIds);
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
 
-    // Test that GetViewsUnderMouse works if the subview has positive Adornments
+    // Test that GetViewsUnderLocation works if the subview has positive Adornments
     [Theory]
-    [InlineData (0, 0, false)]
-    [InlineData (1, 1, false)]
-    [InlineData (9, 9, false)]
-    [InlineData (10, 10, false)]
-    [InlineData (7, 8, false)]
-    [InlineData (6, 7, false)]
-    [InlineData (1, 2, false)]
-    [InlineData (5, 6, false)]
-    [InlineData (2, 3, true)]
-    public void Returns_Correct_If_SubView_Has_Adornments (int testX, int testY, bool expectedSubViewFound)
+    [InlineData (0, 0, new [] { "Top" })]
+    [InlineData (1, 1, new [] { "Top" })]
+    [InlineData (9, 9, new [] { "Top" })]
+    [InlineData (10, 10, new string [] { })]
+    [InlineData (7, 8, new [] { "Top" })]
+    [InlineData (6, 7, new [] { "Top" })]
+    [InlineData (1, 2, new [] { "Top", "subview", "border" })]
+    [InlineData (5, 6, new [] { "Top", "subview", "border" })]
+    [InlineData (2, 3, new [] { "Top", "subview" })]
+    public void Returns_Correct_If_SubView_Has_Adornments (int testX, int testY, string [] expectedViewsFound)
     {
         Application.Top = new ()
         {
+            Id = "Top",
             Width = 10, Height = 10
         };
 
         var subview = new View
         {
+            Id = "subview",
             X = 1, Y = 2,
             Width = 5, Height = 5
         };
-        subview.Margin!.Thickness = new (1);
+        subview.Border!.Thickness = new (1);
+        subview.Border.Id = "border";
         Application.Top.Add (subview);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse);
+        string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
 
-        Assert.Equal (expectedSubViewFound, found == subview);
+        Assert.Equal (expectedViewsFound, foundIds);
+        Application.Top.Dispose ();
+        Application.ResetState (true);
+    }
+
+    // Test that GetViewsUnderLocation works if the subview has positive Adornments
+    [Theory]
+    [InlineData (0, 0, new [] { "Top" })]
+    [InlineData (1, 1, new [] { "Top" })]
+    [InlineData (9, 9, new [] { "Top" })]
+    [InlineData (10, 10, new string [] { })]
+    [InlineData (7, 8, new [] { "Top" })]
+    [InlineData (6, 7, new [] { "Top" })]
+    [InlineData (1, 2, new [] { "Top" })]
+    [InlineData (5, 6, new [] { "Top" })]
+    [InlineData (2, 3, new [] { "Top", "subview" })]
+    public void Returns_Correct_If_SubView_Has_Adornments_With_TransparentMouse (int testX, int testY, string [] expectedViewsFound)
+    {
+        Application.Top = new ()
+        {
+            Id = "Top",
+            Width = 10, Height = 10
+        };
+
+        var subview = new View
+        {
+            Id = "subview",
+            X = 1, Y = 2,
+            Width = 5, Height = 5
+        };
+        subview.Border!.Thickness = new (1);
+        subview.Border.ViewportSettings = ViewportSettings.TransparentMouse;
+        subview.Border.Id = "border";
+        Application.Top.Add (subview);
+
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse);
+        string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
+
+        Assert.Equal (expectedViewsFound, foundIds);
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
@@ -510,7 +490,7 @@ public void Returns_Correct_If_SubView_Has_Adornment_WithSubView (int testX, int
         Application.Top.BeginInit ();
         Application.Top.EndInit ();
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == paddingSubView);
         Application.Top.Dispose ();
@@ -561,14 +541,14 @@ public void Returns_Correct_If_SubView_Is_Scrolled_And_Has_Adornment_WithSubView
         Application.Top.BeginInit ();
         Application.Top.EndInit ();
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == paddingSubView);
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
 
-    // Test that GetViewsUnderMouse works with nested subviews
+    // Test that GetViewsUnderLocation works with nested subviews
     [Theory]
     [InlineData (0, 0, -1)]
     [InlineData (9, 9, -1)]
@@ -605,7 +585,7 @@ public void Returns_Correct_With_NestedSubViews (int testX, int testY, int expec
 
         Application.Top.Add (subviews [0]);
 
-        View? found = View.GetViewsUnderMouse (new (testX, testY)).LastOrDefault ();
+        View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettings.TransparentMouse).LastOrDefault ();
         Assert.Equal (expectedSubViewFound, subviews.IndexOf (found!));
         Application.Top.Dispose ();
         Application.ResetState (true);
@@ -621,7 +601,7 @@ public void Returns_Correct_With_NestedSubViews (int testX, int testY, int expec
     [InlineData (2, 2, new [] { "top", "view", "subView" })]
     [InlineData (3, 3, new [] { "top" })] // clipped
     [InlineData (2, 3, new [] { "top" })] // clipped
-    public void GetViewsUnderMouse_Tiled_SubViews (int mouseX, int mouseY, string [] viewIdStrings)
+    public void Tiled_SubViews (int mouseX, int mouseY, string [] viewIdStrings)
     {
         // Arrange
         Application.Top = new ()
@@ -652,7 +632,7 @@ public void GetViewsUnderMouse_Tiled_SubViews (int mouseX, int mouseY, string []
         view.Add (subView);
         Application.Top.Add (view);
 
-        List<View?> found = View.GetViewsUnderMouse (new (mouseX, mouseY));
+        List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettings.TransparentMouse);
 
         string [] foundIds = found.Select (v => v!.Id).ToArray ();
 
@@ -673,7 +653,7 @@ public void GetViewsUnderMouse_Tiled_SubViews (int mouseX, int mouseY, string []
     [InlineData (2, 2, new [] { "top", "view", "popover" })]
     [InlineData (3, 3, new [] { "top" })] // clipped
     [InlineData (2, 3, new [] { "top" })] // clipped
-    public void GetViewsUnderMouse_Popover (int mouseX, int mouseY, string [] viewIdStrings)
+    public void Popover (int mouseX, int mouseY, string [] viewIdStrings)
     {
         // Arrange
         Application.Top = new ()
@@ -705,7 +685,7 @@ public void GetViewsUnderMouse_Popover (int mouseX, int mouseY, string [] viewId
         view.Add (popOver);
         Application.Top.Add (view);
 
-        List<View?> found = View.GetViewsUnderMouse (new (mouseX, mouseY));
+        List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettings.TransparentMouse);
 
         string [] foundIds = found.Select (v => v!.Id).ToArray ();
 
@@ -714,4 +694,147 @@ public void GetViewsUnderMouse_Popover (int mouseX, int mouseY, string [] viewId
         Application.Top.Dispose ();
         Application.ResetState (true);
     }
+
+    [Fact]
+    public void Returns_TopToplevel_When_Point_Inside_Only_TopToplevel ()
+    {
+        Application.ResetState (true);
+
+        Toplevel topToplevel = new ()
+        {
+            Id = "topToplevel",
+            Frame = new (0, 0, 20, 20)
+        };
+
+        Toplevel secondaryToplevel = new ()
+        {
+            Id = "secondaryToplevel",
+            Frame = new (5, 5, 10, 10)
+        };
+        secondaryToplevel.Margin!.Thickness = new (1);
+        secondaryToplevel.Layout ();
+
+        Application.TopLevels.Clear ();
+        Application.TopLevels.Push (topToplevel);
+        Application.TopLevels.Push (secondaryToplevel);
+        Application.Top = secondaryToplevel;
+
+        List<View?> found = View.GetViewsUnderLocation (new (2, 2), ViewportSettings.TransparentMouse);
+        Assert.Contains (found, v => v?.Id == topToplevel.Id);
+        Assert.Contains (found, v => v == topToplevel);
+
+        topToplevel.Dispose ();
+        secondaryToplevel.Dispose ();
+        Application.TopLevels.Clear ();
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void Returns_SecondaryToplevel_When_Point_Inside_Only_SecondaryToplevel ()
+    {
+        Application.ResetState (true);
+
+        Toplevel topToplevel = new ()
+        {
+            Id = "topToplevel",
+            Frame = new (0, 0, 20, 20)
+        };
+
+        Toplevel secondaryToplevel = new ()
+        {
+            Id = "secondaryToplevel",
+            Frame = new (5, 5, 10, 10)
+        };
+        secondaryToplevel.Margin!.Thickness = new (1);
+        secondaryToplevel.Layout ();
+
+        Application.TopLevels.Clear ();
+        Application.TopLevels.Push (topToplevel);
+        Application.TopLevels.Push (secondaryToplevel);
+        Application.Top = secondaryToplevel;
+
+        List<View?> found = View.GetViewsUnderLocation (new (7, 7), ViewportSettings.TransparentMouse);
+        Assert.Contains (found, v => v?.Id == secondaryToplevel.Id);
+        Assert.DoesNotContain (found, v => v?.Id == topToplevel.Id);
+
+        topToplevel.Dispose ();
+        secondaryToplevel.Dispose ();
+        Application.TopLevels.Clear ();
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void Returns_Depends_On_Margin_ViewportSettings_When_Point_In_Margin_Of_SecondaryToplevel ()
+    {
+        Application.ResetState (true);
+
+        Toplevel topToplevel = new ()
+        {
+            Id = "topToplevel",
+            Frame = new (0, 0, 20, 20)
+        };
+
+        Toplevel secondaryToplevel = new ()
+        {
+            Id = "secondaryToplevel",
+            Frame = new (5, 5, 10, 10)
+        };
+        secondaryToplevel.Margin!.Thickness = new (1);
+
+        Application.TopLevels.Clear ();
+        Application.TopLevels.Push (topToplevel);
+        Application.TopLevels.Push (secondaryToplevel);
+        Application.Top = secondaryToplevel;
+
+        secondaryToplevel.Margin.ViewportSettings = ViewportSettings.None;
+
+        List<View?> found = View.GetViewsUnderLocation (new (5, 5), ViewportSettings.TransparentMouse);
+        Assert.Contains (found, v => v == secondaryToplevel);
+        Assert.Contains (found, v => v == secondaryToplevel.Margin);
+        Assert.DoesNotContain (found, v => v?.Id == topToplevel.Id);
+
+        secondaryToplevel.Margin.ViewportSettings = ViewportSettings.TransparentMouse;
+        found = View.GetViewsUnderLocation (new (5, 5), ViewportSettings.TransparentMouse);
+        Assert.DoesNotContain (found, v => v == secondaryToplevel);
+        Assert.DoesNotContain (found, v => v == secondaryToplevel.Margin);
+        Assert.Contains (found, v => v?.Id == topToplevel.Id);
+
+        topToplevel.Dispose ();
+        secondaryToplevel.Dispose ();
+        Application.TopLevels.Clear ();
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void Returns_Empty_When_Point_Outside_All_Toplevels ()
+    {
+        Application.ResetState (true);
+
+        Toplevel topToplevel = new ()
+        {
+            Id = "topToplevel",
+            Frame = new (0, 0, 20, 20)
+        };
+
+        Toplevel secondaryToplevel = new ()
+        {
+            Id = "secondaryToplevel",
+            Frame = new (5, 5, 10, 10)
+        };
+        secondaryToplevel.Margin!.Thickness = new (1);
+        secondaryToplevel.Layout ();
+
+        Application.TopLevels.Clear ();
+        Application.TopLevels.Push (topToplevel);
+        Application.TopLevels.Push (secondaryToplevel);
+        Application.Top = secondaryToplevel;
+
+        List<View?> found = View.GetViewsUnderLocation (new (20, 20), ViewportSettings.TransparentMouse);
+        Assert.Empty (found);
+
+        topToplevel.Dispose ();
+        secondaryToplevel.Dispose ();
+        Application.TopLevels.Clear ();
+        Application.ResetState (true);
+    }
 }
diff --git a/Tests/UnitTests/View/Layout/Pos.CombineTests.cs b/Tests/UnitTests/View/Layout/Pos.CombineTests.cs
index 58a6c4761a..c38dd2868b 100644
--- a/Tests/UnitTests/View/Layout/Pos.CombineTests.cs
+++ b/Tests/UnitTests/View/Layout/Pos.CombineTests.cs
@@ -72,7 +72,7 @@ public void PosCombine_DimCombine_View_With_SubViews ()
         Assert.Equal (new Rectangle (0, 2, 10, 3), win2.Frame);
         Assert.Equal (new Rectangle (0, 0, 8, 1), view2.Frame);
         Assert.Equal (new Rectangle (0, 0, 7, 1), view3.Frame);
-        var foundView = View.GetViewsUnderMouse (new Point(9, 4)).LastOrDefault ();
+        var foundView = View.GetViewsUnderLocation (new Point(9, 4), ViewportSettings.None).LastOrDefault ();
         Assert.Equal (foundView, view2);
         Application.Top.Dispose ();
         Application.ResetState (ignoreDisposed: true);
diff --git a/Tests/UnitTests/View/Layout/SetLayoutTests.cs b/Tests/UnitTests/View/Layout/SetLayoutTests.cs
index 27605d5417..9f5b2ae0c6 100644
--- a/Tests/UnitTests/View/Layout/SetLayoutTests.cs
+++ b/Tests/UnitTests/View/Layout/SetLayoutTests.cs
@@ -1,5 +1,6 @@
 using UnitTests;
 using Xunit.Abstractions;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Terminal.Gui.LayoutTests;
 
@@ -26,12 +27,12 @@ public void Screen_Size_Change_Causes_Layout ()
 
         var rs = Application.Begin (Application.Top);
 
-        Assert.Equal (new (0, 0, 80, 25), new Rectangle (0, 0, View.Driver.Cols, View.Driver.Rows));
-        Assert.Equal (new (0, 0, View.Driver.Cols, View.Driver.Rows), Application.Top.Frame);
+        Assert.Equal (new (0, 0, 80, 25), new Rectangle (0, 0, Application.Screen.Width, Application.Screen.Height));
+        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Top.Frame);
         Assert.Equal (new (0, 0, 80, 25), Application.Top.Frame);
 
         ((FakeDriver)Application.Driver!).SetBufferSize (20, 10);
-        Assert.Equal (new (0, 0, View.Driver.Cols, View.Driver.Rows), Application.Top.Frame);
+        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Top.Frame);
 
         Assert.Equal (new (0, 0, 20, 10), Application.Top.Frame);
 
diff --git a/Tests/UnitTests/View/Mouse/MouseTests.cs b/Tests/UnitTests/View/Mouse/MouseTests.cs
index 25bb145996..999ffda5af 100644
--- a/Tests/UnitTests/View/Mouse/MouseTests.cs
+++ b/Tests/UnitTests/View/Mouse/MouseTests.cs
@@ -166,6 +166,7 @@ public void WantContinuousButtonPressed_True_Button_Clicked_Raises_Selecting (Mo
     [InlineData (MouseFlags.Button4Pressed, MouseFlags.Button4Released)]
     public void WantContinuousButtonPressed_True_And_WantMousePositionReports_True_Button_Press_Release_Clicks (MouseFlags pressed, MouseFlags released)
     {
+        Application.Init (new FakeDriver ());
         var me = new MouseEventArgs ();
 
         var view = new View
@@ -211,6 +212,7 @@ public void WantContinuousButtonPressed_True_And_WantMousePositionReports_True_B
         MouseFlags clicked
     )
     {
+        Application.Init (new FakeDriver ());
         var me = new MouseEventArgs ();
 
         var view = new View
@@ -253,6 +255,7 @@ MouseFlags clicked
     [Fact]
     public void WantContinuousButtonPressed_True_And_WantMousePositionReports_True_Move_InViewport_OutOfViewport_Keeps_Counting ()
     {
+        Application.Init (new FakeDriver ());
         var me = new MouseEventArgs ();
 
         var view = new View
@@ -294,7 +297,7 @@ public void WantContinuousButtonPressed_True_And_WantMousePositionReports_True_M
         Application.ResetState (true);
     }
 
-    [Theory]
+    [Theory (Skip = "This test needs to be redone.")]
     [InlineData (HighlightStyle.None, 0, 0)]
     [InlineData (HighlightStyle.Pressed | HighlightStyle.PressedOutside, 1, 1)]
     public void HighlightOnPress_Fires_Events_And_Highlights (HighlightStyle highlightOnPress, int expectedEnabling, int expectedDisabling)
@@ -310,22 +313,22 @@ public void HighlightOnPress_Fires_Events_And_Highlights (HighlightStyle highlig
         var enablingHighlight = 0;
         var disablingHighlight = 0;
         view.Highlight += ViewHighlight;
-        view.ColorScheme = new (new Attribute (ColorName16.Red, ColorName16.Blue));
-        ColorScheme originalColorScheme = view.ColorScheme;
+        view.SetScheme (new (new Attribute (ColorName16.Red, ColorName16.Blue)));
+        Scheme originalScheme = view.GetScheme ();
 
         view.NewMouseEvent (new () { Flags = MouseFlags.Button1Pressed });
 
         if (highlightOnPress != HighlightStyle.None)
         {
-            Assert.NotEqual (originalColorScheme, view.ColorScheme);
+            Assert.NotEqual (originalScheme, view.GetScheme ());
         }
         else
         {
-            Assert.Equal (originalColorScheme, view.ColorScheme);
+            Assert.Equal (originalScheme, view.GetScheme ());
         }
 
         view.NewMouseEvent (new () { Flags = MouseFlags.Button1Released });
-        Assert.Equal (originalColorScheme, view.ColorScheme);
+        Assert.Equal (originalScheme, view.GetScheme ());
         Assert.Equal (expectedEnabling, enablingHighlight);
         Assert.Equal (expectedDisabling, disablingHighlight);
 
diff --git a/Tests/UnitTests/View/TextTests.cs b/Tests/UnitTests/View/TextTests.cs
index f680e2b740..4a75be09a0 100644
--- a/Tests/UnitTests/View/TextTests.cs
+++ b/Tests/UnitTests/View/TextTests.cs
@@ -688,8 +688,8 @@ public void Excess_Text_Is_Erased_When_The_Width_Is_Reduced ()
         lbl.Layout ();
 
         Assert.Equal (new (0, 0, 2, 1), lbl.Frame);
-        Assert.Equal (new (0, 0, 2, 1), lbl._needsDrawRect);
-        Assert.Equal (new (0, 0, 80, 25), lbl.SuperView._needsDrawRect);
+        Assert.Equal (new (0, 0, 2, 1), lbl.NeedsDrawRect);
+        Assert.Equal (new (0, 0, 80, 25), lbl.SuperView.NeedsDrawRect);
         Assert.True (lbl.SuperView.NeedsLayout);
         Application.RunIteration (ref rs);
 
@@ -778,7 +778,7 @@ public void View_Draw_Horizontal_Simple_TextAlignments (bool autoSize)
             lblJust.Height = Dim.Auto ();
         }
 
-        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
         frame.Add (lblLeft, lblCenter, lblRight, lblJust);
         var top = new Toplevel ();
         top.Add (frame);
@@ -907,7 +907,7 @@ public void View_Draw_Vertical_Simple_TextAlignments (bool autoSize)
             lblJust.Height = Dim.Auto ();
         }
 
-        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
 
         frame.Add (lblLeft, lblCenter, lblRight, lblJust);
         var top = new Toplevel ();
@@ -1019,7 +1019,7 @@ public void Narrow_Wide_Runes ()
         // Autosize is off, so we have to explicitly set TextFormatter.Size
         verticalView.TextFormatter.ConstrainToSize = new (1, 20);
 
-        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), Text = "Window" };
+        var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), Text = "Window", BorderStyle = LineStyle.Single };
         frame.Add (horizontalView, verticalView);
         top.Add (frame);
         top.BeginInit ();
diff --git a/Tests/UnitTests/View/ViewCommandTests.cs b/Tests/UnitTests/View/ViewCommandTests.cs
index f97a76e9e3..ef512da5dd 100644
--- a/Tests/UnitTests/View/ViewCommandTests.cs
+++ b/Tests/UnitTests/View/ViewCommandTests.cs
@@ -2,36 +2,36 @@ namespace Terminal.Gui.ViewTests;
 
 public class ViewCommandTests
 {
-  
     // See https://github.com/gui-cs/Terminal.Gui/issues/3913
     [Fact]
     public void Button_IsDefault_Raises_Accepted_Correctly ()
     {
-        int aAcceptedCount = 0;
-        bool aCancelAccepting = false;
+        var aAcceptedCount = 0;
+        var aCancelAccepting = false;
 
-        int bAcceptedCount = 0;
-        bool bCancelAccepting = false;
+        var bAcceptedCount = 0;
+        var bCancelAccepting = false;
 
-        var w = new Window ()
+        var w = new Window
         {
             BorderStyle = LineStyle.None,
             Width = 10,
             Height = 10
         };
 
-        var btnA = new Button ()
+        var btnA = new Button
         {
             Width = 3,
             IsDefault = true
         };
+
         btnA.Accepting += (s, e) =>
                           {
                               aAcceptedCount++;
                               e.Handled = aCancelAccepting;
                           };
 
-        var btnB = new Button ()
+        var btnB = new Button
         {
             Width = 3,
             X = Pos.Right (btnA)
@@ -47,26 +47,27 @@ public void Button_IsDefault_Raises_Accepted_Correctly ()
         w.LayoutSubViews ();
 
         Application.Top = w;
-        Application.TopLevels.Push(w);
+        Application.TopLevels.Push (w);
         Assert.Same (Application.Top, w);
 
         // Click button 2
-        var btn2Frame = btnB.FrameToScreen ();
+        Rectangle btn2Frame = btnB.FrameToScreen ();
 
         Application.RaiseMouseEvent (
-                         new MouseEventArgs ()
-                         {
-                             ScreenPosition = btn2Frame.Location,
-                             Flags = MouseFlags.Button1Clicked
-                         });
+                                     new()
+                                     {
+                                         ScreenPosition = btn2Frame.Location,
+                                         Flags = MouseFlags.Button1Clicked
+                                     });
 
         // Button A should have been accepted because B didn't cancel and A IsDefault
         Assert.Equal (1, aAcceptedCount);
         Assert.Equal (1, bAcceptedCount);
 
         bCancelAccepting = true;
+
         Application.RaiseMouseEvent (
-                                     new MouseEventArgs ()
+                                     new()
                                      {
                                          ScreenPosition = btn2Frame.Location,
                                          Flags = MouseFlags.Button1Clicked
@@ -83,9 +84,11 @@ public void Button_IsDefault_Raises_Accepted_Correctly ()
     [Fact]
     public void Button_CanFocus_False_Raises_Accepted_Correctly ()
     {
-        int wAcceptedCount = 0;
-        bool wCancelAccepting = false;
-        var w = new Window ()
+        Application.Init (new FakeDriver ());
+        var wAcceptedCount = 0;
+        var wCancelAccepting = false;
+
+        var w = new Window
         {
             Title = "Window",
             BorderStyle = LineStyle.None,
@@ -99,13 +102,14 @@ public void Button_CanFocus_False_Raises_Accepted_Correctly ()
                            e.Handled = wCancelAccepting;
                        };
 
-        int btnAcceptedCount = 0;
-        bool btnCancelAccepting = true;
-        var btn = new Button ()
+        var btnAcceptedCount = 0;
+        var btnCancelAccepting = true;
+
+        var btn = new Button
         {
             Title = "Button",
             Width = 3,
-            IsDefault = true,
+            IsDefault = true
         };
         btn.CanFocus = true;
 
@@ -117,7 +121,6 @@ public void Button_CanFocus_False_Raises_Accepted_Correctly ()
 
         w.Add (btn);
 
-
         Application.Top = w;
         Application.TopLevels.Push (w);
         Assert.Same (Application.Top, w);
@@ -125,23 +128,24 @@ public void Button_CanFocus_False_Raises_Accepted_Correctly ()
         w.LayoutSubViews ();
 
         // Click button just like a driver would
-        var btnFrame = btn.FrameToScreen ();
+        Rectangle btnFrame = btn.FrameToScreen ();
+
         Application.RaiseMouseEvent (
-                                     new MouseEventArgs ()
+                                     new()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Pressed
                                      });
 
         Application.RaiseMouseEvent (
-                                     new MouseEventArgs ()
+                                     new()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Released
                                      });
 
         Application.RaiseMouseEvent (
-                                     new MouseEventArgs ()
+                                     new()
                                      {
                                          ScreenPosition = btnFrame.Location,
                                          Flags = MouseFlags.Button1Clicked
diff --git a/Tests/UnitTests/View/ViewTests.cs b/Tests/UnitTests/View/ViewTests.cs
index c9895a8b1d..67c52e133c 100644
--- a/Tests/UnitTests/View/ViewTests.cs
+++ b/Tests/UnitTests/View/ViewTests.cs
@@ -209,7 +209,9 @@ public void New_Initializes ()
         Assert.Equal (new (0, 0, 0, 0), r.Viewport);
         Assert.Equal (new (0, 0, 0, 0), r.Frame);
         Assert.Null (r.Focused);
-        Assert.Null (r.ColorScheme);
+        Assert.False (r.HasScheme);
+        Assert.NotNull (r.GetScheme ());
+        Assert.Equal (r.GetScheme (), SchemeManager.GetSchemesForCurrentTheme () ["Base"]);
         Assert.Equal (0, r.Width);
         Assert.Equal (0, r.Height);
         Assert.Equal (0, r.X);
@@ -233,7 +235,9 @@ public void New_Initializes ()
         Assert.Equal (new (0, 0, 0, 0), r.Viewport);
         Assert.Equal (new (0, 0, 0, 0), r.Frame);
         Assert.Null (r.Focused);
-        Assert.Null (r.ColorScheme);
+        Assert.False (r.HasScheme);
+        Assert.NotNull (r.GetScheme ());
+        Assert.Equal (r.GetScheme (), SchemeManager.GetSchemesForCurrentTheme () ["Base"]);
         Assert.Equal (0, r.Width);
         Assert.Equal (0, r.Height);
         Assert.Equal (0, r.X);
@@ -257,7 +261,9 @@ public void New_Initializes ()
         Assert.Equal (new (0, 0, 3, 4), r.Viewport);
         Assert.Equal (new (1, 2, 3, 4), r.Frame);
         Assert.Null (r.Focused);
-        Assert.Null (r.ColorScheme);
+        Assert.False (r.HasScheme);
+        Assert.NotNull (r.GetScheme ());
+        Assert.Equal (r.GetScheme (), SchemeManager.GetSchemesForCurrentTheme () ["Base"]);
         Assert.Equal (3, r.Width);
         Assert.Equal (4, r.Height);
         Assert.Equal (1, r.X);
@@ -290,7 +296,9 @@ public void New_Initializes ()
         Assert.Equal (new (0, 0, 1, 13), r.Viewport);
         Assert.Equal (new (0, 0, 1, 13), r.Frame);
         Assert.Null (r.Focused);
-        Assert.Null (r.ColorScheme);
+        Assert.False (r.HasScheme);
+        Assert.NotNull (r.GetScheme ());
+        Assert.Equal (r.GetScheme (), SchemeManager.GetSchemesForCurrentTheme () ["Base"]);
         Assert.False (r.IsCurrentTop);
         Assert.Equal (string.Empty, r.Id);
         Assert.Empty (r.SubViews);
@@ -323,7 +331,7 @@ public void New_Methods_Return_False ()
     [AutoInitShutdown]
     public void Test_Nested_Views_With_Height_Equal_To_One ()
     {
-        var v = new View { Width = 11, Height = 3, ColorScheme = new () };
+        var v = new View { Width = 11, Height = 3 };
 
         var top = new View { Width = Dim.Fill (), Height = 1 };
         var bottom = new View { Width = Dim.Fill (), Height = 1, Y = 2 };
diff --git a/Tests/UnitTests/View/Viewport/ViewportSettings.TransparentMouseTests.cs b/Tests/UnitTests/View/Viewport/ViewportSettings.TransparentMouseTests.cs
new file mode 100644
index 0000000000..59be700ef9
--- /dev/null
+++ b/Tests/UnitTests/View/Viewport/ViewportSettings.TransparentMouseTests.cs
@@ -0,0 +1,129 @@
+#nullable enable
+
+namespace Terminal.Gui.ViewTests;
+
+public class TransparentMouseTests
+{
+    private class MouseTrackingView : View
+    {
+        public bool MouseEventReceived { get; private set; }
+
+        protected override bool OnMouseEvent (MouseEventArgs mouseEvent)
+        {
+            MouseEventReceived = true;
+            return true;
+        }
+    }
+
+    [Fact]
+    public void TransparentMouse_Passes_Mouse_Events_To_Underlying_View ()
+    {
+        // Arrange
+        var top = new Toplevel ()
+        {
+            Id = "top",
+        };
+        Application.Top = top;
+
+        var underlying = new MouseTrackingView { Id = "underlying", X = 0, Y = 0, Width = 10, Height = 10 };
+        var overlay = new MouseTrackingView { Id = "overlay", X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettings.TransparentMouse };
+
+        top.Add (underlying);
+        top.Add (overlay);
+
+        top.BeginInit ();
+        top.EndInit ();
+        top.Layout ();
+
+        var mouseEvent = new MouseEventArgs
+        {
+            ScreenPosition = new (5, 5),
+            Flags = MouseFlags.Button1Clicked
+        };
+
+        // Act
+        Application.RaiseMouseEvent (mouseEvent);
+
+        // Assert
+        Assert.True (underlying.MouseEventReceived);
+
+        top.Dispose ();
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void NonTransparentMouse_Consumes_Mouse_Events ()
+    {
+        // Arrange
+        var top = new Toplevel ();
+        Application.Top = top;
+
+        var underlying = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10 };
+        var overlay = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettings.None };
+
+        top.Add (underlying);
+        top.Add (overlay);
+
+        top.BeginInit ();
+        top.EndInit ();
+        top.Layout ();
+
+        var mouseEvent = new MouseEventArgs
+        {
+            ScreenPosition = new Point (5, 5),
+            Flags = MouseFlags.Button1Clicked
+        };
+
+        // Act
+        Application.RaiseMouseEvent (mouseEvent);
+
+        // Assert
+        Assert.True (overlay.MouseEventReceived);
+        Assert.False (underlying.MouseEventReceived);
+
+        top.Dispose ();
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void TransparentMouse_Stacked_TransparentMouse_Views ()
+    {
+        // Arrange
+        var top = new Toplevel ();
+        Application.Top = top;
+
+        var underlying = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettings.TransparentMouse };
+        var overlay = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettings.TransparentMouse };
+
+        top.Add (underlying);
+        top.Add (overlay);
+
+        top.BeginInit ();
+        top.EndInit ();
+        top.Layout ();
+
+        var mouseEvent = new MouseEventArgs
+        {
+            ScreenPosition = new Point (5, 5),
+            Flags = MouseFlags.Button1Clicked
+        };
+
+        bool topHandled = false;
+        top.MouseEvent += (sender, args) =>
+                          {
+                              topHandled = true;
+                              args.Handled = true;
+                          };
+
+        // Act
+        Application.RaiseMouseEvent (mouseEvent);
+
+        // Assert
+        Assert.False (overlay.MouseEventReceived);
+        Assert.False (underlying.MouseEventReceived);
+        Assert.True (topHandled);
+
+        top.Dispose ();
+        Application.ResetState (true);
+    }
+}
diff --git a/Tests/UnitTests/Views/ColorPickerTests.cs b/Tests/UnitTests/Views/ColorPickerTests.cs
index c020c59add..77105f5c76 100644
--- a/Tests/UnitTests/Views/ColorPickerTests.cs
+++ b/Tests/UnitTests/Views/ColorPickerTests.cs
@@ -771,7 +771,7 @@ public void ColorPicker_TabCompleteColorName ()
         Application.RaiseKeyDownEvent (Key.Tab);
 
         // Resolves to cyan color
-        Assert.Equal ("Cyan", name.Text);
+        Assert.Equal ("Aqua", name.Text);
 
         // Tab out of the text field
         Application.RaiseKeyDownEvent (Key.Tab);
diff --git a/Tests/UnitTests/Views/ComboBoxTests.cs b/Tests/UnitTests/Views/ComboBoxTests.cs
index 0e69ac2b3a..9466b47fb9 100644
--- a/Tests/UnitTests/Views/ComboBoxTests.cs
+++ b/Tests/UnitTests/Views/ComboBoxTests.cs
@@ -35,7 +35,7 @@ public void Constructors_Defaults ()
         Assert.Equal (new (0, 0, 0, 2), cb.Frame);
         Assert.Equal (-1, cb.SelectedItem);
 
-        cb = new() { Text = "Test" };
+        cb = new () { Text = "Test" };
         cb.BeginInit ();
         cb.EndInit ();
         cb.LayoutSubViews ();
@@ -44,7 +44,7 @@ public void Constructors_Defaults ()
         Assert.Equal (new (0, 0, 0, 2), cb.Frame);
         Assert.Equal (-1, cb.SelectedItem);
 
-        cb = new()
+        cb = new ()
         {
             X = 1,
             Y = 2,
@@ -60,7 +60,7 @@ public void Constructors_Defaults ()
         Assert.Equal (new (1, 2, 10, 20), cb.Frame);
         Assert.Equal (-1, cb.SelectedItem);
 
-        cb = new() { Source = new ListWrapper<string> (["One", "Two", "Three"]) };
+        cb = new () { Source = new ListWrapper<string> (["One", "Two", "Three"]) };
         cb.BeginInit ();
         cb.EndInit ();
         cb.LayoutSubViews ();
@@ -138,7 +138,7 @@ public void HideDropdownListOnClick_False_OpenSelectedItem_With_Mouse_And_Key_Cu
         Assert.Equal (-1, cb.SelectedItem);
         Assert.Equal ("", cb.Text);
 
-        Assert.True (cb.NewMouseEvent (new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }));
+        Assert.True (cb.NewMouseEvent (new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }));
         Assert.Equal ("", selected);
         Assert.True (cb.IsShow);
         Assert.Equal (0, cb.SelectedItem);
@@ -194,7 +194,7 @@ public void HideDropdownListOnClick_False_OpenSelectedItem_With_Mouse_And_Key_F4
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -232,7 +232,7 @@ public void
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -290,7 +290,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -303,7 +303,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -314,7 +314,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -327,7 +327,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("Three", selected);
@@ -337,14 +337,14 @@ public void HideDropdownListOnClick_Gets_Sets ()
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
 
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("Three", selected);
@@ -354,7 +354,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("Three", selected);
@@ -365,7 +365,7 @@ public void HideDropdownListOnClick_Gets_Sets ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("One", selected);
@@ -394,14 +394,14 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
 
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -412,7 +412,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (-1, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (-1, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -425,7 +425,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -436,7 +436,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, -1), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, -1), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -449,7 +449,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -460,7 +460,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (cb.Frame.Width, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (cb.Frame.Width, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -473,7 +473,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -484,7 +484,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
         Assert.True (
                      cb.SubViews.ElementAt (1)
                        .NewMouseEvent (
-                                       new() { Position = new (0, cb.Frame.Height), Flags = MouseFlags.Button1Clicked }
+                                       new () { Position = new (0, cb.Frame.Height), Flags = MouseFlags.Button1Clicked }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -495,7 +495,7 @@ public void HideDropdownListOnClick_True_Colapse_On_Click_Outside_Frame ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void HideDropdownListOnClick_True_Highlight_Current_Item ()
     {
         var selected = "";
@@ -518,7 +518,7 @@ public void HideDropdownListOnClick_True_Highlight_Current_Item ()
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -542,13 +542,13 @@ public void HideDropdownListOnClick_True_Highlight_Current_Item ()
         Attribute [] attributes =
         {
             // 0
-            cb.SubViews.ElementAt (0).ColorScheme.Focus,
+            cb.SubViews.ElementAt (0).GetAttributeForRole(VisualRole.Focus),
 
             // 1
-            cb.SubViews.ElementAt (1).ColorScheme.HotFocus,
+            cb.SubViews.ElementAt(1).GetAttributeForRole(VisualRole.HotFocus),
 
             // 2
-            cb.SubViews.ElementAt (1).GetNormalColor ()
+            cb.SubViews.ElementAt(1).GetAttributeForRole(VisualRole.Normal)
         };
 
         DriverAssert.AssertDriverAttributesAre (
@@ -690,7 +690,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_And
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -702,7 +702,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_And
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -712,7 +712,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_And
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -724,7 +724,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_And
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -753,7 +753,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_Cur
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
@@ -811,7 +811,7 @@ public void HideDropdownListOnClick_True_OpenSelectedItem_With_Mouse_And_Key_F4
 
         Assert.True (
                      cb.NewMouseEvent (
-                                       new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
+                                       new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
                                       )
                     );
         Assert.Equal ("", selected);
diff --git a/Tests/UnitTests/Views/FrameViewTests.cs b/Tests/UnitTests/Views/FrameViewTests.cs
index c2dd13a0d0..04bd0147ec 100644
--- a/Tests/UnitTests/Views/FrameViewTests.cs
+++ b/Tests/UnitTests/Views/FrameViewTests.cs
@@ -11,12 +11,12 @@ public void Constructors_Defaults ()
         var fv = new FrameView ();
         Assert.Equal (string.Empty, fv.Title);
         Assert.Equal (string.Empty, fv.Text);
-        Assert.Equal (LineStyle.Single, fv.BorderStyle);
+        Assert.Equal (LineStyle.Rounded, fv.BorderStyle);
 
         fv = new() { Title = "Test" };
         Assert.Equal ("Test", fv.Title);
         Assert.Equal (string.Empty, fv.Text);
-        Assert.Equal (LineStyle.Single, fv.BorderStyle);
+        Assert.Equal (LineStyle.Rounded, fv.BorderStyle);
 
         fv = new()
         {
@@ -30,7 +30,7 @@ public void Constructors_Defaults ()
         Assert.Equal (string.Empty, fv.Text);
         fv.BeginInit ();
         fv.EndInit ();
-        Assert.Equal (LineStyle.Single, fv.BorderStyle);
+        Assert.Equal (LineStyle.Rounded, fv.BorderStyle);
         Assert.Equal (new (1, 2, 10, 20), fv.Frame);
     }
 
@@ -39,7 +39,7 @@ public void Constructors_Defaults ()
     public void Draw_Defaults ()
     {
         ((FakeDriver)Application.Driver!).SetBufferSize (10, 10);
-        var fv = new FrameView ();
+        var fv = new FrameView () { BorderStyle = LineStyle.Single };
         Assert.Equal (string.Empty, fv.Title);
         Assert.Equal (string.Empty, fv.Text);
         var top = new Toplevel ();
diff --git a/Tests/UnitTests/Views/GraphViewTests.cs b/Tests/UnitTests/Views/GraphViewTests.cs
index 7e53c68315..59d778c007 100644
--- a/Tests/UnitTests/Views/GraphViewTests.cs
+++ b/Tests/UnitTests/Views/GraphViewTests.cs
@@ -61,7 +61,7 @@ public void CellSizeZero ()
         gv.BeginInit ();
         gv.EndInit ();
 
-        gv.ColorScheme = new ColorScheme ();
+        //gv.Scheme = new Scheme ();
         gv.Viewport = new Rectangle (0, 0, 50, 30);
         gv.Series.Add (new ScatterSeries { Points = new List<PointF> { new (1, 1) } });
         gv.CellSize = new PointF (0, 5);
@@ -83,7 +83,7 @@ public static GraphView GetGraph ()
         gv.BeginInit ();
         gv.EndInit ();
 
-        gv.ColorScheme = new ColorScheme ();
+        //gv.Scheme = new Scheme ();
         gv.MarginBottom = 1;
         gv.MarginLeft = 1;
         gv.Viewport = new Rectangle (0, 0, 10, 5);
@@ -450,7 +450,7 @@ public void Series_GetsPassedCorrectViewport_AllAtOnce ()
         gv.BeginInit ();
         gv.EndInit ();
         gv.Viewport = new Rectangle (0, 0, 50, 30);
-        gv.ColorScheme = new ColorScheme ();
+        //gv.Scheme = new Scheme ();
 
         var fullGraphBounds = RectangleF.Empty;
         var graphScreenBounds = Rectangle.Empty;
@@ -502,7 +502,7 @@ public void Series_GetsPassedCorrectViewport_AllAtOnce_LargeCellSize ()
         var gv = new GraphView ();
         gv.BeginInit ();
         gv.EndInit ();
-        gv.ColorScheme = new ColorScheme ();
+        //gv.Scheme = new Scheme ();
         gv.Viewport = new Rectangle (0, 0, 50, 30);
 
         // the larger the cell size the more condensed (smaller) the graph space is
@@ -640,7 +640,7 @@ public void TestRendering_MultibarSeries ()
         GraphViewTests.InitFakeDriver ();
 
         var gv = new GraphView ();
-        gv.ColorScheme = new ColorScheme ();
+        //gv.Scheme = new Scheme ();
 
         // y axis goes from 0.1 to 1 across 10 console rows
         // x axis goes from 0 to 20 across 20 console columns
@@ -882,7 +882,7 @@ private GraphView GetGraph (out FakeBarSeries series, out FakeHAxis axisX, out F
         // y axis goes from 0.1 to 1 across 10 console rows
         // x axis goes from 0 to 10 across 20 console columns
         gv.Viewport = new Rectangle (0, 0, 20, 10);
-        gv.ColorScheme = new ColorScheme ();
+       //gv.Scheme = new Scheme ();
         gv.CellSize = new PointF (0.5f, 0.1f);
 
         gv.Series.Add (series = new FakeBarSeries ());
@@ -923,7 +923,7 @@ private GraphView GetGraph (out FakeHAxis axisX, out FakeVAxis axisY)
 
         var gv = new GraphView ();
         gv.Viewport = new Rectangle (0, 0, 50, 30);
-        gv.ColorScheme = new ColorScheme ();
+       // gv.Scheme = new Scheme ();
 
         // graph can't be completely empty or it won't draw
         gv.Series.Add (new ScatterSeries ());
@@ -1542,7 +1542,7 @@ public void ViewChangeText_RendersCorrectly (bool useFill)
             Application.Begin (top);
 
             // render view
-            view.ColorScheme = new ColorScheme ();
+            //view.Scheme = new Scheme ();
             Assert.Equal (1, view.Height);
             mount.SetNeedsDraw ();
             mount.Draw ();
@@ -1570,7 +1570,7 @@ public void ViewChangeText_RendersCorrectly (bool useFill)
     public void XAxisLabels_With_MarginLeft ()
     {
         GraphViewTests.InitFakeDriver ();
-        var gv = new GraphView { ColorScheme = new ColorScheme (), Viewport = new Rectangle (0, 0, 10, 7) };
+        var gv = new GraphView { Viewport = new Rectangle (0, 0, 10, 7) };
 
         gv.CellSize = new PointF (1, 0.5f);
         gv.AxisY.Increment = 1;
@@ -1609,7 +1609,7 @@ 0    5
     public void YAxisLabels_With_MarginBottom ()
     {
         GraphViewTests.InitFakeDriver ();
-        var gv = new GraphView { ColorScheme = new ColorScheme (), Viewport = new Rectangle (0, 0, 10, 7) };
+        var gv = new GraphView { Viewport = new Rectangle (0, 0, 10, 7) };
 
         gv.CellSize = new PointF (1, 0.5f);
         gv.AxisY.Increment = 1;
diff --git a/Tests/UnitTests/Views/HexViewTests.cs b/Tests/UnitTests/Views/HexViewTests.cs
index 82191e8292..331637ff3e 100644
--- a/Tests/UnitTests/Views/HexViewTests.cs
+++ b/Tests/UnitTests/Views/HexViewTests.cs
@@ -29,7 +29,7 @@ public void BytesPerLine_Calculates_Correctly (int width, int expectedBpl)
     }
 
     [Fact]
-    public void AllowEdits_Edits_ApplyEdits ()
+    public void ReadOnly_Prevents_Edits ()
     {
         var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
         Application.Navigation = new ApplicationNavigation ();
@@ -43,13 +43,13 @@ public void AllowEdits_Edits_ApplyEdits ()
         Assert.True (Application.RaiseKeyDownEvent (Key.Tab)); // Move to left side
 
         Assert.Empty (hv.Edits);
-        hv.AllowEdits = false;
+        hv.ReadOnly = true;
         Assert.True (Application.RaiseKeyDownEvent (Key.Home));
         Assert.False (Application.RaiseKeyDownEvent (Key.A));
         Assert.Empty (hv.Edits);
         Assert.Equal (126, hv.Source!.Length);
 
-        hv.AllowEdits = true;
+        hv.ReadOnly = false;
         Assert.True (Application.RaiseKeyDownEvent (Key.D4));
         Assert.True (Application.RaiseKeyDownEvent (Key.D1));
         Assert.Single (hv.Edits);
@@ -133,13 +133,13 @@ public void Constructors_Defaults ()
         Assert.NotNull (hv.Source);
         Assert.IsAssignableFrom<MemoryStream> (hv.Source);
         Assert.True (hv.CanFocus);
-        Assert.True (hv.AllowEdits);
+        Assert.True (!hv.ReadOnly);
 
         hv = new (new MemoryStream ());
         Assert.NotNull (hv.Source);
         Assert.IsAssignableFrom<Stream> (hv.Source);
         Assert.True (hv.CanFocus);
-        Assert.True (hv.AllowEdits);
+        Assert.True (!hv.ReadOnly);
     }
 
     [Fact]
diff --git a/Tests/UnitTests/Views/LabelTests.cs b/Tests/UnitTests/Views/LabelTests.cs
index 3d8ecd2eb6..374750f2bc 100644
--- a/Tests/UnitTests/Views/LabelTests.cs
+++ b/Tests/UnitTests/Views/LabelTests.cs
@@ -204,9 +204,9 @@ public void Label_Draw_Fill_Remaining ()
         Assert.False (tf1.FillRemaining);
         Assert.True (tf2.FillRemaining);
 
-        tf1.Draw (new (new (0, 1), tfSize), label.GetNormalColor (), label.ColorScheme.HotNormal);
+        tf1.Draw (new (new (0, 1), tfSize), label.GetAttributeForRole (VisualRole.Normal), label.GetAttributeForRole (VisualRole.HotNormal));
 
-        tf2.Draw (new (new (0, 2), tfSize), label.GetNormalColor (), label.ColorScheme.HotNormal);
+        tf2.Draw (new (new (0, 2), tfSize), label.GetAttributeForRole (VisualRole.Normal), label.GetAttributeForRole (VisualRole.HotNormal));
 
         DriverAssert.AssertDriverContentsWithFrameAre (
                                                        @"
@@ -227,10 +227,10 @@ This TextFormatter (tf2) with fill will be cleared on rewritten.       ",
         label.Draw ();
 
         tf1.Text = "This TextFormatter (tf1) is rewritten.";
-        tf1.Draw (new (new (0, 1), tfSize), label.GetNormalColor (), label.ColorScheme.HotNormal);
+        tf1.Draw (new (new (0, 1), tfSize), label.GetAttributeForRole (VisualRole.Normal), label.GetAttributeForRole (VisualRole.HotNormal));
 
         tf2.Text = "This TextFormatter (tf2) is rewritten.";
-        tf2.Draw (new (new (0, 2), tfSize), label.GetNormalColor (), label.ColorScheme.HotNormal);
+        tf2.Draw (new (new (0, 2), tfSize), label.GetAttributeForRole (VisualRole.Normal), label.GetAttributeForRole (VisualRole.HotNormal));
 
         DriverAssert.AssertDriverContentsWithFrameAre (
                                                        @"
@@ -846,8 +846,6 @@ public void AnchorEnd_Better_Than_Bottom_Equal_Inside_Window ()
         var label = new Label
         {
             Text = "This should be the last line.",
-            ColorScheme = Colors.ColorSchemes ["Menu"],
-
             //Width = Dim.Fill (),
             X = 0, // keep unit test focused; don't use Center here
             Y = Pos.AnchorEnd (1)
@@ -894,8 +892,6 @@ public void Bottom_Equal_Inside_Window ()
         var label = new Label
         {
             Text = "This should be the last line.",
-            ColorScheme = Colors.ColorSchemes ["Menu"],
-
             //Width = Dim.Fill (),
             X = 0,
             Y = Pos.Bottom (win)
@@ -1053,7 +1049,7 @@ public void Label_Height_Zero_Stays_Zero ()
         label.Width = Dim.Fill () - text.Length;
         label.Height = 0;
 
-        var win = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+        var win = new View { CanFocus = true, BorderStyle = LineStyle.Single, Width = Dim.Fill (), Height = Dim.Fill () };
         win.Add (label);
         win.BeginInit ();
         win.EndInit ();
diff --git a/Tests/UnitTests/Views/MenuBarTests.cs b/Tests/UnitTests/Views/MenuBarTests.cs
index ab044b58f5..d313bdb4c0 100644
--- a/Tests/UnitTests/Views/MenuBarTests.cs
+++ b/Tests/UnitTests/Views/MenuBarTests.cs
@@ -503,7 +503,7 @@ public void Dynamic_Change_MenuItem_Title ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void Disabled_MenuBar_Is_Not_Activated ()
     {
         // Arrange
@@ -534,7 +534,7 @@ public void Disabled_MenuBar_Is_Not_Activated ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void MenuBarItem_Disabled_MenuBarItem_HotKey_No_Activate_Or_Open ()
     {
         // Arrange
@@ -566,7 +566,7 @@ public void MenuBarItem_Disabled_MenuBarItem_HotKey_No_Activate_Or_Open ()
 
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void MenuBarItem_Disabled_Popover_Is_Activated ()
     {
         // Arrange
diff --git a/Tests/UnitTests/Views/Menuv1/MenuBarv1Tests.cs b/Tests/UnitTests/Views/Menuv1/MenuBarv1Tests.cs
index 7b38ab6aa5..acc93a2197 100644
--- a/Tests/UnitTests/Views/Menuv1/MenuBarv1Tests.cs
+++ b/Tests/UnitTests/Views/Menuv1/MenuBarv1Tests.cs
@@ -259,11 +259,10 @@ public void Constructors_Defaults ()
         var menuBar = new MenuBar ();
         Assert.Equal (KeyCode.F9, menuBar.Key);
         var menu = new Menu { Host = menuBar, X = 0, Y = 0, BarItems = new () };
-        Assert.Null (menu.ColorScheme);
+        Assert.False (menu.HasScheme);
         Assert.False (menu.IsInitialized);
         menu.BeginInit ();
         menu.EndInit ();
-        Assert.Equal (Colors.ColorSchemes ["Menu"], menu.ColorScheme);
         Assert.True (menu.CanFocus);
         Assert.False (menu.WantContinuousButtonPressed);
         Assert.Equal (LineStyle.Single, menuBar.MenusBorderStyle);
@@ -274,7 +273,6 @@ public void Constructors_Defaults ()
         Assert.IsType<DimFill> (menuBar.Width);
         Assert.Equal (1, menuBar.Height);
         Assert.Empty (menuBar.Menus);
-        Assert.Equal (Colors.ColorSchemes ["Menu"], menuBar.ColorScheme);
         Assert.True (menuBar.WantMousePositionReports);
         Assert.False (menuBar.IsMenuOpen);
 
@@ -284,7 +282,6 @@ public void Constructors_Defaults ()
         Assert.IsType<DimFill> (menuBar.Width);
         Assert.Equal (1, menuBar.Height);
         Assert.Empty (menuBar.Menus);
-        Assert.Equal (Colors.ColorSchemes ["Menu"], menuBar.ColorScheme);
         Assert.True (menuBar.WantMousePositionReports);
         Assert.False (menuBar.IsMenuOpen);
 
@@ -318,7 +315,7 @@ public void Constructors_Defaults ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void Disabled_MenuBar_Is_Never_Opened ()
     {
         Toplevel top = new ();
@@ -344,7 +341,7 @@ public void Disabled_MenuBar_Is_Never_Opened ()
     }
 
     [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void Disabled_MenuItem_Is_Never_Selected ()
     {
         var menu = new MenuBar
@@ -371,13 +368,13 @@ public void Disabled_MenuItem_Is_Never_Selected ()
         Attribute [] attributes =
         {
             // 0
-            menu.ColorScheme.Normal,
+            menu.GetAttributeForRole(VisualRole.Normal),
 
             // 1
-            menu.ColorScheme.Focus,
+            menu.GetAttributeForRole(VisualRole.Focus),
 
             // 2
-            menu.ColorScheme.Disabled
+            menu.GetAttributeForRole(VisualRole.Disabled)
         };
 
         DriverAssert.AssertDriverAttributesAre (
@@ -415,7 +412,7 @@ public void Disabled_MenuItem_Is_Never_Selected ()
                                         new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked, View = top.SubViews.ElementAt (1) }
                                        )
                     );
-        top.SubViews.ElementAt (1).Layout();
+        top.SubViews.ElementAt (1).Layout ();
         top.SubViews.ElementAt (1).Draw ();
 
         DriverAssert.AssertDriverAttributesAre (
@@ -701,7 +698,7 @@ public void Draw_A_Menu_Over_A_Top_Dialog ()
         Dialog.DefaultShadow = ShadowStyle.None;
         Button.DefaultShadow = ShadowStyle.None;
 
-        Assert.Equal (new (0, 0, 40, 15), View.GetClip ()!.GetBounds());
+        Assert.Equal (new (0, 0, 40, 15), View.GetClip ()!.GetBounds ());
         DriverAssert.AssertDriverContentsWithFrameAre (@"", output);
 
         List<string> items = new ()
@@ -1948,7 +1945,7 @@ public void MenuBar_In_Window_Without_Other_Views_Without_Top_Init_With_Run_T ()
         Application.Iteration += (s, a) =>
                                  {
                                      Toplevel top = Application.Top;
-                                     Application.LayoutAndDraw();
+                                     Application.LayoutAndDraw ();
 
                                      DriverAssert.AssertDriverContentsWithFrameAre (
                                                                                    @"
@@ -3239,484 +3236,6 @@ public void UseSubMenusSingleFrame_False_By_Mouse ()
         top.Dispose ();
     }
 
-    [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown]
-    public void UseSubMenusSingleFrame_False_Disabled_Border ()
-    {
-        var menu = new MenuBar
-        {
-            MenusBorderStyle = LineStyle.None,
-            Menus =
-            [
-                new (
-                     "Numbers",
-                     new MenuItem []
-                     {
-                         new ("One", "", null),
-                         new MenuBarItem (
-                                          "Two",
-                                          new MenuItem []
-                                          {
-                                              new (
-                                                   "Sub-Menu 1",
-                                                   "",
-                                                   null
-                                                  ),
-                                              new (
-                                                   "Sub-Menu 2",
-                                                   "",
-                                                   null
-                                                  )
-                                          }
-                                         ),
-                         new ("Three", "", null)
-                     }
-                    )
-            ]
-        };
-
-        menu.UseKeysUpDownAsKeysLeftRight = true;
-        menu.BeginInit ();
-        menu.EndInit ();
-
-        menu.OpenMenu ();
-        menu.ColorScheme = menu._openMenu.ColorScheme = new (Attribute.Default);
-        Assert.True (menu.IsMenuOpen);
-
-        menu.Draw ();
-        menu._openMenu.Draw ();
-
-        var expected = @"
- Numbers
- One    
- Two   ►
- Three  ";
-
-        _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-
-        Assert.True (menu._openMenu.NewKeyDownEvent (Key.CursorDown));
-        menu.Draw ();
-        menu._openMenu.Draw ();
-        menu.OpenCurrentMenu.Draw ();
-
-        expected = @"
- Numbers           
- One               
- Two   ► Sub-Menu 1
- Three   Sub-Menu 2";
-
-        _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-    }
-
-    [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown]
-    public void UseSubMenusSingleFrame_True_By_Keyboard ()
-    {
-        var menu = new MenuBar
-        {
-            Menus =
-            [
-                new (
-                     "Numbers",
-                     new MenuItem []
-                     {
-                         new ("One", "", null),
-                         new MenuBarItem (
-                                          "Two",
-                                          new MenuItem []
-                                          {
-                                              new (
-                                                   "Sub-Menu 1",
-                                                   "",
-                                                   null
-                                                  ),
-                                              new (
-                                                   "Sub-Menu 2",
-                                                   "",
-                                                   null
-                                                  )
-                                          }
-                                         ),
-                         new ("Three", "", null)
-                     }
-                    )
-            ]
-        };
-
-        var top = new Toplevel ();
-        top.Add (menu);
-        Application.Begin (top);
-
-        Assert.Equal (Point.Empty, new (menu.Frame.X, menu.Frame.Y));
-        Assert.False (menu.UseSubMenusSingleFrame);
-        menu.UseSubMenusSingleFrame = true;
-        Assert.True (menu.UseSubMenusSingleFrame);
-
-        top.Draw ();
-
-        var expected = @"
- Numbers
-";
-
-        Rectangle pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-
-        Assert.True (menu.NewKeyDownEvent (menu.Key));
-        top.Draw ();
-
-        expected = @"
- Numbers  
-┌────────┐
-│ One    │
-│ Two   ►│
-│ Three  │
-└────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 10, 6), pos);
-
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorDown));
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Enter));
-        top.Draw ();
-
-        expected = @"
- Numbers       
-┌─────────────┐
-│◄    Two     │
-├─────────────┤
-│ Sub-Menu 1  │
-│ Sub-Menu 2  │
-└─────────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 15, 7), pos);
-
-        Assert.True (Application.Top.SubViews.ElementAt (2).NewKeyDownEvent (Key.Enter));
-        top.Draw ();
-
-        expected = @"
- Numbers  
-┌────────┐
-│ One    │
-│ Two   ►│
-│ Three  │
-└────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 10, 6), pos);
-
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Esc));
-        top.Draw ();
-
-        expected = @"
- Numbers
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-        top.Dispose ();
-    }
-
-    [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown]
-    public void UseSubMenusSingleFrame_True_By_Mouse ()
-    {
-        var menu = new MenuBar
-        {
-            Menus =
-            [
-                new (
-                     "Numbers",
-                     new MenuItem []
-                     {
-                         new ("One", "", null),
-                         new MenuBarItem (
-                                          "Two",
-                                          new MenuItem []
-                                          {
-                                              new (
-                                                   "Sub-Menu 1",
-                                                   "",
-                                                   null
-                                                  ),
-                                              new (
-                                                   "Sub-Menu 2",
-                                                   "",
-                                                   null
-                                                  )
-                                          }
-                                         ),
-                         new ("Three", "", null)
-                     }
-                    )
-            ]
-        };
-
-        var top = new Toplevel ();
-        top.Add (menu);
-        Application.Begin (top);
-
-        Assert.Equal (Point.Empty, new (menu.Frame.X, menu.Frame.Y));
-        Assert.False (menu.UseSubMenusSingleFrame);
-        menu.UseSubMenusSingleFrame = true;
-        Assert.True (menu.UseSubMenusSingleFrame);
-
-        top.Draw ();
-
-        var expected = @"
- Numbers
-";
-
-        Rectangle pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-
-        Assert.True (menu.NewMouseEvent (new () { Position = new (1, 0), Flags = MouseFlags.Button1Pressed, View = menu }));
-        top.Draw ();
-
-        expected = @"
- Numbers  
-┌────────┐
-│ One    │
-│ Two   ►│
-│ Three  │
-└────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 10, 6), pos);
-
-        Assert.False (menu.NewMouseEvent (new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (1) }));
-        top.Draw ();
-
-        expected = @"
- Numbers       
-┌─────────────┐
-│◄    Two     │
-├─────────────┤
-│ Sub-Menu 1  │
-│ Sub-Menu 2  │
-└─────────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 15, 7), pos);
-
-        menu.NewMouseEvent (new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (2) });
-        top.Draw ();
-
-        expected = @"
- Numbers  
-┌────────┐
-│ One    │
-│ Two   ►│
-│ Three  │
-└────────┘
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 10, 6), pos);
-
-        Assert.False (menu.NewMouseEvent (new () { Position = new (70, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top }));
-        top.Draw ();
-
-        expected = @"
- Numbers
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-        top.Dispose ();
-    }
-
-    [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown]
-    public void UseSubMenusSingleFrame_True_Disabled_Border ()
-    {
-        var menu = new MenuBar
-        {
-            MenusBorderStyle = LineStyle.None,
-            Menus =
-            [
-                new (
-                     "Numbers",
-                     new MenuItem []
-                     {
-                         new ("One", "", null),
-                         new MenuBarItem (
-                                          "Two",
-                                          new MenuItem []
-                                          {
-                                              new (
-                                                   "Sub-Menu 1",
-                                                   "",
-                                                   null
-                                                  ),
-                                              new (
-                                                   "Sub-Menu 2",
-                                                   "",
-                                                   null
-                                                  )
-                                          }
-                                         ),
-                         new ("Three", "", null)
-                     }
-                    )
-            ]
-        };
-
-        menu.UseSubMenusSingleFrame = true;
-        menu.BeginInit ();
-        menu.EndInit ();
-
-        menu.OpenMenu ();
-        Assert.True (menu.IsMenuOpen);
-
-        menu.Draw ();
-        menu.ColorScheme = menu._openMenu.ColorScheme = new (Attribute.Default);
-        menu._openMenu.Draw ();
-
-        var expected = @"
- Numbers
- One    
- Two   ►
- Three  ";
-
-        _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-
-        Assert.True (menu._openMenu.NewKeyDownEvent (Key.CursorDown));
-        Assert.True (menu._openMenu.NewKeyDownEvent (Key.Enter));
-        menu.Draw ();
-        menu._openMenu.Draw ();
-        menu.OpenCurrentMenu.Draw ();
-
-        expected = @"
- Numbers     
-◄    Two     
-─────────────
- Sub-Menu 1  
- Sub-Menu 2  ";
-
-        _ = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-    }
-
-    [Fact (Skip = "#3798 Broke. Will fix in #2975")]
-    [AutoInitShutdown]
-    public void UseSubMenusSingleFrame_True_Without_Border ()
-    {
-        var menu = new MenuBar
-        {
-            UseSubMenusSingleFrame = true,
-            MenusBorderStyle = LineStyle.None,
-            Menus =
-            [
-                new (
-                     "Numbers",
-                     new MenuItem []
-                     {
-                         new ("One", "", null),
-                         new MenuBarItem (
-                                          "Two",
-                                          new MenuItem []
-                                          {
-                                              new (
-                                                   "Sub-Menu 1",
-                                                   "",
-                                                   null
-                                                  ),
-                                              new (
-                                                   "Sub-Menu 2",
-                                                   "",
-                                                   null
-                                                  )
-                                          }
-                                         ),
-                         new ("Three", "", null)
-                     }
-                    )
-            ]
-        };
-
-        var top = new Toplevel ();
-        top.Add (menu);
-        Application.Begin (top);
-
-        Assert.Equal (Point.Empty, new (menu.Frame.X, menu.Frame.Y));
-        Assert.True (menu.UseSubMenusSingleFrame);
-        Assert.Equal (LineStyle.None, menu.MenusBorderStyle);
-
-        top.Draw ();
-
-        var expected = @"
- Numbers
-";
-
-        Rectangle pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-
-        Assert.True (
-                     menu.NewMouseEvent (
-                                         new () { Position = new (1, 0), Flags = MouseFlags.Button1Pressed, View = menu }
-                                        )
-                    );
-        top.Draw ();
-
-        expected = @"
- Numbers
- One    
- Two   ►
- Three  
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 4), pos);
-
-        menu.NewMouseEvent (
-                            new () { Position = new (1, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (1) }
-                           );
-        top.Draw ();
-
-        expected = @"
- Numbers     
-◄    Two     
-─────────────
- Sub-Menu 1  
- Sub-Menu 2  
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 13, 5), pos);
-
-        menu.NewMouseEvent (
-                            new () { Position = new (1, 1), Flags = MouseFlags.Button1Clicked, View = Application.Top.SubViews.ElementAt (2) }
-                           );
-        top.Draw ();
-
-        expected = @"
- Numbers
- One    
- Two   ►
- Three  
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 4), pos);
-
-        menu.NewMouseEvent (
-                            new () { Position = new (70, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top }
-                           );
-        top.Draw ();
-
-        expected = @"
- Numbers
-";
-
-        pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Assert.Equal (new (1, 0, 8, 1), pos);
-        top.Dispose ();
-    }
 
     [Fact]
     [AutoInitShutdown]
diff --git a/Tests/UnitTests/Views/ShortcutTests.cs b/Tests/UnitTests/Views/ShortcutTests.cs
index 0a63bee178..408613dad0 100644
--- a/Tests/UnitTests/Views/ShortcutTests.cs
+++ b/Tests/UnitTests/Views/ShortcutTests.cs
@@ -454,19 +454,21 @@ public void KeyDown_App_Scope_Invokes_Action (bool canFocus, KeyCode key, int ex
 
     // https://github.com/gui-cs/Terminal.Gui/issues/3664
     [Fact]
-    public void ColorScheme_SetColorScheme_Does_Not_Fault_3664 ()
+    public void Scheme_SetScheme_Does_Not_Fault_3664 ()
     {
         Application.Top = new ();
         Application.Navigation = new ();
         var shortcut = new Shortcut ();
 
-        Application.Top.ColorScheme = null;
+        Application.Top.SetScheme (null);
 
-        Assert.Null (shortcut.ColorScheme);
+        Assert.False (shortcut.HasScheme);
+        Assert.NotNull (shortcut.GetScheme ());
 
         shortcut.HasFocus = true;
 
-        Assert.Null (shortcut.ColorScheme);
+        Assert.False (shortcut.HasScheme);
+        Assert.NotNull (shortcut.GetScheme ());
 
         Application.Top.Dispose ();
         Application.ResetState ();
diff --git a/Tests/UnitTests/Views/StatusBarTests.cs b/Tests/UnitTests/Views/StatusBarTests.cs
index 73f9f42933..8e084ba7c8 100644
--- a/Tests/UnitTests/Views/StatusBarTests.cs
+++ b/Tests/UnitTests/Views/StatusBarTests.cs
@@ -19,7 +19,7 @@ public void AddItemAt_RemoveItem_Replacing ()
         Assert.Equal ("Open", sb.SubViews.ElementAt (0).Title);
         Assert.Equal ("Save", sb.SubViews.ElementAt (1).Title);
         Assert.Equal ("Close", sb.SubViews.ElementAt (2).Title);
-        Assert.Equal ("Quit", sb.SubViews.ToArray() [^1].Title);
+        Assert.Equal ("Quit", sb.SubViews.ToArray () [^1].Title);
 
         Assert.Equal ("Save", sb.RemoveShortcut (1).Title);
 
@@ -130,10 +130,10 @@ public void Run_Action_With_Key_And_Mouse ()
     public void StatusBar_Constructor_Default ()
     {
         var sb = new StatusBar ();
-        
+
         Assert.Empty (sb.SubViews);
         Assert.True (sb.CanFocus);
-        Assert.Equal (Colors.ColorSchemes ["Menu"], sb.ColorScheme);
+        Assert.Equal ("Menu", sb.SchemeName);
         Assert.Equal (0, sb.X);
         Assert.Equal ("AnchorEnd", sb.Y.ToString ());
         Assert.Equal (Dim.Fill (), sb.Width);
diff --git a/Tests/UnitTests/Views/TabViewTests.cs b/Tests/UnitTests/Views/TabViewTests.cs
index b6fb467ccc..78ff4135f5 100644
--- a/Tests/UnitTests/Views/TabViewTests.cs
+++ b/Tests/UnitTests/Views/TabViewTests.cs
@@ -1492,7 +1492,7 @@ private TabView GetTabView (out Tab tab1, out Tab tab2)
         var tv = new TabView () { Id = "tv " };
         tv.BeginInit ();
         tv.EndInit ();
-        tv.ColorScheme = new ();
+        //tv.Scheme = new ();
 
         tv.AddTab (
                    tab1 = new () { Id = "tab1", DisplayText = "Tab1", View = new TextField { Id = "tab1.TextField", Width = 2, Text = "hi" } },
diff --git a/Tests/UnitTests/Views/TableViewTests.cs b/Tests/UnitTests/Views/TableViewTests.cs
index 2274419de8..530dc08a23 100644
--- a/Tests/UnitTests/Views/TableViewTests.cs
+++ b/Tests/UnitTests/Views/TableViewTests.cs
@@ -54,7 +54,7 @@ public static DataTableSource BuildTable (int cols, int rows, out DataTable dt)
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void CellEventsBackgroundFill ()
     {
         var tv = new TableView { Width = 20, Height = 4 };
@@ -68,11 +68,12 @@ public void CellEventsBackgroundFill ()
 
         tv.Table = new DataTableSource (dt);
         tv.NullSymbol = string.Empty;
-        tv.ColorScheme = new ColorScheme ();
+
+        //tv.Scheme = new Scheme ();
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌─────┬──┬─────────┐
 │C1   │C2│C3       │
 ├─────┼──┼─────────┤
@@ -83,7 +84,7 @@ public void CellEventsBackgroundFill ()
 
         var color = new Attribute (Color.Magenta, Color.BrightBlue);
 
-        var scheme = new ColorScheme
+        var scheme = new Scheme
         {
             Normal = color,
             HotFocus = color,
@@ -102,18 +103,18 @@ public void CellEventsBackgroundFill ()
         }
 
         // Required or won't draw properly
-        Application.Driver.Clip = new Region (tv.Frame);
+        Application.Driver.Clip = new (tv.Frame);
         tv.SetNeedsDraw ();
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 00000000000000000000
 00000000000000000000
 00000000000000000000
 01111101101111111110
 ";
-        DriverAssert.AssertDriverAttributesAre (expected, output, Application.Driver, tv.ColorScheme.Normal, color);
+        DriverAssert.AssertDriverAttributesAre (expected, output, Application.Driver, tv.GetScheme ().Normal, color);
     }
 
     [Fact]
@@ -409,7 +410,7 @@ public void IsSelected_MultiSelectionOn_Vertical ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void LongColumnTest ()
     {
         var tableView = new TableView ();
@@ -418,7 +419,7 @@ public void LongColumnTest ()
         top.Add (tableView);
         RunState rs = Application.Begin (top);
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 25 characters can be printed into table
         tableView.Viewport = new (0, 0, 25, 5);
@@ -442,7 +443,7 @@ public void LongColumnTest ()
         // default behaviour of TableView is not to render
         // columns unless there is sufficient space
         var expected =
-            @"
+            $@"
 │A│B                    │
 ├─┼─────────────────────►
 │1│2                    │
@@ -461,7 +462,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A│B│Very Long Column   │
 ├─┼─┼───────────────────┤
 │1│2│aaaaaaaaaaaaaaaaaaa│
@@ -480,7 +481,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A│B│Very Long Column   │
 ├─┼─┼───────────────────┤
 │1│2│aaaaaaaaaaaaa...   │
@@ -507,7 +508,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A│B│Very Long Column   │
 ├─┼─┼───────────────────┤
 │1│2│aaaaaaaaaaaaaaaaaaa│
@@ -524,7 +525,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A│B    │
 ├─┼─────►
 │1│2    │
@@ -540,7 +541,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A│B│Very│
 ├─┼─┼────┤
 │1│2│aaaa│
@@ -561,7 +562,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A  │B  │Very Long │    │
 ├───┼───┼──────────┼────┤
 │1  │2  │aaaaaaaaaa│    │
@@ -577,7 +578,7 @@ public void LongColumnTest ()
         Application.RunIteration (ref rs);
 
         expected =
-            @"
+            $@"
 │A    │B    │Very │     │
 ├─────┼─────┼─────┼─────┤
 │1    │2    │aaaaa│     │
@@ -590,7 +591,7 @@ public void LongColumnTest ()
         top.Dispose ();
     }
 
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     [Fact]
     public void PageDown_ExcludesHeaders ()
     {
@@ -633,7 +634,8 @@ public void PageDown_ExcludesHeaders ()
     public void Redraw_EmptyTable ()
     {
         var tableView = new TableView ();
-        tableView.ColorScheme = new ();
+
+        //tableView.Scheme = new ();
         tableView.Viewport = new (0, 0, 25, 10);
 
         // Set a table with 1 column
@@ -679,7 +681,7 @@ public void ScrollIndicators ()
         tableView.BeginInit ();
         tableView.EndInit ();
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visibile
         tableView.Viewport = new (0, 0, 7, 5);
@@ -708,7 +710,7 @@ public void ScrollIndicators ()
         // user can only scroll right so sees right indicator
         // Because first column in table is A
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│";
@@ -724,7 +726,7 @@ public void ScrollIndicators ()
         tableView.Draw ();
 
         expected =
-            @"
+            $@"
 │B│C│D│
 ◄─┼─┼─►
 │2│3│4│";
@@ -739,7 +741,7 @@ public void ScrollIndicators ()
         tableView.Draw ();
 
         expected =
-            @"
+            $@"
 │D│E│F│
 ◄─┼─┼─┤
 │4│5│6│";
@@ -758,7 +760,7 @@ public void ScrollRight_SmoothScrolling ()
         tableView.BeginInit ();
         tableView.EndInit ();
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
         tableView.LayoutSubViews ();
 
         // 3 columns are visibile
@@ -786,7 +788,7 @@ public void ScrollRight_SmoothScrolling ()
         tableView.Draw ();
 
         var expected =
-            @"
+            $@"
 │A│B│C│
 │1│2│3│";
 
@@ -805,7 +807,7 @@ public void ScrollRight_SmoothScrolling ()
         // 'half cells' or scrolls by console unit (scrolling is done by table row/column increments).
 
         expected =
-            @"
+            $@"
 │B│C│D│
 │2│3│4│";
 
@@ -819,7 +821,7 @@ public void ScrollRight_WithoutSmoothScrolling ()
         var tableView = new TableView ();
         tableView.BeginInit ();
         tableView.EndInit ();
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visibile
         tableView.Viewport = new (0, 0, 7, 5);
@@ -846,7 +848,7 @@ public void ScrollRight_WithoutSmoothScrolling ()
         tableView.Draw ();
 
         var expected =
-            @"
+            $@"
 │A│B│C│
 │1│2│3│";
 
@@ -864,12 +866,11 @@ public void ScrollRight_WithoutSmoothScrolling ()
         // the view 'jump' to expose all new columns
 
         expected =
-            @"
+            $@"
 │D│E│F│
 │4│5│6│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
-
     }
 
     [Fact]
@@ -934,7 +935,7 @@ public void ShowHorizontalBottomLine_NoCellLines ()
     {
         TableView tableView = GetABCDEFTableView (out _);
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visibile
         tableView.Viewport = new (0, 0, 7, 5);
@@ -950,7 +951,7 @@ public void ShowHorizontalBottomLine_NoCellLines ()
         // user can only scroll right so sees right indicator
         // Because first column in table is A
         var expected =
-            @"
+            $@"
 │A│B│C│
 └─┴─┴─►
  1 2 3
@@ -965,7 +966,7 @@ public void ShowHorizontalBottomLine_WithVerticalCellLines ()
     {
         TableView tableView = GetABCDEFTableView (out _);
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visibile
         tableView.Viewport = new (0, 0, 7, 5);
@@ -980,7 +981,7 @@ public void ShowHorizontalBottomLine_WithVerticalCellLines ()
         // user can only scroll right so sees right indicator
         // Because first column in table is A
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│
@@ -990,7 +991,7 @@ public void ShowHorizontalBottomLine_WithVerticalCellLines ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void TableView_Activate ()
     {
         string activatedValue = null;
@@ -1030,7 +1031,7 @@ public void TableView_Activate ()
     }
 
     [Theory]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     [InlineData (false)]
     [InlineData (true)]
     public void TableView_ColorsTest_ColorGetter (bool focused)
@@ -1046,7 +1047,7 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
         ColumnStyle bStyle = tv.Style.GetOrCreateColumnStyle (1);
 
         // when B is 2 use the custom highlight color
-        var cellHighlight = new ColorScheme
+        var cellHighlight = new Scheme
         {
             Normal = new (Color.BrightCyan, Color.DarkGray),
             HotNormal = new (Color.Green, Color.Blue),
@@ -1067,7 +1068,7 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
 
         Application.RunIteration (ref rs);
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1075,7 +1076,7 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        var expectedColors = @"
+        var expectedColors = $@"
 00000
 00000
 00000
@@ -1083,13 +1084,13 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
 ";
 
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? tv.ColorScheme.Focus : tv.ColorScheme.HotNormal,
-                                               cellHighlight.Normal
-                                              );
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? tv.GetAttributeForRole (VisualRole.Focus) : tv.GetAttributeForRole (VisualRole.HotNormal),
+                                                cellHighlight.Normal
+                                               );
 
         // change the value in the table so that
         // it no longer matches the ColorGetter
@@ -1100,8 +1101,7 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
         tv.SetNeedsDraw ();
         Application.RunIteration (ref rs);
 
-
-        expected = @"
+        expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1109,7 +1109,7 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        expectedColors = @"
+        expectedColors = $@"
 00000
 00000
 00000
@@ -1120,18 +1120,18 @@ public void TableView_ColorsTest_ColorGetter (bool focused)
         // cellHighlight should no longer be used because the delegate returned null
         // (now that the cell value is 5 - which does not match the conditional)
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? tv.ColorScheme.Focus : tv.ColorScheme.HotNormal
-                                              );
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? tv.GetAttributeForRole (VisualRole.Focus) : tv.GetAttributeForRole (VisualRole.HotNormal)
+                                               );
 
         top.Dispose ();
     }
 
     [Theory]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     [InlineData (false)]
     [InlineData (true)]
     public void TableView_ColorsTest_RowColorGetter (bool focused)
@@ -1142,7 +1142,7 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
         // width exactly matches the max col widths
         tv.Viewport = new (0, 0, 5, 4);
 
-        var rowHighlight = new ColorScheme
+        var rowHighlight = new Scheme
         {
             Normal = new (Color.BrightCyan, Color.DarkGray),
             HotNormal = new (Color.Green, Color.Blue),
@@ -1163,7 +1163,7 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
         Assert.Equal (focused, tv.HasFocus);
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1171,7 +1171,7 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        var expectedColors = @"
+        var expectedColors = $@"
 00000
 00000
 00000
@@ -1179,13 +1179,13 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
 ";
 
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? rowHighlight.Focus : rowHighlight.HotNormal,
-                                               rowHighlight.Normal
-                                              );
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? rowHighlight.Focus : rowHighlight.HotNormal,
+                                                rowHighlight.Normal
+                                               );
 
         // change the value in the table so that
         // it no longer matches the RowColorGetter
@@ -1196,7 +1196,7 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
         tv.SetNeedsDraw ();
         Application.RunIteration (ref rs);
 
-        expected = @"
+        expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1204,7 +1204,7 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        expectedColors = @"
+        expectedColors = $@"
 00000
 00000
 00000
@@ -1215,17 +1215,17 @@ public void TableView_ColorsTest_RowColorGetter (bool focused)
         // rowHighlight should no longer be used because the delegate returned null
         // (now that the cell value is 5 - which does not match the conditional)
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? tv.ColorScheme.Focus : tv.ColorScheme.HotNormal
-                                              );
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? tv.GetScheme ().Focus : tv.GetScheme ().HotNormal
+                                               );
         top.Dispose ();
     }
 
     [Theory]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     [InlineData (false)]
     [InlineData (true)]
     public void TableView_ColorTests_FocusedOrNot (bool focused)
@@ -1245,7 +1245,7 @@ public void TableView_ColorTests_FocusedOrNot (bool focused)
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1253,7 +1253,7 @@ public void TableView_ColorTests_FocusedOrNot (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        var expectedColors = @"
+        var expectedColors = $@"
 00000
 00000
 00000
@@ -1261,12 +1261,12 @@ public void TableView_ColorTests_FocusedOrNot (bool focused)
 ";
 
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? tv.ColorScheme.Focus : tv.ColorScheme.HotNormal
-                                              );
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? tv.GetScheme ().Focus : tv.GetScheme ().HotNormal
+                                               );
         top.Dispose ();
     }
 
@@ -1288,7 +1288,7 @@ public void TableView_ColorTests_InvertSelectedCellFirstCharacter (bool focused)
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1296,24 +1296,23 @@ public void TableView_ColorTests_InvertSelectedCellFirstCharacter (bool focused)
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        var expectedColors = @"
+        var expectedColors = $@"
 00000
 00000
 00000
 01000
 ";
 
-        var invertFocus = new Attribute (tv.ColorScheme.Focus.Background, tv.ColorScheme.Focus.Foreground);
-        var invertHotNormal = new Attribute (tv.ColorScheme.HotNormal.Background, tv.ColorScheme.HotNormal.Foreground);
+        var invertFocus = new Attribute (tv.GetScheme ().Focus.Background, tv.GetScheme ().Focus.Foreground, TextStyle.Reverse);
+        var invertHotNormal = new Attribute (tv.GetScheme ().HotNormal.Background, tv.GetScheme ().HotNormal.Foreground, TextStyle.Reverse);
 
         DriverAssert.AssertDriverAttributesAre (
-                                               expectedColors,
-                                               output,
-                                               Application.Driver,
-                                               tv.ColorScheme.Normal,
-                                               focused ? invertFocus : invertHotNormal
-                                              );
-
+                                                expectedColors,
+                                                output,
+                                                Application.Driver,
+                                                tv.GetScheme ().Normal,
+                                                focused ? invertFocus : invertHotNormal
+                                               );
     }
 
     [Fact]
@@ -1327,14 +1326,13 @@ public void TableView_ExpandLastColumn_False ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┬────┐
 │A│B│    │
 ├─┼─┼────┤
 │1│2│    │
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
-
     }
 
     [Fact]
@@ -1351,7 +1349,7 @@ public void TableView_ExpandLastColumn_False_ExactBounds ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │A│B│
 ├─┼─┤
@@ -1371,7 +1369,7 @@ public void TableView_ExpandLastColumn_True ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬──────┐
 │A│B     │
 ├─┼──────┤
@@ -1396,7 +1394,7 @@ public void TableView_ShowHeadersFalse_AllLines ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 ├─┼─►
 │1│2│
@@ -1417,7 +1415,7 @@ public void TableView_ShowHeadersFalse_AndNoHeaderLines ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 │1│2│
 ";
         DriverAssert.AssertDriverContentsAre (expected, output);
@@ -1436,7 +1434,7 @@ public void TableView_ShowHeadersFalse_OverlineTrue ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ┌─┬─┐
 │1│2│
 ";
@@ -1459,7 +1457,7 @@ public void TableView_ShowHeadersFalse_UnderlineTrue ()
 
         tv.Draw ();
 
-        var expected = @"
+        var expected = $@"
 ├─┼─►
 │1│2│
 ";
@@ -1559,15 +1557,14 @@ public void TableViewMultiSelect_CannotFallOffTop ()
         Assert.Equal (new (0, 0, 2, 2), tv.MultiSelectedRegions.Single ().Rectangle);
         Assert.Equal (0, tv.SelectedColumn);
         Assert.Equal (0, tv.SelectedRow);
-
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void Test_CollectionNavigator ()
     {
         var tv = new TableView ();
-        tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 50, 7);
 
         tv.Table = new EnumerableTableSource<string> (
@@ -1580,7 +1577,7 @@ public void Test_CollectionNavigator ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌─────┬──────────────────────────────────────────┐
 │Name │EndsWith                                  │
 ├─────┼──────────────────────────────────────────┤
@@ -1663,7 +1660,7 @@ public void Test_ScreenToCell ()
         // user can only scroll right so sees right indicator
         // Because first column in table is A
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│
@@ -1741,7 +1738,7 @@ public void Test_ScreenToCell_DataColumnOverload ()
         // user can only scroll right so sees right indicator
         // Because first column in table is A
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│
@@ -1855,7 +1852,7 @@ public void TestColumnStyle_AllColumnsVisibleFalse_BehavesAsTableNull ()
 
         // expect nothing to be rendered when all columns are invisible
         var expected =
-            @"
+            $@"
 ";
 
         tableView.Draw ();
@@ -1908,7 +1905,7 @@ public void TestColumnStyle_FirstColumnVisibleFalse_IsNotRendered ()
         tableView.Draw ();
 
         var expected =
-            @"
+            $@"
 │B│C│D│
 ├─┼─┼─►
 │2│3│4│";
@@ -1960,7 +1957,7 @@ public void TestColumnStyle_PreceedingColumnsInvisible_NoScrollIndicator ()
 
         // normally we should have scroll indicators because A,E and F are of screen
         var expected =
-            @"
+            $@"
 │B│C│D│
 ◄─┼─┼─►
 │2│3│4│";
@@ -1972,7 +1969,7 @@ public void TestColumnStyle_PreceedingColumnsInvisible_NoScrollIndicator ()
         tableView.Style.GetOrCreateColumnStyle (5).Visible = false;
 
         expected =
-            @"
+            $@"
 │B│C│D│
 ◄─┼─┼─┤
 │2│3│4│";
@@ -1986,7 +1983,7 @@ public void TestColumnStyle_PreceedingColumnsInvisible_NoScrollIndicator ()
         tableView.Style.GetOrCreateColumnStyle (0).Visible = false;
 
         expected =
-            @"
+            $@"
 │B│C│D│
 ├─┼─┼─┤
 │2│3│4│";
@@ -2012,7 +2009,7 @@ public void TestColumnStyle_RemainingColumnsInvisible_NoScrollIndicator ()
 
         // normally we should have scroll indicators because DEF are of screen
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│";
@@ -2025,7 +2022,7 @@ public void TestColumnStyle_RemainingColumnsInvisible_NoScrollIndicator ()
         tableView.Style.GetOrCreateColumnStyle (5).Visible = false;
 
         expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─┤
 │1│2│3│";
@@ -2108,7 +2105,7 @@ public void TestColumnStyle_VisibleFalse_IsNotRendered ()
         tableView.Draw ();
 
         var expected =
-            @"
+            $@"
 │A│C│D│
 │1│3│4│";
 
@@ -2211,7 +2208,7 @@ public void TestEnumerableDataSource_BasicTypes ()
     {
         ((FakeDriver)Application.Driver!).SetBufferSize (100, 100);
         var tv = new TableView ();
-        tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 50, 6);
 
         tv.Table = new EnumerableTableSource<Type> (
@@ -2228,7 +2225,7 @@ public void TestEnumerableDataSource_BasicTypes ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌──────┬─────────┬───────────────────────────────┐
 │Name  │Namespace│BaseType                       │
 ├──────┼─────────┼───────────────────────────────┤
@@ -2265,7 +2262,7 @@ public void TestFullRowSelect_AlwaysUseNormalColorForVerticalCellLines ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│
@@ -2275,16 +2272,16 @@ public void TestFullRowSelect_AlwaysUseNormalColorForVerticalCellLines ()
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        Attribute normal = tv.ColorScheme.Normal;
-        tv.ColorScheme = new (tv.ColorScheme) { Focus = new (Color.Magenta, Color.White) };
-        Attribute focus = tv.ColorScheme.Focus;
+        Attribute normal = tv.GetScheme ().Normal;
+        tv.SetScheme (new (tv.GetScheme ()) { Focus = new (Color.Magenta, Color.White) });
+        Attribute focus = tv.GetScheme ().Focus;
 
         tv.Draw ();
 
         // Focus color (1) should be used for cells only because
         // AlwaysUseNormalColorForVerticalCellLines is true
         expected =
-            @"
+            $@"
 0000000
 0000000
 0000000
@@ -2320,7 +2317,7 @@ public void TestFullRowSelect_SelectionColorDoesNotStop_WhenShowVerticalCellLine
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 A B C
 ───────
 1 2 3
@@ -2329,16 +2326,16 @@ 1 2 3
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        Attribute normal = tv.ColorScheme.Normal;
-        tv.ColorScheme = new (tv.ColorScheme) { Focus = new (Color.Magenta, Color.White) };
-        Attribute focus = tv.ColorScheme.Focus;
+        Attribute normal = tv.GetScheme ().Normal;
+        tv.SetScheme (new (tv.GetScheme ()) { Focus = new (Color.Magenta, Color.White) });
+        Attribute focus = tv.GetScheme ().Focus;
         tv.Draw ();
 
         // Focus color (1) should be used for rendering the selected line
         // Note that because there are no vertical cell lines we use the focus
         // color for the whole row
         expected =
-            @"
+            $@"
 000000
 000000
 000000
@@ -2373,7 +2370,7 @@ public void TestFullRowSelect_SelectionColorStopsAtTableEdge_WithCellLines ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 │A│B│C│
 ├─┼─┼─►
 │1│2│3│
@@ -2383,9 +2380,9 @@ public void TestFullRowSelect_SelectionColorStopsAtTableEdge_WithCellLines ()
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
-        Attribute normal = tv.ColorScheme.Normal;
-        tv.ColorScheme = new (tv.ColorScheme) { Focus = new (Color.Magenta, Color.White) };
-        Attribute focus = tv.ColorScheme.Focus;
+        Attribute normal = tv.GetScheme ().Normal;
+        tv.SetScheme (new (tv.GetScheme ()) { Focus = new (Color.Magenta, Color.White) });
+        Attribute focus = tv.GetScheme ().Focus;
 
         tv.Draw ();
 
@@ -2393,7 +2390,7 @@ public void TestFullRowSelect_SelectionColorStopsAtTableEdge_WithCellLines ()
         // But should not spill into the borders.  Normal color (0) should be
         // used for the rest.
         expected =
-            @"
+            $@"
 0000000
 0000000
 0000000
@@ -2417,7 +2414,7 @@ public void TestListTableSource (Orientation orient, bool parallel)
         var tv = new TableView ();
 
         //tv.BeginInit (); tv.EndInit ();
-        tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 25, 4);
 
         tv.Style = new ()
@@ -2433,28 +2430,28 @@ public void TestListTableSource (Orientation orient, bool parallel)
         tv.Draw ();
 
         var horizPerpExpected =
-            @"
+            $@"
 │Item 0│Item 1          │
 │Item 2│Item 3          │
 │Item 4│Item 5          │
 │Item 6│Item 7          │";
 
         var horizParaExpected =
-            @"
+            $@"
 │Item 0 │Item 1 │Item 2 │
 │Item 4 │Item 5 │Item 6 │
 │Item 8 │Item 9 │Item 10│
 │Item 12│Item 13│Item 14│";
 
         var vertPerpExpected =
-            @"
+            $@"
 │Item 0│Item 4│Item 8   │
 │Item 1│Item 5│Item 9   │
 │Item 2│Item 6│Item 10  │
 │Item 3│Item 7│Item 11  │";
 
         var vertParaExpected =
-            @"
+            $@"
 │Item 0│Item 8          │
 │Item 1│Item 9          │
 │Item 2│Item 10         │
@@ -2569,9 +2566,6 @@ public void TestShiftClick_MultiSelect_TwoRowTable_FullRowSelect ()
     [SetupFakeDriver]
     public void TestTableViewCheckboxes_ByObject ()
     {
-        ConfigurationManager.Locations = ConfigLocations.Default;
-        ConfigurationManager.Reset();
-
         TableView tv = GetPetTable (out EnumerableTableSource<PickablePet> source);
         tv.LayoutSubViews ();
         IReadOnlyCollection<PickablePet> pets = source.Data;
@@ -2588,13 +2582,13 @@ public void TestTableViewCheckboxes_ByObject ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☐│Tammy  │Cat          │
-│☐│Tibbles│Cat          │
-│☐│Ripper │Dog          │";
+│{Glyphs.CheckStateUnChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateUnChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateUnChecked}│Ripper │Dog          │";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2610,13 +2604,13 @@ public void TestTableViewCheckboxes_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            @$"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☑│Tammy  │Cat          │
-│☐│Tibbles│Cat          │
-│☐│Ripper │Dog          │";
+│{Glyphs.CheckStateChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateUnChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateUnChecked}│Ripper │Dog          │";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2630,13 +2624,13 @@ public void TestTableViewCheckboxes_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☑│Tammy  │Cat          │
-│☑│Tibbles│Cat          │
-│☐│Ripper │Dog          │";
+│{Glyphs.CheckStateChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateUnChecked}│Ripper │Dog          │";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2650,13 +2644,13 @@ public void TestTableViewCheckboxes_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☐│Tammy  │Cat          │
-│☑│Tibbles│Cat          │
-│☐│Ripper │Dog          │";
+│{Glyphs.CheckStateUnChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateUnChecked}│Ripper │Dog          │";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
     }
@@ -2678,12 +2672,12 @@ public void TestTableViewCheckboxes_MultiSelectIsUnion_WhenToggling ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☑│1│2│
-│☐│1│2│
-│☑│1│2│";
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│";
 
         //toggle top two at once
         tv.NewKeyDownEvent (Key.CursorDown.WithShift);
@@ -2702,12 +2696,12 @@ public void TestTableViewCheckboxes_MultiSelectIsUnion_WhenToggling ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☑│1│2│
-│☑│1│2│
-│☑│1│2│";
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2718,12 +2712,12 @@ public void TestTableViewCheckboxes_MultiSelectIsUnion_WhenToggling ()
         tv.Draw ();
 
         expected =
-            @"
+            @$"
 │ │A│B│
 ├─┼─┼─►
-│☐│1│2│
-│☐│1│2│
-│☑│1│2│";
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│";
         DriverAssert.AssertDriverContentsAre (expected, output);
         Assert.Single (wrapper.CheckedRows, 2);
     }
@@ -2747,12 +2741,12 @@ public void TestTableViewCheckboxes_SelectAllToggle ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☑│1│2│
-│☑│1│2│
-│☑│1│2│";
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
         Assert.Contains (0, wrapper.CheckedRows);
@@ -2767,12 +2761,12 @@ public void TestTableViewCheckboxes_SelectAllToggle ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☐│1│2│
-│☐│1│2│
-│☐│1│2│";
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2808,13 +2802,13 @@ public void TestTableViewCheckboxes_SelectAllToggle_ByObject ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☑│Tammy  │Cat          │
-│☑│Tibbles│Cat          │
-│☑│Ripper │Dog          │";
+│{Glyphs.CheckStateChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateChecked}│Ripper │Dog          │";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2828,13 +2822,13 @@ public void TestTableViewCheckboxes_SelectAllToggle_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
-│☐│Tammy  │Cat          │
-│☐│Tibbles│Cat          │
-│☐│Ripper │Dog          │
+│{Glyphs.CheckStateUnChecked}│Tammy  │Cat          │
+│{Glyphs.CheckStateUnChecked}│Tibbles│Cat          │
+│{Glyphs.CheckStateUnChecked}│Ripper │Dog          │
 ";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
@@ -2855,12 +2849,12 @@ public void TestTableViewCheckboxes_Simple ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☐│1│2│
-│☐│1│2│
-│☐│1│2│";
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2875,12 +2869,12 @@ public void TestTableViewCheckboxes_Simple ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☑│1│2│
-│☐│1│2│
-│☐│1│2│";
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2895,12 +2889,12 @@ public void TestTableViewCheckboxes_Simple ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☑│1│2│
-│☑│1│2│
-│☐│1│2│";
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
 
@@ -2914,12 +2908,12 @@ public void TestTableViewCheckboxes_Simple ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 │ │A│B│
 ├─┼─┼─►
-│☐│1│2│
-│☑│1│2│
-│☐│1│2│";
+│{Glyphs.CheckStateUnChecked}│1│2│
+│{Glyphs.CheckStateChecked}│1│2│
+│{Glyphs.CheckStateUnChecked}│1│2│";
 
         DriverAssert.AssertDriverContentsAre (expected, output);
     }
@@ -2946,7 +2940,7 @@ public void TestTableViewRadioBoxes_Simple_ByObject ()
         tv.Draw ();
 
         var expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
@@ -2969,7 +2963,7 @@ public void TestTableViewRadioBoxes_Simple_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
@@ -2990,7 +2984,7 @@ public void TestTableViewRadioBoxes_Simple_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
@@ -3011,7 +3005,7 @@ public void TestTableViewRadioBoxes_Simple_ByObject ()
         tv.Draw ();
 
         expected =
-            @"
+            $@"
 ┌─┬───────┬─────────────┐
 │ │Name   │Kind         │
 ├─┼───────┼─────────────┤
@@ -3207,28 +3201,31 @@ public void TestDataColumnCaption ()
         var tableView = new TableView ();
 
         var dt = new DataTable ();
-        dt.Columns.Add (new DataColumn ()
-        {
-            Caption = "Caption 1",
-            ColumnName = "Column Name 1"
-        });
-        dt.Columns.Add (new DataColumn ()
-        {
-            ColumnName = "Column Name 2"
-        });
+
+        dt.Columns.Add (
+                        new DataColumn
+                        {
+                            Caption = "Caption 1",
+                            ColumnName = "Column Name 1"
+                        });
+
+        dt.Columns.Add (
+                        new DataColumn
+                        {
+                            ColumnName = "Column Name 2"
+                        });
 
         var dts = new DataTableSource (dt);
-        var cn = dts.ColumnNames;
+        string [] cn = dts.ColumnNames;
 
         Assert.Equal ("Caption 1", cn [0]);
         Assert.Equal ("Column Name 2", cn [1]);
     }
 
-
     [Fact]
     public void CanTabOutOfTableViewUsingCursor_Left ()
     {
-        GetTableViewWithSiblings (out var tf1, out var tableView, out var tf2);
+        GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2);
 
         // Make the selected cell one in
         tableView.SelectedColumn = 1;
@@ -3253,7 +3250,7 @@ public void CanTabOutOfTableViewUsingCursor_Left ()
     [Fact]
     public void CanTabOutOfTableViewUsingCursor_Up ()
     {
-        GetTableViewWithSiblings (out var tf1, out var tableView, out var tf2);
+        GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2);
 
         // Make the selected cell one in
         tableView.SelectedRow = 1;
@@ -3274,10 +3271,11 @@ public void CanTabOutOfTableViewUsingCursor_Up ()
 
         Application.Top.Dispose ();
     }
+
     [Fact]
     public void CanTabOutOfTableViewUsingCursor_Right ()
     {
-        GetTableViewWithSiblings (out var tf1, out var tableView, out var tf2);
+        GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2);
 
         // Make the selected cell one in from the rightmost column
         tableView.SelectedColumn = tableView.Table.Columns - 2;
@@ -3302,7 +3300,7 @@ public void CanTabOutOfTableViewUsingCursor_Right ()
     [Fact]
     public void CanTabOutOfTableViewUsingCursor_Down ()
     {
-        GetTableViewWithSiblings (out var tf1, out var tableView, out var tf2);
+        GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2);
 
         // Make the selected cell one in from the bottommost row
         tableView.SelectedRow = tableView.Table.Rows - 2;
@@ -3324,11 +3322,10 @@ public void CanTabOutOfTableViewUsingCursor_Down ()
         Application.Top.Dispose ();
     }
 
-
     [Fact]
     public void CanTabOutOfTableViewUsingCursor_Left_ClearsSelectionFirst ()
     {
-        GetTableViewWithSiblings (out var tf1, out var tableView, out var tf2);
+        GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2);
 
         // Make the selected cell one in
         tableView.SelectedColumn = 1;
@@ -3368,7 +3365,7 @@ public void CanTabOutOfTableViewUsingCursor_Left_ClearsSelectionFirst ()
     [InlineData (false, 1, 0)]
     public void TableCollectionNavigator_FullRowSelect_True_False (bool fullRowSelect, int selectedCol, int expectedRow)
     {
-        TableView tableView = new () { FullRowSelect = fullRowSelect, SelectedColumn = selectedCol};
+        TableView tableView = new () { FullRowSelect = fullRowSelect, SelectedColumn = selectedCol };
         tableView.BeginInit ();
         tableView.EndInit ();
 
@@ -3385,23 +3382,23 @@ public void TableCollectionNavigator_FullRowSelect_True_False (bool fullRowSelec
     }
 
     /// <summary>
-    /// Creates 3 views on <see cref="Application.Current"/> with the focus in the
-    /// <see cref="TableView"/>.  This is a helper method to setup tests that want to
-    /// explore moving input focus out of a tableview.
+    ///     Creates 3 views on <see cref="Application.Current"/> with the focus in the
+    ///     <see cref="TableView"/>.  This is a helper method to setup tests that want to
+    ///     explore moving input focus out of a tableview.
     /// </summary>
     /// <param name="tv"></param>
     /// <param name="tf1"></param>
     /// <param name="tf2"></param>
     private void GetTableViewWithSiblings (out TextField tf1, out TableView tableView, out TextField tf2)
     {
-        tableView = new TableView ();
+        tableView = new ();
         tableView.BeginInit ();
         tableView.EndInit ();
 
         Application.Navigation = new ();
         Application.Top = new ();
-        tf1 = new TextField ();
-        tf2 = new TextField ();
+        tf1 = new ();
+        tf2 = new ();
         Application.Top.Add (tf1);
         Application.Top.Add (tableView);
         Application.Top.Add (tf2);
@@ -3411,7 +3408,6 @@ private void GetTableViewWithSiblings (out TextField tf1, out TableView tableVie
         Assert.Same (tableView, Application.Top.MostFocused);
         Assert.True (tableView.HasFocus);
 
-
         // Set big table
         tableView.Table = BuildTable (25, 50);
     }
@@ -3422,7 +3418,7 @@ private TableView GetABCDEFTableView (out DataTable dt)
         tableView.BeginInit ();
         tableView.EndInit ();
 
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visible
         tableView.Viewport = new (0, 0, 7, 5);
@@ -3448,7 +3444,7 @@ private TableView GetABCDEFTableView (out DataTable dt)
     private TableView GetPetTable (out EnumerableTableSource<PickablePet> source)
     {
         var tv = new TableView ();
-        tv.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tv.SchemeName = "TopLevel";
         tv.Viewport = new (0, 0, 25, 6);
 
         List<PickablePet> pets = new ()
@@ -3476,7 +3472,7 @@ private TableView GetPetTable (out EnumerableTableSource<PickablePet> source)
     private TableView GetTwoRowSixColumnTable (out DataTable dt)
     {
         var tableView = new TableView ();
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
 
         // 3 columns are visible
         tableView.Viewport = new (0, 0, 7, 5);
@@ -3521,7 +3517,7 @@ private TableView SetUpMiniTable (out DataTable dt)
         tv.Style.GetOrCreateColumnStyle (1).MaxWidth = 1;
         tv.Style.GetOrCreateColumnStyle (1).MaxWidth = 1;
 
-        tv.ColorScheme = Colors.ColorSchemes ["Base"];
+        tv.SchemeName = "Base";
 
         return tv;
     }
diff --git a/Tests/UnitTests/Views/TextFieldTests.cs b/Tests/UnitTests/Views/TextFieldTests.cs
index f57d0d6ee6..11d7232741 100644
--- a/Tests/UnitTests/Views/TextFieldTests.cs
+++ b/Tests/UnitTests/Views/TextFieldTests.cs
@@ -808,10 +808,10 @@ public void Selected_Text_Shows ()
 
         Attribute [] attributes =
         {
-            _textField.ColorScheme.Focus,
+            _textField.GetAttributeForRole (VisualRole.Focus),
             new (
-                 _textField.ColorScheme.Focus.Background,
-                 _textField.ColorScheme.Focus.Foreground
+                 _textField.GetAttributeForRole (VisualRole.Focus).Background,
+                 _textField.GetAttributeForRole (VisualRole.Focus).Foreground
                 )
         };
 
@@ -1632,11 +1632,9 @@ public override void Before (MethodInfo methodUnderTest)
         {
             base.Before (methodUnderTest);
 
-            //Application.Top.ColorScheme = Colors.ColorSchemes ["Base"];
+            //Application.Top.Scheme = Colors.Schemes ["Base"];
             _textField = new ()
             {
-                ColorScheme = new (Colors.ColorSchemes ["Base"]),
-
                 //                1         2         3 
                 //      01234567890123456789012345678901=32 (Length)
                 Text = "TAB to jump between text fields.",
diff --git a/Tests/UnitTests/Views/TextValidateFieldTests.cs b/Tests/UnitTests/Views/TextValidateFieldTests.cs
index ca9f7ab7b9..c9826567d6 100644
--- a/Tests/UnitTests/Views/TextValidateFieldTests.cs
+++ b/Tests/UnitTests/Views/TextValidateFieldTests.cs
@@ -1,5 +1,4 @@
 using System.Text.RegularExpressions;
-using Terminal.Gui.TextValidateProviders;
 
 namespace Terminal.Gui.ViewsTests;
 
diff --git a/Tests/UnitTests/Views/TextViewTests.cs b/Tests/UnitTests/Views/TextViewTests.cs
index f6d36bfc01..d32a4e3e34 100644
--- a/Tests/UnitTests/Views/TextViewTests.cs
+++ b/Tests/UnitTests/Views/TextViewTests.cs
@@ -130,7 +130,7 @@ public void CanFocus_False_Wont_Focus_With_Mouse ()
         Assert.False (fv.CanFocus);
         Assert.False (fv.HasFocus);
 
-        tv.NewMouseEvent (new() { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
+        tv.NewMouseEvent (new () { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
 
         Assert.Empty (tv.SelectedText);
         Assert.False (tv.CanFocus);
@@ -140,7 +140,7 @@ public void CanFocus_False_Wont_Focus_With_Mouse ()
 
         fv.CanFocus = true;
         tv.CanFocus = true;
-        tv.NewMouseEvent (new() { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
+        tv.NewMouseEvent (new () { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
 
         Assert.Equal ("some ", tv.SelectedText);
         Assert.True (tv.CanFocus);
@@ -149,7 +149,7 @@ public void CanFocus_False_Wont_Focus_With_Mouse ()
         Assert.True (fv.HasFocus);
 
         fv.CanFocus = false;
-        tv.NewMouseEvent (new() { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
+        tv.NewMouseEvent (new () { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked });
 
         Assert.Equal ("some ", tv.SelectedText); // Setting CanFocus to false don't change the SelectedText
         Assert.True (tv.CanFocus); // v2: CanFocus is not longer automatically changed
@@ -1032,7 +1032,7 @@ public void DesiredCursorVisibility_Horizontal_Navigation ()
 
         for (var i = 0; i < 12; i++)
         {
-            tv.NewMouseEvent (new() { Flags = MouseFlags.WheeledRight });
+            tv.NewMouseEvent (new () { Flags = MouseFlags.WheeledRight });
             Assert.Equal (Math.Min (i + 1, 11), tv.LeftColumn);
             Application.PositionCursor ();
             Application.Driver!.GetCursorVisibility (out CursorVisibility cursorVisibility);
@@ -1041,7 +1041,7 @@ public void DesiredCursorVisibility_Horizontal_Navigation ()
 
         for (var i = 11; i > 0; i--)
         {
-            tv.NewMouseEvent (new() { Flags = MouseFlags.WheeledLeft });
+            tv.NewMouseEvent (new () { Flags = MouseFlags.WheeledLeft });
             Assert.Equal (i - 1, tv.LeftColumn);
 
             Application.PositionCursor ();
@@ -1084,7 +1084,7 @@ public void DesiredCursorVisibility_Vertical_Navigation ()
 
         for (var i = 0; i < 12; i++)
         {
-            tv.NewMouseEvent (new() { Flags = MouseFlags.WheeledDown });
+            tv.NewMouseEvent (new () { Flags = MouseFlags.WheeledDown });
             Application.PositionCursor ();
             Assert.Equal (i + 1, tv.TopRow);
             Application.Driver!.GetCursorVisibility (out CursorVisibility cursorVisibility);
@@ -1093,7 +1093,7 @@ public void DesiredCursorVisibility_Vertical_Navigation ()
 
         for (var i = 12; i > 0; i--)
         {
-            tv.NewMouseEvent (new() { Flags = MouseFlags.WheeledUp });
+            tv.NewMouseEvent (new () { Flags = MouseFlags.WheeledUp });
             Application.PositionCursor ();
             Assert.Equal (i - 1, tv.TopRow);
 
@@ -1161,21 +1161,21 @@ public void HistoryText_Exceptions ()
     {
         var ht = new HistoryText ();
 
-        foreach (object ls in Enum.GetValues (typeof (HistoryText.LineStatus)))
+        foreach (object ls in Enum.GetValues (typeof (TextEditingLineStatus)))
         {
-            if ((HistoryText.LineStatus)ls != HistoryText.LineStatus.Original)
+            if ((TextEditingLineStatus)ls != TextEditingLineStatus.Original)
             {
                 Assert.Throws<ArgumentException> (
                                                   () => ht.Add (
-                                                                new() { new () },
+                                                                new List<List<Cell>> (),
                                                                 Point.Empty,
-                                                                (HistoryText.LineStatus)ls
+                                                                (TextEditingLineStatus)ls
                                                                )
                                                  );
             }
         }
 
-        Assert.Null (Record.Exception (() => ht.Add (new() { new () }, Point.Empty)));
+        Assert.Null (Record.Exception (() => ht.Add (new () { new () }, Point.Empty)));
     }
 
     [Fact]
@@ -4802,7 +4802,7 @@ void AssertRedGreenAttribute ()
             {
                 foreach (Cell cell in cells)
                 {
-                    Assert.Equal ("[Red,Green]", cell.Attribute.ToString ());
+                    Assert.Equal ("[Red,Green,None]", cell.Attribute.ToString ());
                 }
             }
         }
@@ -6174,7 +6174,7 @@ public void Mouse_Button_Shift_Preserves_Selection ()
 
         Assert.True (
                      _textView.NewMouseEvent (
-                                              new() { Position = new (12, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
+                                              new () { Position = new (12, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
                                              )
                     );
         Assert.Equal (0, _textView.SelectionStartColumn);
@@ -6183,7 +6183,7 @@ public void Mouse_Button_Shift_Preserves_Selection ()
         Assert.True (_textView.IsSelecting);
         Assert.Equal ("TAB to jump ", _textView.SelectedText);
 
-        Assert.True (_textView.NewMouseEvent (new() { Position = new (12, 0), Flags = MouseFlags.Button1Clicked }));
+        Assert.True (_textView.NewMouseEvent (new () { Position = new (12, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (new (12, 0), _textView.CursorPosition);
@@ -6192,7 +6192,7 @@ public void Mouse_Button_Shift_Preserves_Selection ()
 
         Assert.True (
                      _textView.NewMouseEvent (
-                                              new() { Position = new (19, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
+                                              new () { Position = new (19, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
                                              )
                     );
         Assert.Equal (0, _textView.SelectionStartRow);
@@ -6201,7 +6201,7 @@ public void Mouse_Button_Shift_Preserves_Selection ()
         Assert.True (_textView.IsSelecting);
         Assert.Equal ("TAB to jump between", _textView.SelectedText);
 
-        Assert.True (_textView.NewMouseEvent (new() { Position = new (19, 0), Flags = MouseFlags.Button1Clicked }));
+        Assert.True (_textView.NewMouseEvent (new () { Position = new (19, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (new (19, 0), _textView.CursorPosition);
@@ -6210,7 +6210,7 @@ public void Mouse_Button_Shift_Preserves_Selection ()
 
         Assert.True (
                      _textView.NewMouseEvent (
-                                              new() { Position = new (24, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
+                                              new () { Position = new (24, 0), Flags = MouseFlags.Button1Pressed | MouseFlags.ButtonShift }
                                              )
                     );
         Assert.Equal (0, _textView.SelectionStartRow);
@@ -6219,14 +6219,14 @@ public void Mouse_Button_Shift_Preserves_Selection ()
         Assert.True (_textView.IsSelecting);
         Assert.Equal ("TAB to jump between text", _textView.SelectedText);
 
-        Assert.True (_textView.NewMouseEvent (new() { Position = new (24, 0), Flags = MouseFlags.Button1Clicked }));
+        Assert.True (_textView.NewMouseEvent (new () { Position = new (24, 0), Flags = MouseFlags.Button1Clicked }));
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (new (24, 0), _textView.CursorPosition);
         Assert.True (_textView.IsSelecting);
         Assert.Equal ("TAB to jump between text", _textView.SelectedText);
 
-        Assert.True (_textView.NewMouseEvent (new() { Position = new (24, 0), Flags = MouseFlags.Button1Pressed }));
+        Assert.True (_textView.NewMouseEvent (new () { Position = new (24, 0), Flags = MouseFlags.Button1Pressed }));
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (0, _textView.SelectionStartRow);
         Assert.Equal (new (24, 0), _textView.CursorPosition);
@@ -6362,8 +6362,8 @@ public void Selected_Text_Shows ()
 
         Attribute [] attributes =
         {
-            _textView.ColorScheme.Focus,
-            new (_textView.ColorScheme.Focus.Background, _textView.ColorScheme.Focus.Foreground)
+            _textView.GetScheme ().Focus,
+            new (_textView.GetScheme ().Focus.Background, _textView.GetScheme ().Focus.Foreground)
         };
 
         //                                             TAB to jump between text fields.
@@ -6984,7 +6984,7 @@ public void TextView_SpaceHandling ()
         tv.NewMouseEvent (ev);
         Assert.Equal (1, tv.SelectedLength);
 
-        ev = new() { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked };
+        ev = new () { Position = new (1, 0), Flags = MouseFlags.Button1DoubleClicked };
 
         tv.NewMouseEvent (ev);
         Assert.Equal (1, tv.SelectedLength);
@@ -7102,7 +7102,7 @@ This is the second line.
                                                        _output
                                                       );
 
-        Assert.True (tv.NewMouseEvent (new() { Position = new (0, 3), Flags = MouseFlags.Button1Pressed }));
+        Assert.True (tv.NewMouseEvent (new () { Position = new (0, 3), Flags = MouseFlags.Button1Pressed }));
         tv.Draw ();
         Assert.Equal (new (0, 3), tv.CursorPosition);
         Assert.Equal (new (13, 0), cp);
@@ -8276,7 +8276,7 @@ Line 1.
         DriverAssert.AssertDriverContentsWithFrameAre ("Line 2.", _output);
 
         Assert.True (_textView.NewKeyDownEvent (Key.H.WithShift));
-        Assert.NotEqual (Rectangle.Empty, _textView._needsDrawRect);
+        Assert.NotEqual (Rectangle.Empty, _textView.NeedsDrawRect);
         Application.LayoutAndDraw ();
 
         DriverAssert.AssertDriverContentsWithFrameAre (
@@ -8525,7 +8525,7 @@ public class TextViewTestsAutoInitShutdown : AutoInitShutdownAttribute
     {
         public static string Txt = "TAB to jump between text fields.";
 
-        public TextViewTestsAutoInitShutdown () : base (configLocation: ConfigLocations.Default) { }
+        public TextViewTestsAutoInitShutdown () : base () { }
 
         public override void After (MethodInfo methodUnderTest)
         {
@@ -8542,7 +8542,7 @@ public override void Before (MethodInfo methodUnderTest)
             //         01234567890123456789012345678901=32 (Length)
             byte [] buff = Encoding.Unicode.GetBytes (Txt);
             byte [] ms = new MemoryStream (buff).ToArray ();
-            _textView = new() { Width = 30, Height = 10, ColorScheme = Colors.ColorSchemes ["Base"] };
+            _textView = new () { Width = 30, Height = 10, SchemeName = "Base" };
             _textView.Text = Encoding.Unicode.GetString (ms);
         }
     }
@@ -8940,13 +8940,15 @@ This is
         top.Dispose ();
     }
 
-    [Fact]
-    [AutoInitShutdown (configLocation: ConfigLocations.Default)]
+    // BUGBUG: This test depends on the order of the schemes in SchemeManager.Schemes.
+    // BUGBUG: Breaks on Mac/Linux?
+    [Fact (Skip = "This test depends on the order of the schemes in SchemeManager.Schemes.")]
+    [AutoInitShutdown]
     public void Cell_LoadCells_InheritsPreviousAttribute ()
     {
         List<Cell> cells = [];
 
-        foreach (KeyValuePair<string, ColorScheme> color in Colors.ColorSchemes)
+        foreach (KeyValuePair<string, Scheme> color in SchemeManager.GetSchemes ())
         {
             string csName = color.Key;
 
@@ -8978,22 +8980,22 @@ public void Cell_LoadCells_InheritsPreviousAttribute ()
         Attribute [] attributes =
         {
             // 0
-            Colors.ColorSchemes ["TopLevel"].Normal,
+            SchemeManager.GetSchemes () ["TopLevel"].Normal,
 
             // 1
-            Colors.ColorSchemes ["Base"].Normal,
+            SchemeManager.GetSchemes () ["Base"].Normal,
 
             // 2
-            Colors.ColorSchemes ["Dialog"].Normal,
+            SchemeManager.GetSchemes () ["Dialog"].Normal,
 
             // 3
-            Colors.ColorSchemes ["Menu"].Normal,
+            SchemeManager.GetSchemes () ["Menu"].Normal,
 
             // 4
-            Colors.ColorSchemes ["Error"].Normal,
+            SchemeManager.GetSchemes () ["Error"].Normal,
 
             // 5
-            tv.ColorScheme!.Focus
+            tv.GetScheme ()!.Focus
         };
 
         var expectedColor = @"
@@ -9081,7 +9083,7 @@ public void Cell_LoadCells_InheritsPreviousAttribute ()
     }
 
     [Fact]
-    public void Cell_LoadCells_Without_ColorScheme_Is_Never_Null ()
+    public void Cell_LoadCells_Without_Scheme_Is_Never_Null ()
     {
         List<Cell> cells = new ()
         {
diff --git a/Tests/UnitTests/Views/TileViewTests.cs b/Tests/UnitTests/Views/TileViewTests.cs
index 41a4d1abcd..8981738e71 100644
--- a/Tests/UnitTests/Views/TileViewTests.cs
+++ b/Tests/UnitTests/Views/TileViewTests.cs
@@ -21,8 +21,8 @@ public void Test_SplitTop_WholeBottom ()
         top.Layout ();
 
         tileView.Tiles.ElementAt (1).ContentView!.Add (new Label { Text = "Hello" });
-        tileView.ColorScheme = new ();
-        top.ColorScheme = new ();
+        tileView.SetScheme (new ());
+        top.SetScheme (new ());
 
         top.Layout ();
         tileView.Layout ();
@@ -1509,11 +1509,11 @@ public void TestNestedNonRoots_OnlyOneRoot_OnlyRootCanHaveBorders ()
     {
         var tv = new TileView
         {
-            Width = 10, Height = 5, ColorScheme = new (), LineStyle = LineStyle.Single
+            Width = 10, Height = 5, LineStyle = LineStyle.Single
         };
 
         tv.TrySplitTile (1, 2, out TileView tv2);
-        tv2.ColorScheme = new ();
+       // tv2.Scheme = new ();
         tv2.LineStyle = LineStyle.Single;
         tv2.Orientation = Orientation.Horizontal;
 
@@ -1554,14 +1554,13 @@ public void TestNestedRoots_BothRoots_BothCanHaveBorders ()
     {
         var tv = new TileView
         {
-            Width = 10, Height = 5, ColorScheme = new (), LineStyle = LineStyle.Single
+            Width = 10, Height = 5, LineStyle = LineStyle.Single
         };
 
         var tv2 = new TileView
         {
             Width = Dim.Fill (),
             Height = Dim.Fill (),
-            ColorScheme = new (),
             LineStyle = LineStyle.Single,
             Orientation = Orientation.Horizontal
         };
@@ -2217,7 +2216,7 @@ private TileView Get5x1TilesView (bool border = true)
     {
         var tv = new TileView (5)
         {
-            Width = 25, Height = 4, ColorScheme = new (), LineStyle = LineStyle.Single
+            Width = 25, Height = 4, LineStyle = LineStyle.Single
         };
 
         if (!border)
@@ -2269,8 +2268,6 @@ private TileView GetNestedContainer2Left1Right (bool withBorder)
         Assert.True (container.TrySplitTile (0, 2, out TileView newContainer));
 
         newContainer.Orientation = Orientation.Horizontal;
-        newContainer.ColorScheme = new ();
-        container.ColorScheme = new ();
 
         container.LayoutSubViews ();
 
@@ -2325,8 +2322,6 @@ private TileView GetNestedContainer3Right1Down (bool withBorder, bool withTitles
                                  );
         }
 
-        newContainer.ColorScheme = new ();
-        container.ColorScheme = new ();
         Application.Top.Add (container);
         Application.Begin (Application.Top);
 
@@ -2382,7 +2377,6 @@ private TileView GetTileView (int width, int height, bool withBorder = false)
 
         Application.Top = new ();
         Application.Top.Add (container);
-        container.ColorScheme = new ();
 
         Application.Begin (Application.Top);
 
diff --git a/Tests/UnitTests/Views/ToplevelTests.cs b/Tests/UnitTests/Views/ToplevelTests.cs
index e46c7711d7..082ffb1f33 100644
--- a/Tests/UnitTests/Views/ToplevelTests.cs
+++ b/Tests/UnitTests/Views/ToplevelTests.cs
@@ -9,7 +9,7 @@ public void Constructor_Default ()
     {
         var top = new Toplevel ();
 
-        Assert.Equal (Colors.ColorSchemes ["TopLevel"], top.ColorScheme);
+        Assert.Equal ("Toplevel", top.SchemeName);
         Assert.Equal ("Fill(Absolute(0))", top.Width.ToString ());
         Assert.Equal ("Fill(Absolute(0))", top.Height.ToString ());
         Assert.False (top.Running);
@@ -568,7 +568,7 @@ public void IsLoaded_With_Sub_Toplevel_Application_Begin_NeedDisplay ()
 
         void ViewLayoutStarted (object sender, LayoutEventArgs e)
         {
-            Assert.Equal (new (0, 0, 20, 10), view._needsDrawRect);
+            Assert.Equal (new (0, 0, 20, 10), view.NeedsDrawRect);
             view.SubViewLayout -= ViewLayoutStarted;
         }
 
@@ -580,12 +580,12 @@ void ViewLayoutStarted (object sender, LayoutEventArgs e)
 
         view.Frame = new (1, 3, 10, 5);
         Assert.Equal (new (1, 3, 10, 5), view.Frame);
-        Assert.Equal (new (0, 0, 10, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 5), view.NeedsDrawRect);
 
         view.Frame = new (1, 3, 10, 5);
         top.Layout ();
         Assert.Equal (new (1, 3, 10, 5), view.Frame);
-        Assert.Equal (new (0, 0, 10, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 5), view.NeedsDrawRect);
         top.Dispose ();
     }
 
@@ -720,25 +720,6 @@ public void Modal_As_Top_Will_Drag_Cleanly ()
         window.Dispose ();
     }
 
-    [Fact]
-    [AutoInitShutdown]
-    public void Begin_With_Window_Sets_Size_Correctly ()
-    {
-        Toplevel top = new ();
-        RunState rsTop = Application.Begin (top);
-        ((FakeDriver)Application.Driver!).SetBufferSize (20, 20);
-
-        var testWindow = new Window { X = 2, Y = 1, Width = 15, Height = 10 };
-        Assert.Equal (new (2, 1, 15, 10), testWindow.Frame);
-
-        RunState rsTestWindow = Application.Begin (testWindow);
-        Assert.Equal (new (2, 1, 15, 10), testWindow.Frame);
-
-        Application.End (rsTestWindow);
-        Application.End (rsTop);
-        top.Dispose ();
-    }
-
     [Fact]
     [AutoInitShutdown]
     public void Activating_MenuBar_By_Alt_Key_Does_Not_Throw ()
diff --git a/Tests/UnitTests/Views/TreeTableSourceTests.cs b/Tests/UnitTests/Views/TreeTableSourceTests.cs
index 552403b5dd..68c4cfc05d 100644
--- a/Tests/UnitTests/Views/TreeTableSourceTests.cs
+++ b/Tests/UnitTests/Views/TreeTableSourceTests.cs
@@ -156,7 +156,7 @@ public void TestTreeTableSource_BasicExpanding_WithMouse ()
     }
 
     [Fact]
-    [AutoInitShutdown (configLocation:ConfigLocations.Default)]
+    [AutoInitShutdown]
     public void TestTreeTableSource_CombinedWithCheckboxes ()
     {
         Toplevel top = new ();
@@ -222,7 +222,7 @@ public void TestTreeTableSource_CombinedWithCheckboxes ()
 │ │Name             │Description       │
 ├─┼─────────────────┼──────────────────┤
 │☐│├-Lost Highway   │Exciting night roa│
-│☑││ ├─Ford Trans-Am│Talking thunderbir│
+│☒││ ├─Ford Trans-Am│Talking thunderbir│
 │☐││ └─DeLorean     │Time travelling ca│
 │☐│└+Route 66       │Great race course │
 ";
@@ -240,8 +240,7 @@ public void TestTreeTableSource_CombinedWithCheckboxes ()
     private TableView GetTreeTable (out TreeView<IDescribedThing> tree)
     {
         var tableView = new TableView ();
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
-        tableView.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        tableView.SchemeName = "TopLevel";
         tableView.Viewport = new Rectangle (0, 0, 40, 6);
 
         tableView.Style.ShowHorizontalHeaderUnderline = true;
diff --git a/Tests/UnitTests/Views/TreeViewTests.cs b/Tests/UnitTests/Views/TreeViewTests.cs
index f0a9129480..6dda2c0d4f 100644
--- a/Tests/UnitTests/Views/TreeViewTests.cs
+++ b/Tests/UnitTests/Views/TreeViewTests.cs
@@ -705,7 +705,7 @@ public void TestBottomlessTreeView_MaxDepth_3 ()
                                                          );
 
         tv.AddObject ("1");
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
 
         tv.LayoutSubViews ();
         tv.Draw ();
@@ -744,7 +744,7 @@ public void TestBottomlessTreeView_MaxDepth_5 ()
                                                          );
 
         tv.AddObject ("1");
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
 
         tv.LayoutSubViews ();
         tv.Draw ();
@@ -820,7 +820,7 @@ public void TestGetObjectOnRow ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         tv.Draw ();
 
@@ -875,7 +875,7 @@ public void TestGetObjectRow ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         View.SetClipToScreen ();
         tv.Draw ();
@@ -950,7 +950,7 @@ public void TestTreeView_DrawLineEvent ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         View.SetClipToScreen ();
         tv.Draw ();
@@ -1026,7 +1026,7 @@ public void TestTreeView_DrawLineEvent_Handled ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         tv.Draw ();
 
@@ -1066,7 +1066,7 @@ public void TestTreeView_DrawLineEvent_WithScrolling ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         tv.Draw ();
 
@@ -1122,7 +1122,7 @@ public void TestTreeView_Filter ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         tv.Draw ();
 
@@ -1211,11 +1211,11 @@ public void TestTreeViewColor ()
         tv.AddObject (n2);
         tv.Expand (n1);
 
-        tv.ColorScheme = new ColorScheme ();
+        tv.SetScheme (new Scheme ());
         tv.LayoutSubViews ();
         tv.Draw ();
 
-        // create a new color scheme
+        // create a new scheme
         var pink = new Attribute (Color.Magenta, Color.Black);
         var hotpink = new Attribute (Color.BrightMagenta, Color.Black);
 
@@ -1240,13 +1240,13 @@ public void TestTreeViewColor ()
 ",
                                                output,
                                                Application.Driver,
-                                               tv.ColorScheme.Normal,
+                                               tv.GetScheme ().Normal,
                                                pink
                                               );
 
-        var pinkScheme = new ColorScheme { Normal = pink, Focus = hotpink };
+        var pinkScheme = new Scheme { Normal = pink, Focus = hotpink };
 
-        // and a delegate that uses the pink color scheme 
+        // and a delegate that uses the pink scheme 
         // for nodes "pink"
         tv.ColorGetter = n => n.Text.Equals ("pink") ? pinkScheme : null;
 
@@ -1278,7 +1278,7 @@ public void TestTreeViewColor ()
 ",
                                                output,
                                                Application.Driver,
-                                               tv.ColorScheme.Normal,
+                                               tv.GetScheme ().Normal,
                                                pink
                                               );
     }
diff --git a/Tests/UnitTests/Views/WindowTests.cs b/Tests/UnitTests/Views/WindowTests.cs
index c562fb6046..f2557d86c1 100644
--- a/Tests/UnitTests/Views/WindowTests.cs
+++ b/Tests/UnitTests/Views/WindowTests.cs
@@ -45,7 +45,7 @@ public void MenuBar_And_StatusBar_Inside_Window ()
 
         var sb = new StatusBar ();
 
-        var fv = new FrameView { Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1), Title = "Frame View" };
+        var fv = new FrameView { Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1), Title = "Frame View", BorderStyle = LineStyle.Single };
         var win = new Window ();
         win.Add (menu, sb, fv);
         Toplevel top = new ();
@@ -132,7 +132,7 @@ public void New_Initializes ()
         Assert.Equal (new Rectangle (0, 0, Application.Screen.Width - 2, Application.Screen.Height - 2), defaultWindow.Viewport);
         Assert.Equal (new Rectangle (0, 0, Application.Screen.Width, Application.Screen.Height), defaultWindow.Frame);
         Assert.Null (defaultWindow.Focused);
-        Assert.NotNull (defaultWindow.ColorScheme);
+        Assert.NotNull (defaultWindow.GetScheme ());
         Assert.Equal (0, defaultWindow.X);
         Assert.Equal (0, defaultWindow.Y);
         Assert.Equal (Dim.Fill (), defaultWindow.Width);
@@ -155,7 +155,7 @@ public void New_Initializes ()
         Assert.True (windowWithFrameRectEmpty.CanFocus);
         Assert.False (windowWithFrameRectEmpty.HasFocus);
         Assert.Null (windowWithFrameRectEmpty.Focused);
-        Assert.NotNull (windowWithFrameRectEmpty.ColorScheme);
+        Assert.NotNull (windowWithFrameRectEmpty.GetScheme ());
         Assert.Equal (0, windowWithFrameRectEmpty.X);
         Assert.Equal (0, windowWithFrameRectEmpty.Y);
         Assert.Equal (0, windowWithFrameRectEmpty.Width);
@@ -179,7 +179,7 @@ public void New_Initializes ()
         Assert.Equal (new (0, 0, 1, 2), windowWithFrame1234.Viewport);
         Assert.Equal (new (1, 2, 3, 4), windowWithFrame1234.Frame);
         Assert.Null (windowWithFrame1234.Focused);
-        Assert.NotNull (windowWithFrame1234.ColorScheme);
+        Assert.NotNull (windowWithFrame1234.GetScheme ());
         Assert.Equal (1, windowWithFrame1234.X);
         Assert.Equal (2, windowWithFrame1234.Y);
         Assert.Equal (3, windowWithFrame1234.Width);
diff --git a/Tests/UnitTestsParallelizable/Application/ApplicationPopoverTests.cs b/Tests/UnitTestsParallelizable/Application/ApplicationPopoverTests.cs
index 17e9d33212..ab9746ca47 100644
--- a/Tests/UnitTestsParallelizable/Application/ApplicationPopoverTests.cs
+++ b/Tests/UnitTestsParallelizable/Application/ApplicationPopoverTests.cs
@@ -1,4 +1,5 @@
-using Moq;
+#nullable enable
+using Moq;
 
 namespace Terminal.Gui.ApplicationTests;
 
@@ -18,6 +19,7 @@ public void Register_AddsPopover ()
         Assert.Contains (popover, popoverManager.Popovers);
     }
 
+
     [Fact]
     public void DeRegister_RemovesPopover ()
     {
@@ -38,7 +40,7 @@ public void DeRegister_RemovesPopover ()
     public void Show_SetsActivePopover ()
     {
         // Arrange
-        var popover = new Mock<IPopoverTestClass> ().Object;
+        var popover = new Mock<PopoverTestClass> ().Object;
         var popoverManager = new ApplicationPopover ();
 
         // Act
@@ -68,7 +70,7 @@ public void Hide_ClearsActivePopover ()
     public void DispatchKeyDown_ActivePopoverGetsKey ()
     {
         // Arrange
-        var popover = new IPopoverTestClass ();
+        var popover = new PopoverTestClass ();
         var popoverManager = new ApplicationPopover ();
         popoverManager.Show (popover);
 
@@ -84,7 +86,7 @@ public void DispatchKeyDown_ActivePopoverGetsKey ()
     public void DispatchKeyDown_ActivePopoverGetsHotKey ()
     {
         // Arrange
-        var popover = new IPopoverTestClass ();
+        var popover = new PopoverTestClass ();
         var popoverManager = new ApplicationPopover ();
         popoverManager.Show (popover);
 
@@ -92,7 +94,7 @@ public void DispatchKeyDown_ActivePopoverGetsHotKey ()
         popoverManager.DispatchKeyDown (Key.N.WithCtrl);
 
         // Assert
-        Assert.Equal(1, popover.NewCommandInvokeCount);
+        Assert.Equal (1, popover.NewCommandInvokeCount);
         Assert.Contains (Key.N.WithCtrl, popover.HandledKeys);
     }
 
@@ -101,8 +103,8 @@ public void DispatchKeyDown_ActivePopoverGetsHotKey ()
     public void DispatchKeyDown_InactivePopoverGetsHotKey ()
     {
         // Arrange
-        var activePopover = new IPopoverTestClass () { Id = "activePopover" };
-        var inactivePopover = new IPopoverTestClass () { Id = "inactivePopover" }; ;
+        var activePopover = new PopoverTestClass () { Id = "activePopover" };
+        var inactivePopover = new PopoverTestClass () { Id = "inactivePopover" }; ;
         var popoverManager = new ApplicationPopover ();
         popoverManager.Show (activePopover);
         popoverManager.Register (inactivePopover);
@@ -121,8 +123,8 @@ public void DispatchKeyDown_InactivePopoverGetsHotKey ()
     public void DispatchKeyDown_InactivePopoverDoesGetKey ()
     {
         // Arrange
-        var activePopover = new IPopoverTestClass ();
-        var inactivePopover = new IPopoverTestClass ();
+        var activePopover = new PopoverTestClass ();
+        var inactivePopover = new PopoverTestClass ();
         var popoverManager = new ApplicationPopover ();
         popoverManager.Show (activePopover);
         popoverManager.Register (inactivePopover);
@@ -134,16 +136,16 @@ public void DispatchKeyDown_InactivePopoverDoesGetKey ()
         Assert.Contains (Key.A, activePopover.HandledKeys);
         Assert.NotEmpty (inactivePopover.HandledKeys);
     }
-    
-    public class IPopoverTestClass : View, IPopover
+
+    public class PopoverTestClass : View, IPopover
     {
         public List<Key> HandledKeys { get; } = new List<Key> ();
         public int NewCommandInvokeCount { get; private set; }
 
-        public IPopoverTestClass ()
+        public PopoverTestClass ()
         {
             CanFocus = true;
-            AddCommand(Command.New, NewCommandHandler );
+            AddCommand (Command.New, NewCommandHandler!);
             HotKeyBindings.Add (Key.N.WithCtrl, Command.New);
 
             bool? NewCommandHandler (ICommandContext ctx)
@@ -159,5 +161,8 @@ protected override bool OnKeyDown (Key key)
             HandledKeys.Add (key);
             return false;
         }
+
+        /// <inheritdoc />
+        public Toplevel? Toplevel { get; set; }
     }
 }
diff --git a/Tests/UnitTestsParallelizable/Configuration/AttributeJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/AttributeJsonConverterTests.cs
new file mode 100644
index 0000000000..356d920fc8
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/AttributeJsonConverterTests.cs
@@ -0,0 +1,89 @@
+using System.Text.Json;
+using Moq;
+using UnitTests;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class AttributeJsonConverterTests
+{
+    public static readonly JsonSerializerOptions JsonOptions = new ()
+    {
+        Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
+    };
+
+    [Fact]
+    public void TestDeserialize ()
+    {
+        // Test deserializing from human-readable color names
+        var json = "{\"Foreground\":\"Blue\",\"Background\":\"Green\"}";
+        var attribute = JsonSerializer.Deserialize<Attribute> (json, JsonOptions);
+        Assert.Equal (Color.Blue, attribute.Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (Color.Green, attribute.Background.GetClosestNamedColor16 ());
+
+        // Test deserializing from RGB values
+        json = "{\"Foreground\":\"rgb(255,0,0)\",\"Background\":\"rgb(0,255,0)\"}";
+        attribute = JsonSerializer.Deserialize<Attribute> (json, JsonOptions);
+        Assert.Equal (Color.Red, attribute.Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (Color.BrightGreen, attribute.Background.GetClosestNamedColor16 ());
+    }
+
+
+    [Fact]
+    public void Deserialize_TextStyle ()
+    {
+        var justStyleJson = "\"Bold\"";
+        TextStyle textStyle = JsonSerializer.Deserialize<TextStyle> (justStyleJson, JsonOptions);
+        Assert.Equal (TextStyle.Bold, textStyle);
+
+        justStyleJson = "\"Bold,Underline\"";
+        textStyle = JsonSerializer.Deserialize<TextStyle> (justStyleJson, JsonOptions);
+        Assert.Equal (TextStyle.Bold | TextStyle.Underline, textStyle);
+
+        var json = "{\"Foreground\":\"Blue\",\"Background\":\"Green\",\"Style\":\"Bold\"}";
+        Attribute attribute = JsonSerializer.Deserialize<Attribute> (json, JsonOptions);
+        Assert.Equal (TextStyle.Bold, attribute.Style);
+    }
+
+
+    [Fact]
+    public void TestSerialize ()
+    {
+        // Test serializing to human-readable color names
+        var attribute = new Attribute (Color.Blue, Color.Green);
+        string json = JsonSerializer.Serialize (attribute, JsonOptions);
+        Assert.Equal ("{\"Foreground\":\"Blue\",\"Background\":\"Green\"}", json);
+    }
+
+    [Fact]
+    public void Serialize_TextStyle ()
+    {
+        // Test serializing to human-readable color names
+        var attribute = new Attribute (Color.Blue, Color.Green, TextStyle.Bold);
+        string json = JsonSerializer.Serialize (attribute, JsonOptions);
+        Assert.Equal ("{\"Foreground\":\"Blue\",\"Background\":\"Green\",\"Style\":\"Bold\"}", json);
+
+        attribute = new Attribute (Color.Blue, Color.Green, TextStyle.Bold | TextStyle.Italic);
+        json = JsonSerializer.Serialize (attribute, JsonOptions);
+        Assert.Equal ("{\"Foreground\":\"Blue\",\"Background\":\"Green\",\"Style\":\"Bold, Italic\"}", json);
+
+    }
+
+    [Fact]
+    public void JsonRoundTrip_PreservesEquality ()
+    {
+        Attribute original = new (Color.Red, Color.Green, TextStyle.None);
+
+        string json = JsonSerializer.Serialize (original, new JsonSerializerOptions
+        {
+            Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
+        });
+
+        Attribute roundTripped = JsonSerializer.Deserialize<Attribute> (json, new JsonSerializerOptions
+        {
+            Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
+        })!;
+
+        Assert.Equal (original, roundTripped); // ✅ This should pass if all fields are faithfully round-tripped
+    }
+
+}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/ColorJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/ColorJsonConverterTests.cs
similarity index 94%
rename from Tests/UnitTests/Configuration/ColorJsonConverterTests.cs
rename to Tests/UnitTestsParallelizable/Configuration/ColorJsonConverterTests.cs
index ed06432d71..46fa7102b6 100644
--- a/Tests/UnitTests/Configuration/ColorJsonConverterTests.cs
+++ b/Tests/UnitTestsParallelizable/Configuration/ColorJsonConverterTests.cs
@@ -1,10 +1,14 @@
-using System.Text;
-using System.Text.Json;
+using System.Text.Json;
 
 namespace Terminal.Gui.ConfigurationTests;
 
 public class ColorJsonConverterTests
 {
+    public static readonly JsonSerializerOptions JsonOptions = new ()
+    {
+        Converters = { new AttributeJsonConverter (), new ColorJsonConverter () }
+    };
+
     [Theory]
     [InlineData ("\"#000000\"", 0, 0, 0)]
     public void DeserializesFromHexCode (string hexCode, int r, int g, int b)
@@ -43,10 +47,10 @@ public void DeserializesFromRgb (string rgb, int r, int g, int b)
     [InlineData (ColorName16.Black, "Black")]
     [InlineData (ColorName16.Blue, "Blue")]
     [InlineData (ColorName16.Green, "Green")]
-    [InlineData (ColorName16.Cyan, "Cyan")]
+    [InlineData (ColorName16.Cyan, "Aqua")] // W3C+ Standard overrides
     [InlineData (ColorName16.Gray, "Gray")]
     [InlineData (ColorName16.Red, "Red")]
-    [InlineData (ColorName16.Magenta, "Magenta")]
+    [InlineData (ColorName16.Magenta, "Fuchsia")]   // W3C+ Standard overrides
     [InlineData (ColorName16.Yellow, "Yellow")]
     [InlineData (ColorName16.DarkGray, "DarkGray")]
     [InlineData (ColorName16.BrightBlue, "BrightBlue")]
@@ -106,7 +110,7 @@ public void TestColorDeserializationFromHumanReadableColorName16 (string colorNa
         var json = $"\"{colorName}\"";
 
         // Act
-        var actualColor = JsonSerializer.Deserialize<Color> (json, ConfigurationManagerTests._jsonOptions);
+        var actualColor = JsonSerializer.Deserialize<Color> (json, JsonOptions);
 
         // Assert
         Assert.Equal (new Color (expectedColor), actualColor);
diff --git a/Tests/UnitTestsParallelizable/Configuration/ConfigPropertyTests.cs b/Tests/UnitTestsParallelizable/Configuration/ConfigPropertyTests.cs
new file mode 100644
index 0000000000..b686659a70
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/ConfigPropertyTests.cs
@@ -0,0 +1,99 @@
+using System.Collections.Concurrent;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ConfigPropertyTests
+{
+    private class Dummy
+    {
+        public string Value { get; set; } = string.Empty;
+    }
+
+    [Fact]
+    public void PropertyValue_CanBeSetAndReadConcurrently ()
+    {
+        var propertyInfo = typeof (Dummy).GetProperty (nameof (Dummy.Value));
+        var configProperty = new ConfigProperty { PropertyInfo = propertyInfo };
+
+        int numTasks = 20;
+        var values = new string [numTasks];
+        for (int i = 0; i < numTasks; i++)
+        {
+            values [i] = $"Value_{i}";
+        }
+
+        Parallel.For (0, numTasks, i =>
+                                   {
+                                       configProperty.PropertyValue = values [i];
+                                       // Remove the per-thread assertion, as it is not valid in a concurrent context.
+                                       // Optionally, you can check that the value is one of the expected values:
+                                       var currentValue = configProperty.PropertyValue as string;
+                                       Assert.Contains (currentValue, values);
+                                   });
+    }
+
+
+    [Fact]
+    public void UpdateFrom_CanBeCalledConcurrently ()
+    {
+        var propertyInfo = typeof (Dummy).GetProperty (nameof (Dummy.Value));
+        var configProperty = new ConfigProperty { PropertyInfo = propertyInfo, PropertyValue = "Initial" };
+
+        int numTasks = 20;
+        Parallel.For (0, numTasks, i =>
+                                   {
+                                       var newValue = $"Thread_{i}";
+                                       configProperty.UpdateFrom (newValue);
+                                   });
+
+        var finalValue = configProperty.PropertyValue as string;
+        Assert.StartsWith ("Thread_", finalValue);
+    }
+
+
+    [Fact]
+    public void DeepCloner_DeepClone_IsThreadSafe ()
+    {
+        var propertyInfo = typeof (Dummy).GetProperty (nameof (Dummy.Value));
+        var configProperty = new ConfigProperty { PropertyInfo = propertyInfo, PropertyValue = "DeepCloneValue" };
+
+        int numTasks = 20;
+        Parallel.For (0, numTasks, i =>
+        {
+            var clone = DeepCloner.DeepClone (configProperty);
+            Assert.NotSame (configProperty, clone);
+            Assert.Equal ("DeepCloneValue", clone.PropertyValue);
+        });
+    }
+
+    [Fact]
+    public void ConcurrentDictionary_UpdateFrom_IsThreadSafe ()
+    {
+        var propertyInfo = typeof (Dummy).GetProperty (nameof (Dummy.Value));
+        var destinationDict = new ConcurrentDictionary<string, ConfigProperty> (StringComparer.InvariantCultureIgnoreCase);
+        destinationDict.TryAdd ("prop1", new ConfigProperty { PropertyValue = "Original", HasValue = true });
+
+        var configProperty = new ConfigProperty
+        {
+            PropertyInfo = propertyInfo,
+            PropertyValue = destinationDict
+        };
+
+        int numTasks = 20;
+        Parallel.For (0, numTasks, i =>
+        {
+            var sourceDict = new ConcurrentDictionary<string, ConfigProperty> (StringComparer.InvariantCultureIgnoreCase);
+            sourceDict.TryAdd ($"prop{i}", new ConfigProperty { PropertyValue = $"Value_{i}", HasValue = true });
+            configProperty.UpdateFrom (sourceDict);
+        });
+
+        var resultDict = configProperty.PropertyValue as ConcurrentDictionary<string, ConfigProperty>;
+        Assert.NotNull (resultDict);
+        for (int i = 0; i < numTasks; i++)
+        {
+            Assert.True (resultDict!.ContainsKey ($"prop{i}"));
+            Assert.Equal ($"Value_{i}", resultDict [$"prop{i}"].PropertyValue);
+        }
+        Assert.True (resultDict!.ContainsKey ("prop1"));
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs b/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs
new file mode 100644
index 0000000000..714b9b6b64
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/ConfigurationMangerTests.cs
@@ -0,0 +1,21 @@
+#nullable enable
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ConfigurationManagerTests
+{
+    [ConfigurationProperty (Scope = typeof (CMTestsScope))]
+    public static bool? TestProperty { get; set; }
+
+    private class CMTestsScope : Scope<CMTestsScope>
+    {
+    }
+
+    [Fact]
+    public void GetConfigPropertiesByScope_Gets ()
+    {
+        var props = ConfigurationManager.GetUninitializedConfigPropertiesByScope ("CMTestsScope");
+
+        Assert.NotNull (props);
+        Assert.NotEmpty (props);
+    }
+}
diff --git a/Tests/UnitTests/Configuration/SerializableConfigurationPropertyTests.cs b/Tests/UnitTestsParallelizable/Configuration/ConfigurationPropertyAttributeTests.cs
similarity index 86%
rename from Tests/UnitTests/Configuration/SerializableConfigurationPropertyTests.cs
rename to Tests/UnitTestsParallelizable/Configuration/ConfigurationPropertyAttributeTests.cs
index 6402650da0..d76e88e226 100644
--- a/Tests/UnitTests/Configuration/SerializableConfigurationPropertyTests.cs
+++ b/Tests/UnitTestsParallelizable/Configuration/ConfigurationPropertyAttributeTests.cs
@@ -6,14 +6,14 @@
 
 namespace Terminal.Gui.ConfigurationTests;
 
-public class SerializableConfigurationPropertyTests
+public class ConfigurationPropertyAttributeTests
 {
 
     /// <summary>
     ///     If this test fails, you need to add a new property to <see cref="SourceGenerationContext"/> to support serialization of the new property type.
     /// </summary>
     [Fact]
-    public void Test_SerializableConfigurationProperty_Types_Added_To_JsonSerializerContext ()
+    public void Verify_Types_Added_To_JsonSerializerContext ()
     {
         // The assembly containing the types to inspect
         var assembly = Assembly.GetAssembly (typeof (SourceGenerationContext));
@@ -21,12 +21,12 @@ public void Test_SerializableConfigurationProperty_Types_Added_To_JsonSerializer
         // Get all types from the assembly
         var types = assembly!.GetTypes ();
 
-        // Find all properties with the SerializableConfigurationProperty attribute
+        // Find all properties with the [ConfigurationProperty] attribute
         var properties = new List<PropertyInfo> ();
         foreach (var type in types)
         {
             properties.AddRange (type.GetProperties ().Where (p =>
-                p.GetCustomAttributes (typeof (SerializableConfigurationProperty), false).Any ()));
+                p.GetCustomAttributes (typeof (ConfigurationPropertyAttribute), false).Any ()));
         }
 
         // Get the types of the properties
@@ -64,6 +64,17 @@ public void Test_SerializableConfigurationProperty_Types_Added_To_JsonSerializer
         }
     }
 
+
+    [Fact]
+    public void OmitClassName_Omits ()
+    {
+        // Color.Schemes is serialized as "Schemes", not "Colors.Schemes"
+        PropertyInfo pi = typeof (SchemeManager).GetProperty ("Schemes")!;
+        var scp = (ConfigurationPropertyAttribute)pi!.GetCustomAttribute (typeof (ConfigurationPropertyAttribute))!;
+        Assert.True (scp!.Scope == typeof (ThemeScope));
+        Assert.True (scp.OmitClassName);
+    }
+
     private static IEnumerable<Type> GetRegisteredTypes (Type contextType)
     {
         // Use reflection to find which types are registered in the JsonSerializerContext
diff --git a/Tests/UnitTestsParallelizable/Configuration/DeepClonerTests.cs b/Tests/UnitTestsParallelizable/Configuration/DeepClonerTests.cs
new file mode 100644
index 0000000000..010019e600
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/DeepClonerTests.cs
@@ -0,0 +1,673 @@
+#nullable enable
+
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Text;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+/// <summary>
+///     Unit tests for the <see cref="DeepCloner"/> class, ensuring robust deep cloning for
+///     Terminal.Gui's configuration system.
+/// </summary>
+public class DeepClonerTests
+{
+    // Test classes for complex scenarios
+    private class SimpleValueType
+    {
+        public int Number { get; set; }
+        public bool Flag { get; init; }
+    }
+
+    private class SimpleReferenceType
+    {
+        public string? Name { get; set; }
+        public int Count { get; set; }
+
+        public override bool Equals (object? obj) { return obj is SimpleReferenceType other && Name == other.Name && Count == other.Count; }
+
+        // ReSharper disable twice NonReadonlyMemberInGetHashCode
+        public override int GetHashCode () { return HashCode.Combine (Name, Count); }
+    }
+
+    private class CollectionContainer
+    {
+        public List<string>? Strings { get; init; }
+        public Dictionary<string, int>? Counts { get; init; }
+        public int []? Numbers { get; init; }
+    }
+
+    private class NestedObject
+    {
+        public SimpleReferenceType? Inner { get; init; }
+        public List<SimpleValueType>? Values { get; init; }
+    }
+
+    private class CircularReference
+    {
+        public CircularReference? Self { get; set; }
+        public string? Name { get; set; }
+    }
+
+    private class ConfigPropertyMock
+    {
+        public object? PropertyValue { get; init; }
+        public bool Immutable { get; init; }
+    }
+
+    private class SettingsScopeMock : Dictionary<string, ConfigPropertyMock>
+    {
+        public string? Theme { get; set; }
+    }
+
+    private class ComplexKey
+    {
+        public int Id { get; init; }
+        public override bool Equals (object? obj) { return obj is ComplexKey key && Id == key.Id; }
+
+        public override int GetHashCode () { return Id.GetHashCode (); }
+    }
+
+    private class KeyEqualityComparer : IEqualityComparer<Key>
+    {
+        public bool Equals (Key? x, Key? y) { return x?.KeyCode == y?.KeyCode; }
+
+        public int GetHashCode (Key obj) { return obj.KeyCode.GetHashCode (); }
+    }
+
+    // Fundamentals
+
+    [Fact]
+    public void Null_ReturnsNull ()
+    {
+        object? source = null;
+        object? result = DeepCloner.DeepClone (source);
+
+        Assert.Null (result);
+    }
+
+    [Fact]
+    public void SimpleValueType_ReturnsEqualValue ()
+    {
+        var source = 42;
+        int result = DeepCloner.DeepClone (source);
+
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void String_ReturnsSameString ()
+    {
+        var source = "Hello";
+        string? result = DeepCloner.DeepClone (source);
+
+        Assert.Equal (source, result);
+        Assert.Same (source, result); // Strings are immutable
+    }
+
+    [Fact]
+    public void Rune_ReturnsEqualRune ()
+    {
+        Rune source = new ('A');
+        Rune result = DeepCloner.DeepClone (source);
+
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void Key_CreatesDeepCopy ()
+    {
+        Key? source = new (KeyCode.A);
+        source.Handled = true;
+        Key? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.KeyCode, result.KeyCode);
+        Assert.Equal (source.Handled, result.Handled);
+
+        // Modify result, ensure source unchanged
+        result.Handled = false;
+        Assert.True (source.Handled);
+    }
+
+    [Fact]
+    public void Enum_ReturnsEqualEnum ()
+    {
+        var source = DayOfWeek.Monday;
+        DayOfWeek result = DeepCloner.DeepClone (source);
+
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void Boolean_ReturnsEqualValue ()
+    {
+        var source = true;
+        bool result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+
+        source = false;
+        result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void Attribute_ReturnsEqualValue ()
+    {
+        var source = new Attribute (Color.Black);
+        Attribute result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+
+        source = new (Color.White);
+        result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void Scheme_Normal_Set_ReturnsEqualValue ()
+    {
+        var source = new Scheme (new Scheme (new Attribute (Color.Red, Color.Green, TextStyle.Bold)));
+        Scheme? result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+
+        source = new Scheme (new Scheme ());
+        result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+    }
+
+    [Fact]
+    public void Scheme_All_Set_ReturnsEqualValue ()
+    {
+        Scheme? source = new ()
+        {
+            Normal = new ("LightGray", "RaisinBlack", TextStyle.None), 
+            Focus = new ("White", "DarkGray", TextStyle.None), 
+            HotNormal = new ("Silver", "RaisinBlack", TextStyle.Underline), 
+            Disabled = new ("DarkGray", "RaisinBlack", TextStyle.Faint), 
+            HotFocus = new ("White", "Green", TextStyle.Underline), 
+            Active = new ("White", "Charcoal", TextStyle.Bold), 
+            HotActive = new ("White", "Charcoal", TextStyle.Underline | TextStyle.Bold),
+            Highlight = new ("White", "Onyx", TextStyle.None), 
+            Editable = new ("LightYellow", "RaisinBlack", TextStyle.None),
+            ReadOnly = new ("Gray", "RaisinBlack", TextStyle.Italic) 
+        };
+        Scheme? result = DeepCloner.DeepClone (source);
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Normal, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out _));
+        Assert.True (source.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out _));
+
+        Assert.Equal (source, result);
+
+        source = new Scheme (new Scheme ());
+        result = DeepCloner.DeepClone (source);
+        Assert.Equal (source, result);
+    }
+
+    // Simple Reference Types
+
+    [Fact]
+    public void SimpleReferenceType_CreatesDeepCopy ()
+    {
+        SimpleReferenceType? source = new () { Name = "Test", Count = 10 };
+        SimpleReferenceType? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.Name, result!.Name);
+        Assert.Equal (source.Count, result.Count);
+        Assert.True (source.Equals (result)); // Verify Equals method
+        Assert.Equal (source.GetHashCode (), result.GetHashCode ()); // Verify GetHashCode
+
+        // Modify result, ensure source unchanged
+        result.Name = "Modified";
+        result.Count = 20;
+        Assert.Equal ("Test", source.Name);
+        Assert.Equal (10, source.Count);
+    }
+
+    // Collections
+
+    [Fact]
+    public void List_CreatesDeepCopy ()
+    {
+        List<string>? source = new () { "One", "Two" };
+        List<string>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result);
+
+        // Modify result, ensure source unchanged
+        result!.Add ("Three");
+        Assert.Equal (2, source.Count);
+        Assert.Equal (3, result.Count);
+    }
+
+    [Fact]
+    public void Dictionary_CreatesDeepCopy ()
+    {
+        Dictionary<string, int>? source = new () { { "A", 1 }, { "B", 2 } };
+        Dictionary<string, int>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result);
+
+        // Modify result, ensure source unchanged
+        result! ["C"] = 3;
+        Assert.Equal (2, source.Count);
+        Assert.Equal (3, result.Count);
+    }
+
+    [Fact]
+    public void Dictionary_CreatesDeepCopy_Including_Comparer_Options ()
+    {
+        Dictionary<string, int>? source = new (StringComparer.InvariantCultureIgnoreCase) { { "A", 1 }, { "B", 2 } };
+        Dictionary<string, int>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result);
+        Assert.Equal (source.Comparer, result.Comparer);
+
+        // Modify result, ensure source unchanged
+        result! ["C"] = 3;
+        Assert.Equal (2, source.Count);
+        Assert.Equal (3, result.Count);
+
+        Assert.Contains ("A", result);
+        Assert.Contains ("a", result);
+    }
+
+    [Fact]
+    public void Dictionary_CreatesDeepCopy_WithCapacity ()
+    {
+        // Arrange: Create a dictionary with a specific capacity
+        Dictionary<string, int> source = new (100) // Set initial capacity to 100
+        {
+            { "Key1", 1 },
+            { "Key2", 2 }
+        };
+
+        // Act: Clone the dictionary
+        Dictionary<string, int>? result = DeepCloner.DeepClone (source);
+
+        // Assert: Verify the dictionary was cloned correctly
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result); // Verify key-value pairs are cloned
+
+        // Verify that the capacity is preserved (if supported)
+        Assert.True (result.Count <= result.EnsureCapacity (0)); // EnsureCapacity(0) returns the current capacity
+        Assert.True (source.Count <= source.EnsureCapacity (0)); // EnsureCapacity(0) returns the current capacity
+    }
+
+    [Fact]
+    public void ConcurrentDictionary_CreatesDeepCopy ()
+    {
+        ConcurrentDictionary<string, int>? source = new (new Dictionary<string, int> () { { "A", 1 }, { "B", 2 } });
+        ConcurrentDictionary<string, int>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result);
+
+        // Modify result, ensure source unchanged
+        result! ["C"] = 3;
+        Assert.Equal (2, source.Count);
+        Assert.Equal (3, result.Count);
+    }
+
+    [Fact]
+    public void Array_CreatesDeepCopy ()
+    {
+        int []? source = { 1, 2, 3 };
+        int []? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source, result);
+
+        // Modify result, ensure source unchanged
+        result! [0] = 99;
+        Assert.Equal (1, source [0]);
+        Assert.Equal (99, result [0]);
+    }
+
+    [Fact]
+    public void ImmutableList_ThrowsNotSupported ()
+    {
+        ImmutableList<string> source = ImmutableList.Create ("One", "Two");
+        Assert.Throws<NotSupportedException> (() => DeepCloner.DeepClone (source));
+    }
+
+    [Fact]
+    public void ImmutableDictionary_ThrowsNotSupported ()
+    {
+        ImmutableDictionary<string, int> source = ImmutableDictionary.Create<string, int> ().Add ("A", 1);
+        Assert.Throws<NotSupportedException> (() => DeepCloner.DeepClone (source));
+    }
+
+    [Fact]
+    public void Dictionary_SourceAddsItem_ClonesCorrectly ()
+    {
+        Dictionary<string, Attribute>? source = new ()
+        {
+            { "Disabled", new (Color.White) },
+            { "Normal", new (Color.Blue) }
+        };
+        Dictionary<string, Attribute>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (2, result.Count);
+        Assert.Equal ((Attribute)source ["Disabled"], (Attribute)result ["Disabled"]);
+        Assert.Equal (source ["Normal"], result ["Normal"]);
+    }
+
+    [Fact]
+    public void Dictionary_SourceUpdatesOneItem_ClonesCorrectly ()
+    {
+        Dictionary<string, Attribute>? source = new () { { "Disabled", new (Color.White) } };
+        Dictionary<string, Attribute>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Single (result);
+        Assert.Equal (source ["Disabled"], result ["Disabled"]);
+    }
+
+    [Fact]
+    public void Dictionary_WithComplexKeys_ClonesCorrectly ()
+    {
+        Dictionary<ComplexKey, string>? source = new ()
+        {
+            { new() { Id = 1 }, "Value1" }
+        };
+        Dictionary<ComplexKey, string>? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.Keys.First ().Id, result.Keys.First ().Id);
+        Assert.Equal (source.Values.First (), result.Values.First ());
+    }
+
+    [Fact]
+    public void Dictionary_WithCustomKeyComparer_ClonesCorrectly ()
+    {
+        Dictionary<Key, string> source = new (new KeyEqualityComparer ())
+        {
+            { new (KeyCode.Esc), "Esc" }
+        };
+        Dictionary<Key, string> result = DeepCloner.DeepClone (source)!;
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Single (result);
+        Assert.True (result.ContainsKey (new (KeyCode.Esc)));
+        Assert.Equal ("Esc", result [new (KeyCode.Esc)]);
+
+        // Modify result, ensure source unchanged
+        result [new (KeyCode.Q)] = "Q";
+        Assert.False (source.ContainsKey (new (KeyCode.Q)));
+    }
+
+    // Nested Objects
+
+    [Fact]
+    public void CollectionContainer_CreatesDeepCopy ()
+    {
+        CollectionContainer? source = new ()
+        {
+            Strings = ["A", "B"],
+            Counts = new () { { "X", 1 }, { "Y", 2 } },
+            Numbers = [10, 20]
+        };
+        CollectionContainer? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.NotSame (source.Strings, result!.Strings);
+        Assert.NotSame (source.Counts, result.Counts);
+        Assert.NotSame (source.Numbers, result.Numbers);
+        Assert.Equal (source.Strings, result.Strings);
+        Assert.Equal (source.Counts, result.Counts);
+        Assert.Equal (source.Numbers, result.Numbers);
+
+        // Modify result, ensure source unchanged
+        result.Strings!.Add ("C");
+        result.Counts! ["Z"] = 3;
+        result.Numbers! [0] = 99;
+        Assert.Equal (2, source.Strings.Count);
+        Assert.Equal (2, source.Counts.Count);
+        Assert.Equal (10, source.Numbers [0]);
+    }
+
+    [Fact]
+    public void NestedObject_CreatesDeepCopy ()
+    {
+        NestedObject? source = new ()
+        {
+            Inner = new () { Name = "Inner", Count = 5 },
+            Values = new ()
+            {
+                new() { Number = 1, Flag = true },
+                new() { Number = 2, Flag = false }
+            }
+        };
+        NestedObject? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.NotSame (source.Inner, result!.Inner);
+        Assert.NotSame (source.Values, result.Values);
+        Assert.Equal (source.Inner!.Name, result.Inner!.Name);
+        Assert.Equal (source.Inner.Count, result.Inner.Count);
+        Assert.Equal (source.Values! [0].Number, result.Values! [0].Number);
+        Assert.Equal (source.Values [0].Flag, result.Values [0].Flag);
+
+        // Modify result, ensure source unchanged
+        result.Inner.Name = "Modified";
+        result.Values [0].Number = 99;
+        Assert.Equal ("Inner", source.Inner.Name);
+        Assert.Equal (1, source.Values [0].Number);
+    }
+
+    // Circular References
+
+    [Fact]
+    public void CircularReference_HandlesCorrectly ()
+    {
+        CircularReference? source = new () { Name = "Cycle" };
+        source.Self = source; // Create circular reference
+        CircularReference? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.Name, result!.Name);
+        Assert.NotNull (result.Self);
+        Assert.Same (result, result.Self); // Circular reference preserved
+        Assert.NotSame (source.Self, result.Self);
+
+        // Modify result, ensure source unchanged
+        result.Name = "Modified";
+        Assert.Equal ("Cycle", source.Name);
+    }
+
+    // Terminal.Gui-Specific Types
+
+    [Fact]
+    public void ConfigPropertyMock_CreatesDeepCopy ()
+    {
+        ConfigPropertyMock? source = new ()
+        {
+            PropertyValue = new List<string> { "Red", "Blue" },
+            Immutable = true
+        };
+        ConfigPropertyMock? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.NotSame (source.PropertyValue, result!.PropertyValue);
+        Assert.Equal ((List<string>)source.PropertyValue, (List<string>)result.PropertyValue!);
+        Assert.Equal (source.Immutable, result.Immutable);
+
+        // Modify result, ensure source unchanged
+        ((List<string>)result.PropertyValue!).Add ("Green");
+        Assert.Equal (2, ((List<string>)source.PropertyValue).Count);
+    }
+
+    [Fact]
+    public void ConfigProperty_CreatesDeepCopy ()
+    {
+        ConfigProperty? source = ConfigProperty.CreateImmutableWithAttributeInfo (CM.GetHardCodedConfigPropertyCache ()! ["Application.QuitKey"].PropertyInfo!);
+        source.Immutable = false;
+        source.PropertyValue = Key.A;
+        ConfigProperty? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotNull (result.PropertyInfo);
+        Assert.NotSame (source, result);
+        Assert.NotSame (source.PropertyValue, result!.PropertyValue);
+        // PropertyInfo is effectively a simple type
+        Assert.Same (source.PropertyInfo, result!.PropertyInfo);
+        Assert.Equal (source.Immutable, result.Immutable);
+    }
+
+    [Fact]
+    public void SettingsScopeMockWithKey_CreatesDeepCopy ()
+    {
+        SettingsScopeMock? source = new ()
+        {
+            Theme = "Dark",
+            ["KeyBinding"] = new () { PropertyValue = new Key (KeyCode.A) { Handled = true } },
+            ["Counts"] = new () { PropertyValue = new Dictionary<string, int> { { "X", 1 } } }
+        };
+        SettingsScopeMock? result = DeepCloner.DeepClone (source);
+
+        Assert.NotNull (result);
+        Assert.NotSame (source, result);
+        Assert.Equal (source.Theme, result!.Theme);
+        Assert.NotSame (source ["KeyBinding"], result ["KeyBinding"]);
+        Assert.NotSame (source ["Counts"], result ["Counts"]);
+
+        ConfigPropertyMock clonedKeyProp = result ["KeyBinding"];
+        var clonedKey = (Key)clonedKeyProp.PropertyValue!;
+        Assert.NotSame (source ["KeyBinding"].PropertyValue, clonedKey);
+        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).KeyCode, clonedKey.KeyCode);
+        Assert.Equal (((Key)source ["KeyBinding"].PropertyValue!).Handled, clonedKey.Handled);
+
+        Assert.Equal ((Dictionary<string, int>)source ["Counts"].PropertyValue!, (Dictionary<string, int>)result ["Counts"].PropertyValue!);
+
+        // Modify result, ensure source unchanged
+        result.Theme = "Light";
+        clonedKey.Handled = false;
+        ((Dictionary<string, int>)result ["Counts"].PropertyValue!).Add ("Y", 2);
+        Assert.Equal ("Dark", source.Theme);
+        Assert.True (((Key)source ["KeyBinding"].PropertyValue!).Handled);
+        Assert.Single ((Dictionary<string, int>)source ["Counts"].PropertyValue!);
+    }
+
+    [Fact]
+    public void ThemeScopeList_WithThemes_ClonesSuccessfully ()
+    {
+        // Arrange: Create a ThemeScope and verify a property exists
+        var defaultThemeScope = new ThemeScope ();
+        defaultThemeScope.LoadHardCodedDefaults ();
+        Assert.True (defaultThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
+
+        var darkThemeScope = new ThemeScope ();
+        darkThemeScope.LoadHardCodedDefaults ();
+        Assert.True (darkThemeScope.ContainsKey ("Button.DefaultHighlightStyle"));
+
+        // Create a Themes list with two themes
+        List<Dictionary<string, ThemeScope>> themesList =
+        [
+            new () { { "Default", defaultThemeScope } },
+            new () { { "Dark", darkThemeScope } }
+        ];
+
+        // Create a SettingsScope and set the Themes property
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+        settingsScope ["Themes"].PropertyValue = themesList;
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+        var resultScope = (SettingsScope)result;
+        Assert.True (resultScope.ContainsKey ("Themes"));
+
+        Assert.NotNull (resultScope ["Themes"].PropertyValue);
+
+        List<Dictionary<string, ThemeScope>> clonedThemes = (List<Dictionary<string, ThemeScope>>)resultScope ["Themes"].PropertyValue!;
+        Assert.Equal (2, clonedThemes.Count);
+    }
+
+    [Fact]
+    public void Empty_SettingsScope_ClonesSuccessfully ()
+    {
+        // Arrange: Create a SettingsScope 
+        var settingsScope = new SettingsScope ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+
+        Assert.True (result.ContainsKey ("Themes"));
+    }
+
+    [Fact]
+    public void SettingsScope_With_Themes_Set_ClonesSuccessfully ()
+    {
+        // Arrange: Create a SettingsScope 
+        var settingsScope = new SettingsScope ();
+        Assert.True (settingsScope.ContainsKey ("Themes"));
+
+        settingsScope ["Themes"].PropertyValue = new List<Dictionary<string, ThemeScope>>
+        {
+            new() { { "Default", new () } },
+            new() { { "Dark", new () } }
+        };
+
+        // Act
+        SettingsScope? result = DeepCloner.DeepClone (settingsScope);
+
+        // Assert
+        Assert.NotNull (result);
+        Assert.IsType<SettingsScope> (result);
+        Assert.True (result.ContainsKey ("Themes"));
+        Assert.NotNull (result ["Themes"].PropertyValue);
+    }
+
+    [Fact]
+    public void LargeObject_PerformsWithinLimit ()
+    {
+        List<int> source = new (Enumerable.Range (1, 10000));
+        var stopwatch = Stopwatch.StartNew ();
+        List<int> result = DeepCloner.DeepClone (source)!;
+        stopwatch.Stop ();
+
+        Assert.Equal (source, result);
+        Assert.True (stopwatch.ElapsedMilliseconds < 1000); // Ensure it completes within 1 second
+    }
+
+}
diff --git a/Tests/UnitTests/Configuration/KeyCodeJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/KeyCodeJsonConverterTests.cs
similarity index 100%
rename from Tests/UnitTests/Configuration/KeyCodeJsonConverterTests.cs
rename to Tests/UnitTestsParallelizable/Configuration/KeyCodeJsonConverterTests.cs
diff --git a/Tests/UnitTestsParallelizable/Configuration/KeyJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/KeyJsonConverterTests.cs
new file mode 100644
index 0000000000..1ca1aa8d5b
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/KeyJsonConverterTests.cs
@@ -0,0 +1,78 @@
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Unicode;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class KeyJsonConverterTests
+{
+    [Theory]
+    [InlineData (KeyCode.A, "\"a\"")]
+    [InlineData ((KeyCode)'â', "\"â\"")]
+    [InlineData (KeyCode.A | KeyCode.ShiftMask, "\"A\"")]
+    [InlineData (KeyCode.A | KeyCode.CtrlMask, "\"Ctrl+A\"")]
+    [InlineData (KeyCode.A | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt+A\"")]
+    [InlineData (KeyCode.Delete | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt+Delete\"")]
+    [InlineData (KeyCode.D4, "\"4\"")]
+    [InlineData (KeyCode.Esc, "\"Esc\"")]
+    [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "\"Ctrl+Alt++\"")]
+    public void TestKey_Serialize (KeyCode key, string expected)
+    {
+        // Arrange
+        var options = new JsonSerializerOptions ();
+        options.Converters.Add (new KeyJsonConverter ());
+        options.Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping;
+
+        // Act
+        string json = JsonSerializer.Serialize ((Key)key, options);
+
+        // Assert
+        Assert.Equal (expected, json);
+    }
+
+    [Theory]
+    [InlineData (KeyCode.A, "a")]
+    [InlineData (KeyCode.A | KeyCode.ShiftMask, "A")]
+    [InlineData (KeyCode.A | KeyCode.CtrlMask, "Ctrl+A")]
+    [InlineData (KeyCode.A | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt+A")]
+    [InlineData (KeyCode.Delete | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt+Delete")]
+    [InlineData (KeyCode.D4, "4")]
+    [InlineData (KeyCode.Esc, "Esc")]
+    [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt++")]
+    public void TestKeyRoundTripConversion (KeyCode key, string expectedStringTo)
+    {
+        // Arrange
+
+        // Act
+        string json = JsonSerializer.Serialize ((Key)key, ConfigurationManager.SerializerContext.Options);
+        var deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerContext.Options);
+
+        // Assert
+        Assert.Equal (expectedStringTo, deserializedKey.ToString ());
+    }
+
+    [Fact]
+    public void Deserialized_Key_Equals ()
+    {
+        // Arrange
+        Key key = Key.Q.WithCtrl;
+
+        // Act
+        string json = "\"Ctrl+Q\"";
+        Key deserializedKey = JsonSerializer.Deserialize<Key> (json, ConfigurationManager.SerializerContext.Options);
+
+        // Assert
+        Assert.Equal (key, deserializedKey);
+
+    }
+    [Fact]
+    public void Separator_Property_Serializes_As_Glyph ()
+    {
+        // Act
+        string json = JsonSerializer.Serialize (Key.Separator, ConfigurationManager.SerializerContext.Options);
+
+        // Assert
+        Assert.Equal ($"\"{Key.Separator}\"", json);
+    }
+}
\ No newline at end of file
diff --git a/Tests/UnitTests/Configuration/RuneJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/RuneJsonConverterTests.cs
similarity index 88%
rename from Tests/UnitTests/Configuration/RuneJsonConverterTests.cs
rename to Tests/UnitTestsParallelizable/Configuration/RuneJsonConverterTests.cs
index 17f96458c4..f06955ba4d 100644
--- a/Tests/UnitTests/Configuration/RuneJsonConverterTests.cs
+++ b/Tests/UnitTestsParallelizable/Configuration/RuneJsonConverterTests.cs
@@ -31,13 +31,13 @@ public class RuneJsonConverterTests
     public void RoundTripConversion_Negative (string rune)
     {
         // Act
-        string json = JsonSerializer.Serialize (rune, ConfigurationManager.SerializerOptions);
+        string json = JsonSerializer.Serialize (rune, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Throws<JsonException> (
                                       () => JsonSerializer.Deserialize<Rune> (
                                                                               json,
-                                                                              ConfigurationManager.SerializerOptions
+                                                                              ConfigurationManager.SerializerContext.Options
                                                                              )
                                      );
     }
@@ -61,8 +61,8 @@ public void RoundTripConversion_Positive (string rune, string expected)
         // Arrange
 
         // Act
-        string json = JsonSerializer.Serialize (rune, ConfigurationManager.SerializerOptions);
-        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerOptions);
+        string json = JsonSerializer.Serialize (rune, ConfigurationManager.SerializerContext.Options);
+        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal (expected, deserialized.ToString ());
@@ -74,7 +74,7 @@ public void Printable_Rune_Is_Serialized_As_Glyph ()
         // Arrange
 
         // Act
-        string json = JsonSerializer.Serialize ((Rune)'a', ConfigurationManager.SerializerOptions);
+        string json = JsonSerializer.Serialize ((Rune)'a', ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("\"a\"", json);
@@ -86,7 +86,7 @@ public void Non_Printable_Rune_Is_Serialized_As_u_Encoded_Value ()
         // Arrange
 
         // Act
-        string json = JsonSerializer.Serialize ((Rune)0x01, ConfigurationManager.SerializerOptions);
+        string json = JsonSerializer.Serialize ((Rune)0x01, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("\"\\u0001\"", json);
@@ -99,7 +99,7 @@ public void Json_With_Glyph_Works ()
         var json = "\"a\"";
 
         // Act
-        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("a", deserialized.ToString ());
@@ -112,7 +112,7 @@ public void Json_With_u_Encoded_Works ()
         var json = "\"\\u0061\"";
 
         // Act
-        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("a", deserialized.ToString ());
@@ -125,7 +125,7 @@ public void Json_With_U_Encoded_Works ()
         var json = "\"U+0061\"";
 
         // Act
-        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("a", deserialized.ToString ());
@@ -138,7 +138,7 @@ public void Json_With_Decimal_Works ()
         var json = "97";
 
         // Act
-        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<Rune> (json, ConfigurationManager.SerializerContext.Options);
 
         // Assert
         Assert.Equal ("a", deserialized.ToString ());
diff --git a/Tests/UnitTestsParallelizable/Configuration/SchemeJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/SchemeJsonConverterTests.cs
new file mode 100644
index 0000000000..d8620bd258
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/SchemeJsonConverterTests.cs
@@ -0,0 +1,151 @@
+using System.Text.Json;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class SchemeJsonConverterTests
+{
+    //string json = @"
+    //	{
+    //	""Schemes"": {
+    //		""Base"": {
+    //			""normal"": {
+    //				""foreground"": ""White"",
+    //				""background"": ""Blue""
+    //   		            },
+    //			""focus"": {
+    //				""foreground"": ""Black"",
+    //				""background"": ""Gray""
+    //			    },
+    //			""hotNormal"": {
+    //				""foreground"": ""BrightCyan"",
+    //				""background"": ""Blue""
+    //			    },
+    //			""hotFocus"": {
+    //				""foreground"": ""BrightBlue"",
+    //				""background"": ""Gray""
+    //			    },
+    //			""disabled"": {
+    //				""foreground"": ""DarkGray"",
+    //				""background"": ""Blue""
+    //			    }
+    //		}
+    //		}
+    //	}";
+    [Fact]
+    public void TestSchemesSerialization_Equality ()
+    {
+        // Arrange
+        var expectedScheme = new Scheme
+        {
+            Normal = new (Color.White, Color.Blue),
+            Focus = new (Color.Black, Color.Gray),
+            HotNormal = new (Color.BrightCyan, Color.Blue),
+            HotFocus = new (Color.BrightBlue, Color.Gray),
+            Active = new (Color.Gray, Color.Black),
+            HotActive = new (Color.Blue, Color.Gray),
+            Highlight = new (Color.Gray, Color.Black),
+            Editable = new (Color.Gray, Color.Black),
+            ReadOnly = new (Color.Gray, Color.Black),
+            Disabled = new (Color.Gray, Color.Black),
+        };
+
+        string serializedScheme =
+            JsonSerializer.Serialize (expectedScheme, ConfigurationManager.SerializerContext.Options);
+
+        // Act
+        var actualScheme =
+            JsonSerializer.Deserialize<Scheme> (serializedScheme, ConfigurationManager.SerializerContext.Options);
+
+        // Assert
+        Assert.Equal (expectedScheme, actualScheme);
+    }
+
+    [Fact]
+    public void TestSchemesSerialization ()
+    {
+        var expected = new Scheme
+        {
+            Normal = new (Color.White, Color.Blue),
+            Focus = new (Color.Black, Color.Gray),
+            HotNormal = new (Color.BrightCyan, Color.Blue),
+            HotFocus = new (Color.BrightBlue, Color.Gray),
+            Active = new (Color.Gray, Color.Black),
+            HotActive = new (Color.Blue, Color.Gray),
+            Highlight = new (Color.Gray, Color.Black),
+            Editable = new (Color.Gray, Color.Black),
+            ReadOnly = new (Color.Gray, Color.Black),
+            Disabled = new (Color.Gray, Color.Black),
+        };
+
+        string json = JsonSerializer.Serialize (expected, ConfigurationManager.SerializerContext.Options);
+        Scheme actual = JsonSerializer.Deserialize<Scheme> (json, ConfigurationManager.SerializerContext.Options);
+
+        Assert.NotNull (actual);
+
+        foreach (VisualRole role in Enum.GetValues<VisualRole> ())
+        {
+            Attribute expectedAttr = expected.GetAttributeForRole (role);
+            Attribute actualAttr = actual.GetAttributeForRole (role);
+
+            Assert.Equal (expectedAttr, actualAttr);
+        }
+    }
+
+    [Fact]
+    public void Deserialized_Attributes_AreExplicitlySet ()
+    {
+        const string json = """
+                            {
+                                "Normal": { "Foreground": "White", "Background": "Blue" },
+                                "Focus": { "Foreground": "Black", "Background": "Gray" },
+                                "HotNormal": { "Foreground": "BrightCyan", "Background": "Blue" },
+                                "HotFocus": { "Foreground": "BrightBlue", "Background": "Gray" },
+                                "Active": { "Foreground": "DarkGray", "Background": "Blue" },
+                                "HotActive": { "Foreground": "DarkGray", "Background": "Blue" },
+                                "Highlight": { "Foreground": "DarkGray", "Background": "Blue" },
+                                "Editable": { "Foreground": "DarkGray", "Background": "Blue" },
+                                "Readonly": { "Foreground": "DarkGray", "Background": "Blue" },
+                                "Disabled": { "Foreground": "DarkGray", "Background": "Blue" }
+                            }
+                            """;
+
+        Scheme scheme = JsonSerializer.Deserialize<Scheme> (json, ConfigurationManager.SerializerContext.Options)!;
+
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Normal, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out _));
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out _));
+    }
+
+    [Fact]
+    public void Deserialized_Attributes_NotSpecified_AreImplicit ()
+    {
+        const string json = """
+                            {
+                              "Normal": { "Foreground": "White", "Background": "Black" }
+                            }
+                            """;
+
+        Scheme scheme = JsonSerializer.Deserialize<Scheme> (json, ConfigurationManager.SerializerContext.Options)!;
+
+        // explicitly set
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Normal, out _));
+
+        // derived from Normal
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out _));
+    }
+}
\ No newline at end of file
diff --git a/Tests/UnitTestsParallelizable/Configuration/SchemeManagerTests.cs b/Tests/UnitTestsParallelizable/Configuration/SchemeManagerTests.cs
new file mode 100644
index 0000000000..060d19441f
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/SchemeManagerTests.cs
@@ -0,0 +1,117 @@
+#nullable enable
+using System.Diagnostics;
+using System.Text.Json;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class SchemeManagerTests
+{
+
+    [Fact]
+    public void GetHardCodedSchemes_Gets_HardCodedDefaults ()
+    {
+        var hardCoded = SchemeManager.GetHardCodedSchemes ();
+
+        // Check that the hardcoded schemes are not null
+        Assert.NotNull (hardCoded);
+        // Check that the hardcoded schemes are not empty
+        Assert.NotEmpty (hardCoded);
+    }
+
+    [Fact]
+    public void AddScheme_Adds_And_Updates_Scheme ()
+    {
+        // Arrange
+        var scheme = new Scheme (new Attribute (Color.Red, Color.Green));
+        string schemeName = "CustomScheme";
+
+        // Act
+        SchemeManager.AddScheme (schemeName, scheme);
+
+        // Assert
+        Assert.Equal (scheme, SchemeManager.GetScheme (schemeName));
+
+        // Update the scheme
+        var updatedScheme = new Scheme (new Attribute (Color.Blue, Color.Yellow));
+        SchemeManager.AddScheme (schemeName, updatedScheme);
+
+        Assert.Equal (updatedScheme, SchemeManager.GetScheme (schemeName));
+
+        // Cleanup
+        SchemeManager.RemoveScheme (schemeName);
+    }
+
+    [Fact]
+    public void RemoveScheme_Removes_Custom_Scheme ()
+    {
+        var scheme = new Scheme (new Attribute (Color.Red, Color.Green));
+        string schemeName = "RemovableScheme";
+        SchemeManager.AddScheme (schemeName, scheme);
+
+        Assert.Equal (scheme, SchemeManager.GetScheme (schemeName));
+
+        SchemeManager.RemoveScheme (schemeName);
+
+        Assert.Throws<KeyNotFoundException> (() => SchemeManager.GetScheme (schemeName));
+    }
+
+    [Fact]
+    public void RemoveScheme_Throws_On_BuiltIn_Scheme ()
+    {
+        // Built-in scheme name
+        Assert.Throws<InvalidOperationException> (() => SchemeManager.RemoveScheme ("Base"));
+    }
+
+    [Fact]
+    public void RemoveScheme_Throws_On_NonExistent_Scheme ()
+    {
+        Assert.Throws<InvalidOperationException> (() => SchemeManager.RemoveScheme ("DoesNotExist"));
+    }
+
+    [Fact]
+    public void GetScheme_By_Enum_Returns_Scheme ()
+    {
+        var scheme = SchemeManager.GetScheme (Schemes.Base);
+        Assert.NotNull (scheme);
+        Assert.IsType<Scheme> (scheme);
+    }
+
+    [Fact]
+    public void GetSchemeNames_Returns_All_Scheme_Names ()
+    {
+        var names = SchemeManager.GetSchemeNames ();
+        Assert.NotNull (names);
+        Assert.Contains ("Base", names);
+        Assert.Contains ("Menu", names);
+        Assert.Contains ("Dialog", names);
+        Assert.Contains ("Toplevel", names);
+        Assert.Contains ("Error", names);
+    }
+
+    [Fact]
+    public void SchemesToSchemeName_And_SchemeNameToSchemes_RoundTrip ()
+    {
+        foreach (Schemes s in Enum.GetValues (typeof (Schemes)))
+        {
+            var name = SchemeManager.SchemesToSchemeName (s);
+            Assert.NotNull (name);
+            var roundTrip = SchemeManager.SchemeNameToSchemes (name!);
+            Assert.NotNull (roundTrip);
+            Assert.Equal (name, roundTrip);
+        }
+    }
+
+    [Fact]
+    public void GetScheme_Throws_On_Invalid_Enum ()
+    {
+        // Use an invalid enum value (not defined in Schemes)
+        Assert.Throws<ArgumentException> (() => SchemeManager.GetScheme ((Schemes)999));
+    }
+
+    [Fact]
+    public void GetScheme_Throws_On_Invalid_String ()
+    {
+        Assert.Throws<KeyNotFoundException> (() => SchemeManager.GetScheme ("NotAScheme"));
+    }
+
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/ScopeJsonConverterTests.cs b/Tests/UnitTestsParallelizable/Configuration/ScopeJsonConverterTests.cs
new file mode 100644
index 0000000000..e2bf9f4cd7
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/ScopeJsonConverterTests.cs
@@ -0,0 +1,33 @@
+#nullable enable
+using System.Text.Json;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ScopeJsonConverterTests
+{
+    [Theory]
+    [InlineData ("\"ConfigurationManager.ThrowOnJsonErrors\":true")]
+    [InlineData ("\"Key.Separator\":\"@\"")]
+    [InlineData ("\"Themes\":[]")]
+    [InlineData ("\"Themes\":[{\"themeName\":{}}]")]
+    [InlineData ("\"Themes\":[{\"themeName\":{\"Dialog.DefaultButtonAlignment\":\"End\"}}]")]
+    public void RoundTripConversion_Property_Positive (string configPropertyJson)
+    {
+        // Arrange
+        string scopeJson = $"{{{configPropertyJson}}}";
+
+        // Act
+        SettingsScope? deserialized = JsonSerializer.Deserialize<SettingsScope> (scopeJson, ConfigurationManager.SerializerContext.Options);
+
+        string? json = JsonSerializer.Serialize<SettingsScope> (deserialized!, ConfigurationManager.SerializerContext.Options);
+
+        // Strip all whitespace
+        json = json.Replace (" ", string.Empty);
+        json = json.Replace ("\n", string.Empty);
+        json = json.Replace ("\r", string.Empty);
+        json = json.Replace ("\t", string.Empty);
+
+        // Assert
+        Assert.Contains (configPropertyJson, json);
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs b/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs
new file mode 100644
index 0000000000..6a8b399de7
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/ScopeTests.cs
@@ -0,0 +1,247 @@
+#nullable enable
+using System.Reflection;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ScopeTests
+{
+    [Fact]
+    public void Constructor_Scope_Is_Empty ()
+    {
+        // Arrange
+
+        // Act
+        var scope = new Scope<object> ();
+
+        // Assert
+        Assert.NotNull (scope);
+        Assert.Empty (scope);
+    }
+
+    // The property key will be "ScopeTests.BoolProperty"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsScope))]
+    public static bool? BoolProperty { get; set; } = true;
+
+    // The property key will be "ScopeTests.StringProperty"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsScope))]
+    public static string? StringProperty { get; set; } // null
+
+    // The property key will be "ScopeTests.KeyProperty"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsScope))]
+    public static Key? KeyProperty { get; set; } = Key.A;
+
+    // The property key will be "ScopeTests.DictionaryProperty"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsScope))]
+    public static Dictionary<string, ConfigProperty>? DictionaryProperty { get; set; }
+
+    public class ScopeTestsScope : Scope<ScopeTestsScope>
+    {
+    }
+
+    // The property key will be "ScopeTests.DictionaryItemProperty1"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsDictionaryItemScope))]
+    public static string? DictionaryItemProperty1 { get; set; } // null
+
+    // The property key will be "ScopeTests.DictionaryItemProperty2"
+    [ConfigurationProperty (Scope = typeof (ScopeTestsDictionaryItemScope))]
+    public static string? DictionaryItemProperty2 { get; set; } // null
+    public class ScopeTestsDictionaryItemScope : Scope<ScopeTestsDictionaryItemScope>
+    {
+    }
+
+
+    [Fact]
+    public void TestScope_Constructor_Creates_Properties ()
+    {
+        // Arrange
+
+        // Act
+        var scope = new ScopeTestsScope ();
+        scope.LoadHardCodedDefaults ();
+
+        var cache = CM.GetHardCodedConfigPropertyCache ();
+
+        Assert.NotNull (cache);
+
+        // Assert
+        Assert.NotNull (scope);
+        Assert.True (scope.ContainsKey ("ScopeTests.BoolProperty"));
+
+        Assert.Equal (typeof (ScopeTests).GetProperty ("BoolProperty"), scope ["ScopeTests.BoolProperty"].PropertyInfo);
+        Assert.True ((bool)scope ["ScopeTests.BoolProperty"].PropertyValue!);
+        Assert.True (scope ["ScopeTests.BoolProperty"].HasValue);
+
+        Assert.Equal (typeof (ScopeTests).GetProperty ("StringProperty"), scope ["ScopeTests.StringProperty"].PropertyInfo);
+        Assert.Null (scope ["ScopeTests.StringProperty"].PropertyValue);
+        Assert.True (scope ["ScopeTests.StringProperty"].HasValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_Unknown_Key_Adds ()
+    {
+        // Arrange
+        var scope = new ScopeTestsScope ();
+        scope.LoadHardCodedDefaults ();
+        var scopeWithAddedProperty = new ScopeTestsScope ();
+        scopeWithAddedProperty.TryAdd ("AddedProperty", new ConfigProperty ()
+        {
+            Immutable = false,
+            PropertyInfo = scope ["ScopeTests.BoolProperty"].PropertyInfo, // cheat and reuse the same PropertyInfo
+            PropertyValue = false
+        });
+
+        // Act
+        scope.UpdateFrom (scopeWithAddedProperty);
+
+        // Assert
+        Assert.NotNull (scope);
+        Assert.NotEmpty (scope);
+        Assert.True (scope.ContainsKey ("AddedProperty"));
+        Assert.Equal (false, scopeWithAddedProperty ["AddedProperty"].PropertyValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_HasValue_Updates ()
+    {
+        // Arrange
+        ScopeTestsScope originalScope = new ScopeTestsScope ();
+        originalScope.LoadHardCodedDefaults ();
+        Assert.Equal (Key.A, originalScope ["ScopeTests.KeyProperty"].PropertyValue);
+
+        ScopeTestsScope sourceScope = new ScopeTestsScope ();
+        sourceScope.TryAdd ("ScopeTests.KeyProperty", new ConfigProperty
+        {
+            Immutable = false,
+            PropertyInfo = originalScope ["ScopeTests.KeyProperty"].PropertyInfo,
+        });
+        sourceScope ["ScopeTests.KeyProperty"].PropertyValue = Key.B;
+
+        // StringProperty is set to null
+        Assert.DoesNotContain ("ScopeTests.StringProperty", sourceScope);
+
+        Assert.True (sourceScope ["ScopeTests.KeyProperty"].HasValue);
+
+        // Act
+        originalScope.UpdateFrom (sourceScope);
+
+        // Assert
+        Assert.True (originalScope ["ScopeTests.StringProperty"].HasValue);
+        Assert.True (originalScope ["ScopeTests.KeyProperty"].HasValue);
+        Assert.Equal (Key.B, originalScope ["ScopeTests.KeyProperty"].PropertyValue);
+    }
+
+    [Fact]
+    public void UpdateFrom_HasValue_Dictionary_Updates ()
+    {
+        // Arrange
+        ScopeTestsScope originalScope = new ScopeTestsScope ();
+        originalScope.LoadHardCodedDefaults ();
+        Assert.Null (originalScope ["ScopeTests.DictionaryProperty"].PropertyValue);
+
+        // QUESTION: Should this be done automatically?
+        originalScope ["ScopeTests.DictionaryProperty"].PropertyValue = new Dictionary<string, ConfigProperty> ();
+
+        ScopeTestsScope sourceScope = new ScopeTestsScope ();
+        sourceScope.LoadHardCodedDefaults ();
+        sourceScope ["ScopeTests.DictionaryProperty"].PropertyValue = new Dictionary<string, ConfigProperty> ()
+        {
+            { "item1", ConfigProperty.GetAllConfigProperties () ["ScopeTests.DictionaryItemProperty1"] },
+            { "item2", ConfigProperty.GetAllConfigProperties () ["ScopeTests.DictionaryItemProperty2"] }
+        };
+
+        Assert.True (sourceScope ["ScopeTests.KeyProperty"].HasValue);
+        Assert.True (sourceScope ["ScopeTests.DictionaryProperty"].HasValue);
+
+        Dictionary<string, ConfigProperty>? sourceDict = sourceScope ["ScopeTests.DictionaryProperty"].PropertyValue as Dictionary<string, ConfigProperty>;
+        sourceDict! ["item1"].Immutable = false;
+        sourceDict ["item2"].Immutable = false;
+        Assert.NotNull (sourceDict);
+        Assert.Equal (2, sourceDict!.Count);
+        Assert.True (sourceDict.ContainsKey ("item1"));
+        Assert.True (sourceDict.ContainsKey ("item2"));
+        Assert.False (sourceDict ["item1"].HasValue);
+        Assert.False (sourceDict ["item1"].Immutable);
+
+        // Update the original scope with the source scope, which has no values
+        originalScope.UpdateFrom (sourceScope);
+
+        // Confirm original is unchanged
+        Assert.NotNull (originalScope ["ScopeTests.DictionaryProperty"].PropertyValue);
+        Dictionary<string, ConfigProperty>? destDict = originalScope ["ScopeTests.DictionaryProperty"].PropertyValue as Dictionary<string, ConfigProperty>;
+        Assert.NotNull (destDict);
+        Assert.Empty (destDict);
+        Assert.False (destDict.ContainsKey ("item1"));
+        Assert.False (destDict.ContainsKey ("item2"));
+
+        // Confirm source is unchanged
+        sourceDict ["item1"].PropertyValue = "hello";
+        Assert.True (sourceDict ["item1"].HasValue);
+        Assert.Equal ("hello", sourceDict ["item1"].PropertyValue);
+
+        // Now update the original scope with the source scope again
+        originalScope.UpdateFrom (sourceScope);
+
+        // Confirm the original has been updated with only the values in source that have been set
+        Assert.NotNull (originalScope ["ScopeTests.DictionaryProperty"].PropertyValue);
+        destDict = originalScope ["ScopeTests.DictionaryProperty"].PropertyValue as Dictionary<string, ConfigProperty>;
+
+        // 1 item (item1) should now be in the original scope
+        Assert.Single (destDict!);
+        Assert.True (destDict! ["item1"].HasValue);
+        Assert.Equal ("hello", destDict ["item1"].PropertyValue);
+
+        originalScope.Apply ();
+
+        // Verify apply worked
+        Assert.Equal ("hello", DictionaryProperty? ["item1"].PropertyValue);
+
+        // The item property should not have had its value set
+        Assert.Null (DictionaryItemProperty1);
+
+        DictionaryItemProperty1 = null;
+    }
+
+    #region Concurrency Testing
+
+    [Fact]
+    public void Scope_Concurrent_Additions ()
+    {
+        // Arrange
+        var scope = new Scope<object> ();
+        int threadCount = 10;
+        int itemsPerThread = 100;
+        var tasks = new List<Task> ();
+
+        // Act
+        for (int t = 0; t < threadCount; t++)
+        {
+            int threadId = t;
+            tasks.Add (Task.Run (() =>
+                                 {
+                                     for (int i = 0; i < itemsPerThread; i++)
+                                     {
+                                         string key = $"Thread{threadId}_Item{i}";
+                                         scope.TryAdd (key, new ConfigProperty { PropertyValue = i });
+                                     }
+                                 }));
+        }
+
+        Task.WaitAll (tasks.ToArray ());
+
+        // Assert
+        Assert.Equal (threadCount * itemsPerThread, scope.Count);
+        for (int t = 0; t < threadCount; t++)
+        {
+            for (int i = 0; i < itemsPerThread; i++)
+            {
+                string key = $"Thread{t}_Item{i}";
+                Assert.True (scope.ContainsKey (key));
+                Assert.Equal (i, scope [key].PropertyValue);
+            }
+        }
+    }
+
+
+    #endregion
+
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/SettingsScopeTests.cs b/Tests/UnitTestsParallelizable/Configuration/SettingsScopeTests.cs
new file mode 100644
index 0000000000..1493b18886
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/SettingsScopeTests.cs
@@ -0,0 +1,16 @@
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class SettingsScopeTests
+{
+    [Fact]
+    public void Schema_Is_Correct ()
+    {
+        // Arrange
+        var settingsScope = new SettingsScope ();
+        // Act
+
+        // Assert
+        Assert.Equal ("https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json", settingsScope.Schema);
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs b/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs
new file mode 100644
index 0000000000..464ee17e74
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/SourcesManagerTests.cs
@@ -0,0 +1,534 @@
+using System.Reflection;
+using System.Text.Json;
+using Terminal.Gui.Configuration;
+
+public class SourcesManagerTests
+{
+    #region Update (Stream)
+
+    [Fact]
+    public void Update_WithNullSettingsScope_ReturnsFalse ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var stream = new MemoryStream ();
+        var source = "test.json";
+        var location = ConfigLocations.AppCurrent;
+
+        // Act
+        bool result = sourcesManager.Load (null, stream, source, location);
+
+        // Assert
+        Assert.False (result);
+    }
+
+    [Fact]
+    public void Update_WithValidStream_UpdatesSettingsScope ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        var json = """
+                   {
+                        "Application.QuitKey": "Ctrl+Z"
+                   }
+                   """;
+        var location = ConfigLocations.HardCoded;
+        var source = "stream";
+
+        var stream = new MemoryStream ();
+        var writer = new StreamWriter (stream);
+        writer.Write (json);
+        writer.Flush ();
+        stream.Position = 0;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, stream, source, location);
+
+        // Assert
+        // Assert
+        Assert.True (result);
+        Assert.Equal (Key.Z.WithCtrl, settingsScope ["Application.QuitKey"].PropertyValue as Key);
+        Assert.Contains (source, sourcesManager.Sources.Values);
+    }
+
+    [Fact]
+    public void Update_WithInvalidJson_AddsJsonError ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+
+        var settingsScope = new SettingsScope ();
+        var invalidJson = "{ invalid json }";
+        var stream = new MemoryStream ();
+        var writer = new StreamWriter (stream);
+        writer.Write (invalidJson);
+        writer.Flush ();
+        stream.Position = 0;
+
+        var source = "test.json";
+        var location = ConfigLocations.AppCurrent;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, stream, source, location);
+
+        // Assert
+        Assert.False (result);
+
+        // Assuming AddJsonError logs errors, verify the error was logged (mock or inspect logs if possible).
+    }
+
+    #endregion
+
+    #region Update (FilePath)
+
+    [Fact]
+    public void Update_WithNonExistentFile_AddsToSourcesAndReturnsTrue ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+
+        var settingsScope = new SettingsScope ();
+        var filePath = "nonexistent.json";
+        var location = ConfigLocations.AppCurrent;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, filePath, location);
+
+        // Assert
+        Assert.True (result);
+        Assert.Contains (filePath, sourcesManager.Sources.Values);
+    }
+
+    [Fact]
+    public void Update_WithValidFile_UpdatesSettingsScope ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        var json = """
+                   {
+                        "Application.QuitKey": "Ctrl+Z"
+                   }
+                   """;
+        var source = Path.GetTempFileName ();
+        var location = ConfigLocations.HardCoded;
+
+        File.WriteAllText (source, json);
+
+        try
+        {
+            // Act
+            bool result = sourcesManager.Load (settingsScope, source, location);
+
+            // Assert
+            Assert.True (result);
+            Assert.Equal (Key.Z.WithCtrl, settingsScope ["Application.QuitKey"].PropertyValue as Key);
+            Assert.Contains (source, sourcesManager.Sources.Values);
+        }
+        finally
+        {
+            // Cleanup
+            File.Delete (source);
+        }
+    }
+
+    [Fact]
+    public void Update_WithIOException_RetriesAndFailsGracefully ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        var filePath = "locked.json";
+        var json = "{\"Application.UseSystemConsole\": true}";
+        File.WriteAllText (filePath, json);
+
+        var location = ConfigLocations.AppCurrent;
+
+        try
+        {
+            using FileStream fileStream = File.Open (filePath, FileMode.Open, FileAccess.Read, FileShare.None);
+
+            // Act
+            bool result = sourcesManager.Load (settingsScope, filePath, location);
+
+            // Assert
+            Assert.False (result);
+        }
+        finally
+        {
+            // Cleanup
+            File.Delete (filePath);
+        }
+    }
+
+    #endregion
+
+    #region Update (Json String)
+
+    [Fact]
+    public void Update_WithNullOrEmptyJson_ReturnsFalse ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+
+        var settingsScope = new SettingsScope ();
+        var source = "test.json";
+        var location = ConfigLocations.AppCurrent;
+
+        // Act
+        bool resultWithNull = sourcesManager.Load (settingsScope, json: null, source, location);
+        bool resultWithEmpty = sourcesManager.Load (settingsScope, string.Empty, source, location);
+
+        // Assert
+        Assert.False (resultWithNull);
+        Assert.False (resultWithEmpty);
+    }
+
+    [Fact]
+    public void Update_WithValidJson_UpdatesSettingsScope ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        var json = """
+                   {
+                        "Application.QuitKey": "Ctrl+Z"
+                   }
+                   """;
+        var source = "test.json";
+        var location = ConfigLocations.HardCoded;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, json, source, location);
+
+        // Assert
+        Assert.True (result);
+        Assert.Equal (Key.Z.WithCtrl, settingsScope ["Application.QuitKey"].PropertyValue as Key);
+        Assert.Contains (source, sourcesManager.Sources.Values);
+    }
+
+    #endregion
+
+    #region Load
+
+    [Fact]
+    public void Load_WithNullResourceName_ReturnsFalse ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        var assembly = Assembly.GetExecutingAssembly ();
+        var location = ConfigLocations.AppResources;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, assembly, null, location);
+
+        // Assert
+        Assert.False (result);
+    }
+
+    [Fact]
+    public void Load_WithValidResource_UpdatesSettingsScope ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        var assembly = Assembly.GetAssembly (typeof (ConfigurationManager));
+        var resourceName = "Terminal.Gui.Resources.config.json";
+        var location = ConfigLocations.LibraryResources;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, assembly!, resourceName, location);
+
+        // Assert
+        Assert.True (result);
+
+        // Verify settingsScope is updated as expected
+    }
+
+    [Fact]
+    public void Load_Runtime_Overrides ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        var assembly = Assembly.GetAssembly (typeof (ConfigurationManager));
+        var resourceName = "Terminal.Gui.Resources.config.json";
+        var location = ConfigLocations.LibraryResources;
+        sourcesManager.Load (settingsScope, assembly!, resourceName, location);
+
+        Assert.Equal (Key.Esc, settingsScope ["Application.QuitKey"].PropertyValue);
+
+        var runtimeJson = """
+                          {
+                               "Application.QuitKey": "Ctrl+Z"
+                          }
+                          """;
+        var runtimeSource = "runtime.json";
+        var runtimeLocation = ConfigLocations.Runtime;
+        var runtimeStream = new MemoryStream ();
+        var writer = new StreamWriter (runtimeStream);
+        writer.Write (runtimeJson);
+        writer.Flush ();
+        runtimeStream.Position = 0;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, runtimeStream, runtimeSource, runtimeLocation);
+
+        // Assert
+        Assert.True (result);
+
+        // Verify settingsScope is updated as expected
+        Assert.Equal (Key.Z.WithCtrl, settingsScope ["Application.QuitKey"].PropertyValue);
+    }
+
+    #endregion
+
+    #region ToJson and ToStream
+
+    [Fact]
+    public void ToJson_WithValidScope_ReturnsJsonString ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        // Act
+        string json = sourcesManager.ToJson (settingsScope);
+
+        // Assert
+        Assert.Contains ("""Application.QuitKey": "Ctrl+Q""", json);
+    }
+
+    [Fact]
+    public void ToStream_WithValidScope_ReturnsStream ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+        settingsScope.LoadHardCodedDefaults ();
+        settingsScope ["Application.QuitKey"].PropertyValue = Key.Q.WithCtrl;
+
+        // Act
+        var stream = sourcesManager.ToStream (settingsScope);
+
+        // Assert
+        Assert.NotNull (stream);
+        stream.Position = 0;
+        var reader = new StreamReader (stream);
+        string json = reader.ReadToEnd ();
+        Assert.Contains ("""Application.QuitKey": "Ctrl+Q""", json);
+    }
+
+    #endregion
+
+    #region Sources Dictionary Tests
+
+    [Fact]
+    public void Sources_Dictionary_IsInitializedEmpty ()
+    {
+        // Arrange & Act
+        var sourcesManager = new SourcesManager ();
+
+        // Assert
+        Assert.NotNull (sourcesManager.Sources);
+        Assert.Empty (sourcesManager.Sources);
+    }
+
+    [Fact]
+    public void Update_WhenCalledMultipleTimes_MaintainsLastSourceForLocation ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        // Act - Update with first source for location
+        var firstSource = "first.json";
+        sourcesManager.Load (settingsScope, """{"Application.QuitKey": "Ctrl+A"}""", firstSource, ConfigLocations.Runtime);
+
+        // Update with second source for same location
+        var secondSource = "second.json";
+        sourcesManager.Load (settingsScope, """{"Application.QuitKey": "Ctrl+B"}""", secondSource, ConfigLocations.Runtime);
+
+        // Assert - Only the last source should be stored for the location
+        Assert.Single (sourcesManager.Sources);
+        Assert.Equal (secondSource, sourcesManager.Sources [ConfigLocations.Runtime]);
+    }
+
+    [Fact]
+    public void Update_WithDifferentLocations_AddsAllSourcesToCollection ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        ConfigLocations [] locations =
+        [
+            ConfigLocations.LibraryResources,
+            ConfigLocations.Runtime,
+            ConfigLocations.AppCurrent,
+            ConfigLocations.GlobalHome
+        ];
+
+        // Act - Update with different sources for different locations
+        foreach (var location in locations)
+        {
+            var source = $"config-{location}.json";
+            sourcesManager.Load (settingsScope, """{"Application.QuitKey": "Ctrl+Z"}""", source, location);
+        }
+
+        // Assert
+        Assert.Equal (locations.Length, sourcesManager.Sources.Count);
+        foreach (var location in locations)
+        {
+            Assert.Contains (location, sourcesManager.Sources.Keys);
+            Assert.Equal ($"config-{location}.json", sourcesManager.Sources [location]);
+        }
+    }
+
+    [Fact]
+    public void Load_AddsResourceSourceToCollection ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        var assembly = Assembly.GetAssembly (typeof (ConfigurationManager));
+        var resourceName = "Terminal.Gui.Resources.config.json";
+        var location = ConfigLocations.LibraryResources;
+
+        // Act
+        bool result = sourcesManager.Load (settingsScope, assembly!, resourceName, location);
+
+        // Assert
+        Assert.True (result);
+        Assert.Contains (location, sourcesManager.Sources.Keys);
+        Assert.Equal ($"resource://[{assembly!.GetName ().Name}]/{resourceName}", sourcesManager.Sources [location]);
+    }
+
+    [Fact]
+    public void Update_WithNonExistentFileAndDifferentLocations_TracksAllSources ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        // Define multiple files and locations
+        var fileLocations = new Dictionary<string, ConfigLocations> (StringComparer.InvariantCultureIgnoreCase)
+    {
+        { "file1.json", ConfigLocations.AppCurrent },
+        { "file2.json", ConfigLocations.GlobalHome },
+        { "file3.json", ConfigLocations.AppHome }
+    };
+
+        // Act
+        foreach (var pair in fileLocations)
+        {
+            sourcesManager.Load (settingsScope, pair.Key, pair.Value);
+        }
+
+        // Assert
+        Assert.Equal (fileLocations.Count, sourcesManager.Sources.Count);
+        foreach (var pair in fileLocations)
+        {
+            Assert.Contains (pair.Value, sourcesManager.Sources.Keys);
+            Assert.Equal (pair.Key, sourcesManager.Sources [pair.Value]);
+        }
+    }
+
+    [Fact]
+    public void Sources_IsPreservedAcrossOperations ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        // First operation - file update
+        var filePath = "testfile.json";
+        var location1 = ConfigLocations.AppCurrent;
+        sourcesManager.Load (settingsScope, filePath, location1);
+
+        // Second operation - json string update
+        var jsonSource = "jsonstring";
+        var location2 = ConfigLocations.Runtime;
+        sourcesManager.Load (settingsScope, """{"Application.QuitKey": "Ctrl+Z"}""", jsonSource, location2);
+
+        // Perform a stream operation
+        var streamSource = "streamdata";
+        var location3 = ConfigLocations.GlobalCurrent;
+        var stream = new MemoryStream ();
+        var writer = new StreamWriter (stream);
+        writer.Write ("""{"Application.QuitKey": "Ctrl+Z"}""");
+        writer.Flush ();
+        stream.Position = 0;
+        sourcesManager.Load (settingsScope, stream, streamSource, location3);
+
+        // Assert - all sources should be preserved
+        Assert.Equal (3, sourcesManager.Sources.Count);
+        Assert.Equal (filePath, sourcesManager.Sources [location1]);
+        Assert.Equal (jsonSource, sourcesManager.Sources [location2]);
+        Assert.Equal (streamSource, sourcesManager.Sources [location3]);
+    }
+
+    [Fact]
+    public void Sources_StaysConsistentWhenUpdateFails ()
+    {
+        // Arrange
+        var sourcesManager = new SourcesManager ();
+        var settingsScope = new SettingsScope ();
+
+        // Add one successful source
+        var validSource = "valid.json";
+        var validLocation = ConfigLocations.Runtime;
+        sourcesManager.Load (settingsScope, """{"Application.QuitKey": "Ctrl+Z"}""", validSource, validLocation);
+
+        try
+        {
+            // Configure to throw on errors
+            ConfigurationManager.ThrowOnJsonErrors = true;
+
+            // Act & Assert - attempt to update with invalid JSON
+            var invalidSource = "invalid.json";
+            var invalidLocation = ConfigLocations.AppCurrent;
+            var invalidJson = "{ invalid json }";
+
+            Assert.Throws<JsonException> (
+                                          () =>
+                                              sourcesManager.Load (settingsScope, invalidJson, invalidSource, invalidLocation));
+
+            // The valid source should still be there
+            Assert.Single (sourcesManager.Sources);
+            Assert.Equal (validSource, sourcesManager.Sources [validLocation]);
+
+            // The invalid source should not have been added
+            Assert.DoesNotContain (invalidLocation, sourcesManager.Sources.Keys);
+        }
+        finally
+        {
+            // Reset for other tests
+            ConfigurationManager.ThrowOnJsonErrors = false;
+
+        }
+    }
+
+    #endregion
+
+}
diff --git a/Tests/UnitTestsParallelizable/Configuration/ThemeScopeTests.cs b/Tests/UnitTestsParallelizable/Configuration/ThemeScopeTests.cs
new file mode 100644
index 0000000000..c2e55e770b
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Configuration/ThemeScopeTests.cs
@@ -0,0 +1,48 @@
+using System.Diagnostics;
+using System.Text.Json;
+
+namespace Terminal.Gui.ConfigurationTests;
+
+public class ThemeScopeTests
+{
+    [Fact]
+    public void Schemes_Property_Exists ()
+    {
+        var scope = new ThemeScope ();
+        scope.LoadHardCodedDefaults();
+
+        Assert.NotEmpty (scope);
+
+        Assert.NotNull(scope ["Schemes"].PropertyValue);
+
+        Assert.NotEmpty (scope);
+    }
+
+    //[Fact]
+    //public void RetrievValues_Gets_Default_Values ()
+    //{
+    //    // Need to call Initialize to setup readonly statics
+    //    ConfigurationManager.Initialize ();
+
+    //    var themeScope = new ThemeScope ();
+
+    //    Assert.NotEmpty (themeScope);
+
+    //    // Schemes exists, but is not initialized
+    //    Assert.Null (themeScope ["Schemes"].PropertyValue);
+
+    //    themeScope.RetrieveValues ();
+
+    //    Assert.NotEmpty (themeScope);
+
+    //    // Schemes exists, and has correct # of eleements
+    //    var schemes = themeScope ["Schemes"].PropertyValue as Dictionary<string, Scheme>;
+    //    Assert.NotNull (schemes);
+    //    Assert.Equal (5, schemes!.Count);
+
+    //    // Base has correct values
+    //    var baseSchemee = schemes ["Base"];
+    //    Assert.Equal (new Attribute(Color.White, Color.Blue), baseSchemee.Normal);
+
+    //}
+}
diff --git a/Tests/UnitTestsParallelizable/Drawing/AttributeTests.cs b/Tests/UnitTestsParallelizable/Drawing/AttributeTests.cs
index 2776074c6c..d6e32ac1d0 100644
--- a/Tests/UnitTestsParallelizable/Drawing/AttributeTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/AttributeTests.cs
@@ -1,14 +1,53 @@
-// Alias Console to MockConsole so we don't accidentally use Console
+// Alias Console to MockConsole so we don't accidentally use Console
 
 namespace Terminal.Gui.DrawingTests;
 
 public class AttributeTests
 {
     [Fact]
-    public void Attribute_Is_Value_Type ()
+    public void Constructor_ParsesNamedColorsAndStyle ()
     {
-        // prove that Color is a value type
-        Assert.True (typeof (Attribute).IsValueType);
+        var attr = new Attribute ("Red", "Black", "Bold,Underline");
+        Assert.Equal (Color.Parse ("Red"), attr.Foreground);
+        Assert.Equal (Color.Parse ("Black"), attr.Background);
+        Assert.True (attr.Style.HasFlag (TextStyle.Bold));
+        Assert.True (attr.Style.HasFlag (TextStyle.Underline));
+    }
+
+    [Fact]
+    public void Constructor_ParsesHexColors ()
+    {
+        var attr = new Attribute ("#FF0000", "#000000", "Italic");
+        Assert.Equal (Color.Parse ("#FF0000"), attr.Foreground);
+        Assert.Equal (Color.Parse ("#000000"), attr.Background);
+        Assert.Equal (TextStyle.Italic, attr.Style);
+    }
+
+    [Fact]
+    public void Constructor_ParsesRgbColors ()
+    {
+        var attr = new Attribute ("rgb(0,255,0)", "rgb(0,0,255)", "Faint");
+        Assert.Equal (Color.Parse ("rgb(0,255,0)"), attr.Foreground);
+        Assert.Equal (Color.Parse ("rgb(0,0,255)"), attr.Background);
+        Assert.Equal (TextStyle.Faint, attr.Style);
+    }
+
+    [Fact]
+    public void Constructor_DefaultsToNoneStyle_WhenStyleIsNullOrEmpty ()
+    {
+        var attr1 = new Attribute ("White", "Black");
+        var attr2 = new Attribute ("White", "Black", null);
+        var attr3 = new Attribute ("White", "Black", "");
+        Assert.Equal (TextStyle.None, attr1.Style);
+        Assert.Equal (TextStyle.None, attr2.Style);
+        Assert.Equal (TextStyle.None, attr3.Style);
+    }
+
+    [Fact]
+    public void Constructor_DefaultsToNoneStyle_WhenStyleIsInvalid ()
+    {
+        var attr = new Attribute ("White", "Black", "NotAStyle");
+        Assert.Equal (TextStyle.None, attr.Style);
     }
 
     [Fact]
@@ -21,7 +60,7 @@ public void ColorAndColorNamesConstructor ()
 
         // Assert
         Assert.Equal (foregroundColor, attribute.Foreground);
-        Assert.Equal (new Color (backgroundColorName), attribute.Background);
+        Assert.Equal (new (backgroundColorName), attribute.Background);
     }
 
     [Fact]
@@ -46,7 +85,7 @@ public void ColorNamesAndColorConstructor ()
         var attribute = new Attribute (foregroundColorName, backgroundColor);
 
         // Assert
-        Assert.Equal (new Color (foregroundColorName), attribute.Foreground);
+        Assert.Equal (new (foregroundColorName), attribute.Foreground);
         Assert.Equal (backgroundColor, attribute.Background);
     }
 
@@ -57,8 +96,8 @@ public void ColorNamesConstructor ()
         var attribute = new Attribute (ColorName16.Blue);
 
         // Assert
-        Assert.Equal (new Color (Color.Blue), attribute.Foreground);
-        Assert.Equal (new Color (Color.Blue), attribute.Background);
+        Assert.Equal (new (Color.Blue), attribute.Foreground);
+        Assert.Equal (new (Color.Blue), attribute.Background);
     }
 
     [Fact]
@@ -71,31 +110,31 @@ public void Constructors_Construct ()
         var attr = new Attribute ();
 
         Assert.Equal (-1, attr.PlatformColor);
-        Assert.Equal (new Color (Color.White), attr.Foreground);
-        Assert.Equal (new Color (Color.Black), attr.Background);
+        Assert.Equal (new (Color.White), attr.Foreground);
+        Assert.Equal (new (Color.Black), attr.Background);
 
         // Test foreground, background
         var fg = new Color ();
-        fg = new Color (Color.Red);
+        fg = new (Color.Red);
 
         var bg = new Color ();
-        bg = new Color (Color.Blue);
+        bg = new (Color.Blue);
 
-        attr = new Attribute (fg, bg);
+        attr = new (fg, bg);
 
         //Assert.True (attr.Initialized);
         //Assert.True (attr.HasValidColors);
         Assert.Equal (fg, attr.Foreground);
         Assert.Equal (bg, attr.Background);
 
-        attr = new Attribute (fg);
+        attr = new (fg);
 
         //Assert.True (attr.Initialized);
         //Assert.True (attr.HasValidColors);
         Assert.Equal (fg, attr.Foreground);
         Assert.Equal (fg, attr.Background);
 
-        attr = new Attribute (bg);
+        attr = new (bg);
 
         //Assert.True (attr.Initialized);
         //Assert.True (attr.HasValidColors);
@@ -114,8 +153,19 @@ public void DefaultConstructor ()
         // Assert
         //Assert.False (attribute.Initialized);
         Assert.Equal (-1, attribute.PlatformColor);
-        Assert.Equal (new Color (Color.White), attribute.Foreground);
-        Assert.Equal (new Color (Color.Black), attribute.Background);
+        Assert.Equal (new (Color.White), attribute.Foreground);
+        Assert.Equal (new (Color.Black), attribute.Background);
+    }
+
+    [Fact]
+    public void Equality_IncludesStyle ()
+    {
+        var attr1 = new Attribute (Color.Red, Color.Black, TextStyle.Bold);
+        var attr2 = new Attribute (Color.Red, Color.Black, TextStyle.Bold);
+        var attr3 = new Attribute (Color.Red, Color.Black, TextStyle.Underline);
+
+        Assert.Equal (attr1, attr2);
+        Assert.NotEqual (attr1, attr3);
     }
 
     [Fact]
@@ -160,6 +210,16 @@ public void Equals_NotInitialized ()
         Assert.True (attr2.Equals (attr1));
     }
 
+    [Fact]
+    public void GetHashCode_ConsistentWithEquals ()
+    {
+        var attr1 = new Attribute (Color.Red, Color.Black, TextStyle.Bold);
+        var attr2 = new Attribute (Color.Red, Color.Black, TextStyle.Bold);
+
+        Assert.Equal (attr1, attr2);
+        Assert.Equal (attr1.GetHashCode (), attr2.GetHashCode ());
+    }
+
     [Fact]
     public void Implicit_Assign ()
     {
@@ -170,13 +230,13 @@ public void Implicit_Assign ()
 
         var value = 42;
         var fg = new Color ();
-        fg = new Color (Color.Red);
+        fg = new (Color.Red);
 
         var bg = new Color ();
-        bg = new Color (Color.Blue);
+        bg = new (Color.Blue);
 
         // Test conversion to int
-        attr = new Attribute (value, fg, bg);
+        attr = new (value, fg, bg);
         int value_implicit = attr.PlatformColor;
         Assert.Equal (value, value_implicit);
 
@@ -207,6 +267,22 @@ public void InequalityOperator_ShouldReturnTrueForDifferentAttributes ()
         Assert.True (attribute1 != attribute2);
     }
 
+    [Fact]
+    public void Is_Value_Type ()
+    {
+        // prove that Color is a value type
+        Assert.True (typeof (Attribute).IsValueType);
+    }
+
+    [Fact]
+    public void List_RoundTrip_EqualityHolds ()
+    {
+        List<Attribute> list1 = [new (Color.Red, Color.Black, TextStyle.Bold)];
+        List<Attribute> list2 = new (list1);
+
+        Assert.Equal (list1, list2);
+    }
+
     [Fact]
     public void Make_Creates ()
     {
@@ -214,10 +290,10 @@ public void Make_Creates ()
         driver.Init ();
 
         var fg = new Color ();
-        fg = new Color (Color.Red);
+        fg = new (Color.Red);
 
         var bg = new Color ();
-        bg = new Color (Color.Blue);
+        bg = new (Color.Blue);
 
         var attr = new Attribute (fg, bg);
 
@@ -232,10 +308,10 @@ public void Make_Creates ()
     public void Make_Creates_NoDriver ()
     {
         var fg = new Color ();
-        fg = new Color (Color.Red);
+        fg = new (Color.Red);
 
         var bg = new Color ();
-        bg = new Color (Color.Blue);
+        bg = new (Color.Blue);
 
         var attr = new Attribute (fg, bg);
 
@@ -248,10 +324,10 @@ public void Make_Creates_NoDriver ()
     public void Make_SetsNotInitialized_NoDriver ()
     {
         var fg = new Color ();
-        fg = new Color (Color.Red);
+        fg = new (Color.Red);
 
         var bg = new Color ();
-        bg = new Color (Color.Blue);
+        bg = new (Color.Blue);
 
         var a = new Attribute (fg, bg);
 
@@ -285,7 +361,7 @@ public void MakeColorAndColorNames_ForegroundAndBackgroundShouldMatchInput ()
 
         // Assert
         Assert.Equal (foregroundColor, attribute.Foreground);
-        Assert.Equal (new Color (backgroundColorName), attribute.Background);
+        Assert.Equal (new (backgroundColorName), attribute.Background);
     }
 
     [Fact]
@@ -299,7 +375,7 @@ public void MakeColorNamesAndColor_ForegroundAndBackgroundShouldMatchInput ()
         var attribute = new Attribute (foregroundColorName, backgroundColor);
 
         // Assert
-        Assert.Equal (new Color (foregroundColorName), attribute.Foreground);
+        Assert.Equal (new (foregroundColorName), attribute.Foreground);
         Assert.Equal (backgroundColor, attribute.Background);
     }
 
@@ -314,8 +390,8 @@ public void MakeColorNamesAndColorNames_ForegroundAndBackgroundShouldMatchInput
         var attribute = new Attribute (foregroundColorName, backgroundColorName);
 
         // Assert
-        Assert.Equal (new Color (foregroundColorName), attribute.Foreground);
-        Assert.Equal (new Color (backgroundColorName), attribute.Background);
+        Assert.Equal (new (foregroundColorName), attribute.Foreground);
+        Assert.Equal (new (backgroundColorName), attribute.Background);
     }
 
     [Fact]
@@ -339,12 +415,12 @@ public void NotEquals_NotInitialized ()
     }
 
     [Fact]
-    public void ToString_ShouldReturnFormattedStringWithForegroundAndBackground ()
+    public void ToString_Formats_Correctly ()
     {
         // Arrange
         var foregroundColor = new Color (0, 0, 255);
         var backgroundColor = new Color (255, 255, 255);
-        var expectedString = $"[{foregroundColor},{backgroundColor}]";
+        var expectedString = $"[{foregroundColor},{backgroundColor},None]";
 
         // Act
         var attribute = new Attribute (foregroundColor, backgroundColor);
@@ -353,4 +429,29 @@ public void ToString_ShouldReturnFormattedStringWithForegroundAndBackground ()
         // Assert
         Assert.Equal (expectedString, attributeString);
     }
+
+    [Theory]
+    [InlineData (TextStyle.Bold, "Bold")]
+    [InlineData (TextStyle.Bold | TextStyle.Underline, "Bold, Underline")]
+    [InlineData (TextStyle.None, "None")]
+    public void ToString_IncludesStyle (TextStyle style, string expectedStyleString)
+    {
+        var attr = new Attribute (Color.Red, Color.Black, style);
+        var result = attr.ToString ();
+
+        Assert.Contains (expectedStyleString, result);
+    }
+
+    [Fact]
+    public void ToString_ShouldFailComparison_IfDifferentInstancesSameContent ()
+    {
+        var original = new Attribute (Color.White, Color.White);
+        var clone = new Attribute (Color.White, Color.White);
+
+        // These print the same
+        Assert.Equal (original.ToString (), clone.ToString ());
+
+        // But this will fail if anything differs under the hood
+        Assert.Equal (original, clone); // Should pass — record struct
+    }
 }
diff --git a/Tests/UnitTestsParallelizable/Drawing/CellTests.cs b/Tests/UnitTestsParallelizable/Drawing/CellTests.cs
index 4cef973359..c6d16227dd 100644
--- a/Tests/UnitTestsParallelizable/Drawing/CellTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/CellTests.cs
@@ -42,10 +42,10 @@ public void ToString_Override ()
         {
             Rune = new ('a'), Attribute = new (Color.Red)
         };
-        Assert.Equal ("[\0, ]", c1.ToString ());
+        Assert.Equal ("['\0':]", c1.ToString ());
 
         Assert.Equal (
-                      "[a, [Red,Red]]",
+                      "['a':[Red,Red,None]]",
                       c2.ToString ()
                      );
     }
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/AnsiColorNameResolverTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/AnsiColorNameResolverTests.cs
index 76e8e34bfe..fb8b7b661b 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Color/AnsiColorNameResolverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Color/AnsiColorNameResolverTests.cs
@@ -4,14 +4,58 @@ namespace Terminal.Gui.DrawingTests;
 
 public class AnsiColorNameResolverTests
 {
-    private readonly AnsiColorNameResolver _candidate = new();
+    private readonly AnsiColorNameResolver _candidate = new ();
+    [Fact]
+    public void TryNameColor_Resolves_All_ColorName16 ()
+    {
+        var resolver = new AnsiColorNameResolver ();
+
+        foreach (ColorName16 name in Enum.GetValues<ColorName16> ())
+        {
+            var color = new Color (name);
+            bool success = resolver.TryNameColor (color, out string? resultName);
+
+            Assert.True (success, $"Expected TryNameColor to succeed for {name}");
+            Assert.Equal (name.ToString (), resultName);
+        }
+    }
+
+    [Fact]
+    public void TryParseColor_Resolves_All_ColorName16_Names ()
+    {
+        var resolver = new AnsiColorNameResolver ();
+
+        foreach (ColorName16 name in Enum.GetValues<ColorName16> ())
+        {
+            bool success = resolver.TryParseColor (name.ToString (), out Color parsed);
+
+            Assert.True (success, $"Expected TryParseColor to succeed for {name}");
+            Assert.Equal (new Color (name), parsed);
+        }
+    }
+
+    public static IEnumerable<object []> AnsiColorName16NumericValues =>
+        Enum.GetValues<ColorName16> ()
+            .Select (e => new object [] { ((int)e).ToString () });
+    [Theory]
+    [MemberData (nameof (AnsiColorName16NumericValues))]
+    public void TryParseColor_Accepts_Enum_UnderlyingNumbers (string numeric)
+    {
+        var resolver = new AnsiColorNameResolver ();
+
+        bool success = resolver.TryParseColor (numeric, out _);
+
+        Assert.True (success, $"Expected numeric enum value '{numeric}' to resolve successfully.");
+    }
+
+
 
     [Fact]
     public void GetNames_Returns16ColorNames ()
     {
-        string[] expected = Enum.GetNames<ColorName16>();
+        string [] expected = Enum.GetNames<ColorName16> ();
 
-        string[] actual = _candidate.GetColorNames ().ToArray();
+        string [] actual = _candidate.GetColorNames ().ToArray ();
 
         Assert.Equal (expected, actual);
     }
@@ -37,7 +81,7 @@ public void TryNameColor_ReturnsExpectedColorName (byte r, byte g, byte b, strin
     {
         var expected = (true, expectedName);
 
-        bool actualSuccess = _candidate.TryNameColor(new Color(r, g, b), out string? actualName);
+        bool actualSuccess = _candidate.TryNameColor (new Color (r, g, b), out string? actualName);
         var actual = (actualSuccess, actualName);
 
         Assert.Equal (expected, actual);
@@ -76,7 +120,7 @@ public void TryNameColor_NoMatchFails ()
     [InlineData ("brightblue", 59, 120, 255)]
     public void TryParseColor_ReturnsExpectedColor (string inputName, byte r, byte g, byte b)
     {
-        var expected = (true, new Color(r, g, b));
+        var expected = (true, new Color (r, g, b));
 
         bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
         var actual = (actualSuccess, actualColor);
@@ -88,7 +132,7 @@ public void TryParseColor_ReturnsExpectedColor (string inputName, byte r, byte g
     [InlineData ("12", 231, 72, 86)] // ColorName16.BrightRed
     public void TryParseColor_ResolvesValidEnumNumber (string inputName, byte r, byte g, byte b)
     {
-        var expected = (true, new Color(r, g, b));
+        var expected = (true, new Color (r, g, b));
 
         bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
         var actual = (actualSuccess, actualColor);
@@ -102,7 +146,7 @@ public void TryParseColor_ResolvesValidEnumNumber (string inputName, byte r, byt
     [InlineData ("brightlight")]
     public void TryParseColor_FailsOnInvalidColorName (string? invalidName)
     {
-        var expected = (false, default(Color));
+        var expected = (false, default (Color));
 
         bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
         var actual = (actualSuccess, actualColor);
@@ -114,7 +158,7 @@ public void TryParseColor_FailsOnInvalidColorName (string? invalidName)
     [InlineData ("-12")]
     public void TryParseColor_FailsOnInvalidEnumNumber (string invalidName)
     {
-        var expected = (false, default(Color));
+        var expected = (false, default (Color));
 
         bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
         var actual = (actualSuccess, actualColor);
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/MultiStandardColorNameResolverTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/MultiStandardColorNameResolverTests.cs
index 0e7677d659..ff8ca8af44 100644
--- a/Tests/UnitTestsParallelizable/Drawing/Color/MultiStandardColorNameResolverTests.cs
+++ b/Tests/UnitTestsParallelizable/Drawing/Color/MultiStandardColorNameResolverTests.cs
@@ -1,13 +1,80 @@
 #nullable enable
 
+using System.Collections.Generic;
+using Xunit.Abstractions;
+using static Terminal.Gui.StandardColors;
+
 namespace Terminal.Gui.DrawingTests;
 
-public class MultiStandardColorNameResolverTests
+public class MultiStandardColorNameResolverTests (ITestOutputHelper output)
 {
-    private readonly MultiStandardColorNameResolver _candidate = new();
+    private readonly MultiStandardColorNameResolver _candidate = new ();
+
+    public static IEnumerable<object []> StandardColors =>
+        Enum.GetValues<StandardColor> ().Select (sc => new object [] { sc });
+
+    [Theory]
+    [MemberData (nameof (StandardColors))]
+    public void TryParseColor_ResolvesAllStandardColorNames (StandardColor standardColor)
+    {
+        string name = standardColor.ToString ();
+        bool parsed = _candidate.TryParseColor (name, out Color actualColor);
+
+        Assert.True (parsed, $"TryParseColor should succeed for {name}");
+
+        Color expectedColor = new (GetArgb (standardColor));
+
+        Assert.Equal (expectedColor.R, actualColor.R);
+        Assert.Equal (expectedColor.G, actualColor.G);
+        Assert.Equal (expectedColor.B, actualColor.B);
+    }
+
+    [Theory]
+    [MemberData (nameof (StandardColors))]
+    public void TryNameColor_ResolvesAllStandardColors (StandardColor standardColor)
+    {
+        Color color = new (GetArgb (standardColor));
+
+        bool success = _candidate.TryNameColor (color, out string? resolvedName);
+
+        if (!success)
+        {
+            output.WriteLine ($"Unmapped: {standardColor} → {color}");
+        }
+
+        Assert.True (success, $"TryNameColor should succeed for {standardColor}");
+
+        List<string> expectedNames = Enum.GetNames<StandardColor> ()
+            .Where (name => GetArgb (Enum.Parse<StandardColor> (name)) == color.Argb)
+            .ToList ();
+
+        Assert.Contains (resolvedName, expectedNames);
+    }
+
+    [Fact]
+    public void TryNameColor_Logs_Unmapped_StandardColors ()
+    {
+        List<StandardColor> unmapped = new ();
+
+        foreach (StandardColor sc in Enum.GetValues<StandardColor> ())
+        {
+            Color color = new (GetArgb (sc));
+            if (!_candidate.TryNameColor (color, out _))
+            {
+                unmapped.Add (sc);
+            }
+        }
+
+        output.WriteLine ("Unmapped StandardColor entries:");
+        foreach (StandardColor sc in unmapped.Distinct ())
+        {
+            output.WriteLine ($"- {sc}");
+        }
+
+        Assert.True (unmapped.Count < 10, $"Too many StandardColor values are not name-resolvable. Got {unmapped.Count}.");
+    }
 
     [Theory]
-    // ANSI color names.
     [InlineData (nameof (ColorName16.Black))]
     [InlineData (nameof (ColorName16.White))]
     [InlineData (nameof (ColorName16.Red))]
@@ -18,215 +85,72 @@ public class MultiStandardColorNameResolverTests
     [InlineData (nameof (ColorName16.DarkGray))]
     [InlineData (nameof (ColorName16.BrightGreen))]
     [InlineData (nameof (ColorName16.BrightMagenta))]
-    // Regular W3C color.
-    [InlineData (nameof (W3cColor.AliceBlue))]
-    [InlineData (nameof (W3cColor.BlanchedAlmond))]
-    [InlineData (nameof (W3cColor.CadetBlue))]
-    [InlineData (nameof (W3cColor.DarkBlue))]
-    [InlineData (nameof (W3cColor.FireBrick))]
-    [InlineData (nameof (W3cColor.Gainsboro))]
-    [InlineData (nameof (W3cColor.HoneyDew))]
-    [InlineData (nameof (W3cColor.Indigo))]
-    [InlineData (nameof (W3cColor.Khaki))]
-    [InlineData (nameof (W3cColor.Lavender))]
-    [InlineData (nameof (W3cColor.Maroon))]
-    [InlineData (nameof (W3cColor.Navy))]
-    [InlineData (nameof (W3cColor.Olive))]
-    [InlineData (nameof (W3cColor.Plum))]
-    [InlineData (nameof (W3cColor.RoyalBlue))]
-    [InlineData (nameof (W3cColor.Silver))]
-    [InlineData (nameof (W3cColor.Tomato))]
-    [InlineData (nameof (W3cColor.Violet))]
-    [InlineData (nameof (W3cColor.WhiteSmoke))]
-    [InlineData (nameof (W3cColor.YellowGreen))]
-    // W3C alternatives.
-    [InlineData (nameof (W3cColor.Grey))]
-    [InlineData (nameof (W3cColor.DarkGrey))]
-    [InlineData (nameof (W3cColor.Aqua))]
-    [InlineData (nameof (W3cColor.Fuchsia))]
-    [InlineData (nameof (W3cColor.DarkSlateGray))]
-    [InlineData (nameof (W3cColor.DarkSlateGrey))]
-    [InlineData (nameof (W3cColor.DimGray))]
-    [InlineData (nameof (W3cColor.DimGrey))]
-    [InlineData (nameof (W3cColor.LightGray))]
-    [InlineData (nameof (W3cColor.LightGrey))]
-    [InlineData (nameof (W3cColor.SlateGray))]
-    [InlineData (nameof (W3cColor.SlateGrey))]
-    public void GetNames_ContainsCombinationOfAnsiAndW3cNames (string name)
+    [InlineData (nameof (StandardColor.AliceBlue))]
+    [InlineData (nameof (StandardColor.BlanchedAlmond))]
+    public void GetNames_ContainsKnownNames (string name)
     {
-        string[] names = _candidate.GetColorNames ().ToArray();
+        string [] names = _candidate.GetColorNames ().ToArray ();
         Assert.Contains (name, names);
     }
 
     [Theory]
-    // ANSI color names
     [InlineData (0, 0, 0, nameof (ColorName16.Black))]
     [InlineData (0, 0, 255, nameof (ColorName16.Blue))]
     [InlineData (59, 120, 255, nameof (ColorName16.BrightBlue))]
-    [InlineData (97, 214, 214, nameof (ColorName16.BrightCyan))]
-    [InlineData (22, 198, 12, nameof (ColorName16.BrightGreen))]
-    [InlineData (180, 0, 158, nameof (ColorName16.BrightMagenta))]
-    [InlineData (231, 72, 86, nameof (ColorName16.BrightRed))]
-    [InlineData (249, 241, 165, nameof (ColorName16.BrightYellow))]
-    [InlineData (0, 255, 255, nameof (ColorName16.Cyan))]
-    [InlineData (118, 118, 118, nameof (ColorName16.DarkGray))]
-    [InlineData (128, 128, 128, nameof (ColorName16.Gray))]
-    [InlineData (0, 128, 0, nameof (ColorName16.Green))]
-    [InlineData (255, 0, 255, nameof (ColorName16.Magenta))]
     [InlineData (255, 0, 0, nameof (ColorName16.Red))]
     [InlineData (255, 255, 255, nameof (ColorName16.White))]
-    [InlineData (255, 255, 0, nameof (ColorName16.Yellow))]
-    // W3C color names
-    [InlineData (240, 248, 255, nameof (W3cColor.AliceBlue))]
-    [InlineData (255, 235, 205, nameof (W3cColor.BlanchedAlmond))]
-    [InlineData (95, 158, 160, nameof (W3cColor.CadetBlue))]
-    [InlineData (0, 0, 139, nameof (W3cColor.DarkBlue))]
-    [InlineData (178, 34, 34, nameof (W3cColor.FireBrick))]
-    [InlineData (220, 220, 220, nameof (W3cColor.Gainsboro))]
-    [InlineData (240, 255, 240, nameof (W3cColor.HoneyDew))]
-    [InlineData (75, 0, 130, nameof (W3cColor.Indigo))]
-    [InlineData (240, 230, 140, nameof (W3cColor.Khaki))]
-    [InlineData (230, 230, 250, nameof (W3cColor.Lavender))]
-    [InlineData (128, 0, 0, nameof (W3cColor.Maroon))]
-    [InlineData (0, 0, 128, nameof (W3cColor.Navy))]
-    [InlineData (128, 128, 0, nameof (W3cColor.Olive))]
-    [InlineData (221, 160, 221, nameof (W3cColor.Plum))]
-    [InlineData (65, 105, 225, nameof (W3cColor.RoyalBlue))]
-    [InlineData (192, 192, 192, nameof (W3cColor.Silver))]
-    [InlineData (255, 99, 71, nameof (W3cColor.Tomato))]
-    [InlineData (238, 130, 238, nameof (W3cColor.Violet))]
-    [InlineData (245, 245, 245, nameof (W3cColor.WhiteSmoke))]
-    [InlineData (154, 205, 50, nameof (W3cColor.YellowGreen))]
+    [InlineData (240, 248, 255, nameof (StandardColor.AliceBlue))]
+    [InlineData (178, 34, 34, nameof (StandardColor.FireBrick))]
+    [InlineData (245, 245, 245, nameof (StandardColor.WhiteSmoke))]
     public void TryNameColor_ReturnsExpectedColorNames (byte r, byte g, byte b, string expectedName)
     {
-        var expected = (true, expectedName);
+        Color color = new (r, g, b);
+        bool actualSuccess = _candidate.TryNameColor (color, out string? actualName);
 
-        bool actualSuccess = _candidate.TryNameColor(new Color(r, g, b), out string? actualName);
-        var actual = (actualSuccess, actualName);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    [InlineData (169, 169, 169)] // W3cColor.DarkGr(a|e)y
-    public void TryNameColor_OmitsBlockedW3cColors (byte r, byte g, byte b)
-    {
-        (bool, string?) expected = (false, null);
-
-        bool actualSuccess = _candidate.TryNameColor (new Color (r, g, b), out string? actualName);
-        var actual = (actualSuccess, actualName);
-
-        Assert.Equal (expected, actual);
+        Assert.True (actualSuccess);
+        Assert.Equal (expectedName, actualName);
     }
 
     [Fact]
     public void TryNameColor_NoMatchFails ()
     {
-        (bool, string?) expected = (false, null);
-
-        bool actualSuccess = _candidate.TryNameColor (new Color (1, 2, 3), out string? actualName);
-        var actual = (actualSuccess, actualName);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    // ANSI colors
-    [InlineData (nameof (ColorName16.Black), 0, 0, 0)]
-    [InlineData (nameof (ColorName16.Blue), 0, 0, 255)]
-    [InlineData (nameof (ColorName16.BrightBlue), 59, 120, 255)]
-    [InlineData (nameof (ColorName16.BrightCyan), 97, 214, 214)]
-    [InlineData (nameof (ColorName16.BrightGreen), 22, 198, 12)]
-    [InlineData (nameof (ColorName16.BrightMagenta), 180, 0, 158)]
-    [InlineData (nameof (ColorName16.BrightRed), 231, 72, 86)]
-    [InlineData (nameof (ColorName16.BrightYellow), 249, 241, 165)]
-    [InlineData (nameof (ColorName16.Cyan), 0, 255, 255)]
-    [InlineData (nameof (ColorName16.DarkGray), 118, 118, 118)]
-    [InlineData (nameof (ColorName16.Gray), 128, 128, 128)]
-    [InlineData (nameof (ColorName16.Green), 0, 128, 0)]
-    [InlineData (nameof (ColorName16.Magenta), 255, 0, 255)]
-    [InlineData (nameof (ColorName16.Red), 255, 0, 0)]
-    [InlineData (nameof (ColorName16.White), 255, 255, 255)]
-    [InlineData (nameof (ColorName16.Yellow), 255, 255, 0)]
-    // W3C color name => substituted ANSI color
-    [InlineData (nameof (W3cColor.Fuchsia), 255, 0, 255)] // ANSI Magenta
-    [InlineData (nameof (W3cColor.DarkGrey), 118, 118, 118)] // ANSI Dark Gray
-    [InlineData (nameof (W3cColor.Grey), 128, 128, 128)] // ANSI Gray
-    [InlineData (nameof (W3cColor.Aqua), 0, 255, 255)] // ANSI Cyan
-    // W3C colors
-    [InlineData (nameof (W3cColor.AliceBlue), 240, 248, 255)]
-    [InlineData (nameof (W3cColor.BlanchedAlmond), 255, 235, 205)]
-    [InlineData (nameof (W3cColor.CadetBlue), 95, 158, 160)]
-    [InlineData (nameof (W3cColor.DarkBlue), 0, 0, 139)]
-    [InlineData (nameof (W3cColor.FireBrick), 178, 34, 34)]
-    [InlineData (nameof (W3cColor.Gainsboro), 220, 220, 220)]
-    [InlineData (nameof (W3cColor.HoneyDew), 240, 255, 240)]
-    [InlineData (nameof (W3cColor.Indigo), 75, 0, 130)]
-    [InlineData (nameof (W3cColor.Khaki), 240, 230, 140)]
-    [InlineData (nameof (W3cColor.Lavender), 230, 230, 250)]
-    [InlineData (nameof (W3cColor.Maroon), 128, 0, 0)]
-    [InlineData (nameof (W3cColor.Navy), 0, 0, 128)]
-    [InlineData (nameof (W3cColor.Olive), 128, 128, 0)]
-    [InlineData (nameof (W3cColor.Plum), 221, 160, 221)]
-    [InlineData (nameof (W3cColor.RoyalBlue), 65, 105, 225)]
-    [InlineData (nameof (W3cColor.Silver), 192, 192, 192)]
-    [InlineData (nameof (W3cColor.Tomato), 255, 99, 71)]
-    [InlineData (nameof (W3cColor.Violet), 238, 130, 238)]
-    [InlineData (nameof (W3cColor.WhiteSmoke), 245, 245, 245)]
-    [InlineData (nameof (W3cColor.YellowGreen), 154, 205, 50)]
-    // Case-insensitive
-    [InlineData ("BRIGHTBLUE", 59, 120, 255)]
-    [InlineData ("brightblue", 59, 120, 255)]
-    [InlineData ("TOMATO", 255, 99, 71)]
-    [InlineData ("tomato", 255, 99, 71)]
-
-    public void TryParseColor_ResolvesCombinationOfAnsiAndW3cColors (string inputName, byte r, byte g, byte b)
-    {
-        var expected = (true, new Color(r, g, b));
-
-        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
+        Color input = new (1, 2, 3);
+        bool success = _candidate.TryNameColor (input, out string? actualName);
+        Assert.False (success);
+        Assert.Null (actualName);
     }
 
     [Theory]
     [InlineData ("12", 231, 72, 86)] // ColorName16.BrightRed
-    [InlineData ("16737095", 255, 99, 71)] // W3cColor.Tomato
+    [InlineData ("16737095", 255, 99, 71)] // StandardColor.Tomato
+    [InlineData ("#FF0000", 255, 0, 0)] // Red
     public void TryParseColor_ResolvesValidEnumNumber (string inputName, byte r, byte g, byte b)
     {
-        var expected = (true, new Color(r, g, b));
-
-        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
+        bool success = _candidate.TryParseColor (inputName, out Color actualColor);
+        Assert.True (success);
+        Assert.Equal (r, actualColor.R);
+        Assert.Equal (g, actualColor.G);
+        Assert.Equal (b, actualColor.B);
     }
 
     [Theory]
     [InlineData (null)]
     [InlineData ("")]
     [InlineData ("brightlight")]
-    public void TryParseColor_FailsOnInvalidColorName (string? invalidName)
+    public void TryParseColor_FailsOnInvalidColorName (string? input)
     {
-        var expected = (false, default(Color));
-
-        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
+        bool success = _candidate.TryParseColor (input, out Color actualColor);
+        Assert.False (success);
+        Assert.Equal (default, actualColor);
     }
 
     [Theory]
     [InlineData ("-12")]
     [InlineData ("-16737095")]
-    public void TryParseColor_FailsOnInvalidEnumNumber (string invalidName)
+    public void TryParseColor_FailsOnInvalidEnumNumber (string input)
     {
-        var expected = (false, default(Color));
-
-        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
+        bool success = _candidate.TryParseColor (input, out Color actualColor);
+        Assert.False (success);
+        Assert.Equal (default, actualColor);
     }
 }
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs
new file mode 100644
index 0000000000..34c2767ad7
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Drawing/Color/StandardColorNameResolverTests.cs
@@ -0,0 +1,224 @@
+#nullable enable
+
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.DrawingTests;
+
+public class StandardColorNameResolverTests (ITestOutputHelper output)
+{
+    private readonly StandardColorsNameResolver _candidate = new();
+
+    [Fact]
+    public void GetColorNames_NamesAreInAlphabeticalOrder ()
+    {
+        string[] alphabeticallyOrderedNames = Enum.GetNames<StandardColor> ().Order ().ToArray ();
+
+        Assert.Equal (alphabeticallyOrderedNames, _candidate.GetColorNames ());
+    }
+
+    [Fact]
+    public void TryParseColor_Resolves_All_StandardColor_Enum_Values ()
+    {
+        foreach (StandardColor sc in Enum.GetValues<StandardColor> ())
+        {
+            bool success = _candidate.TryParseColor (sc.ToString (), out Color actual);
+            Assert.True (success, $"Expected to parse StandardColor.{sc}");
+            Color expected = new ((int)sc);
+            Assert.Equal (expected.R, actual.R);
+            Assert.Equal (expected.G, actual.G);
+            Assert.Equal (expected.B, actual.B);
+        }
+    }
+
+    [Fact]
+    public void TryNameColor_Resolves_FirstName_For_UniqueArgbValues ()
+    {
+        Dictionary<uint, string> seen = new ();
+
+        foreach (StandardColor sc in Enum.GetValues<StandardColor> ())
+        {
+            uint argb = StandardColors.GetArgb (sc);
+            if (seen.ContainsKey (argb))
+            {
+                continue;
+            }
+
+            Color color = new (argb);
+            bool success = _candidate.TryNameColor (color, out string? resolved);
+
+            Assert.True (success, $"Expected name resolution for {sc} -> ARGB #{argb:X8}");
+            Assert.NotNull (resolved);
+
+            List<string> expectedNames = new ();
+            foreach (string name in Enum.GetNames<StandardColor> ())
+            {
+                StandardColor parsed = Enum.Parse<StandardColor> (name);
+                if (StandardColors.GetArgb (parsed) == argb)
+                {
+                    expectedNames.Add (name);
+                }
+            }
+
+            Assert.Contains (resolved, expectedNames);
+            seen [argb] = resolved!;
+        }
+    }
+
+
+    [Fact]
+    public void TryNameColor_Logs_StandardColor_Aliases ()
+    {
+        var map = new Dictionary<uint, List<string>> ();
+
+        foreach (StandardColor sc in Enum.GetValues<StandardColor> ())
+        {
+            var color = new Color ((int)sc);
+            if (!map.TryGetValue (color.Argb, out var list))
+            {
+                list = new List<string> ();
+                map [color.Argb] = list;
+            }
+            list.Add (sc.ToString ());
+        }
+
+        foreach (var kvp in map.Where (kvp => kvp.Value.Count > 1))
+        {
+            output.WriteLine ($"ARGB #{kvp.Key:X8} maps to: {string.Join (", ", kvp.Value)}");
+        }
+    }
+
+
+    [Theory]
+    [InlineData (nameof (StandardColor.Aqua))]
+    [InlineData (nameof (StandardColor.Cyan))]
+    [InlineData (nameof (StandardColor.DarkGray))]
+    [InlineData (nameof (StandardColor.DarkGrey))]
+    [InlineData (nameof (StandardColor.DarkSlateGray))]
+    [InlineData (nameof (StandardColor.DarkSlateGrey))]
+    [InlineData (nameof (StandardColor.DimGray))]
+    [InlineData (nameof (StandardColor.DimGrey))]
+    [InlineData (nameof (StandardColor.Fuchsia))]
+    [InlineData (nameof (StandardColor.LightGray))]
+    [InlineData (nameof (StandardColor.LightGrey))]
+    [InlineData (nameof (StandardColor.LightSlateGray))]
+    [InlineData (nameof (StandardColor.LightSlateGrey))]
+    [InlineData (nameof (StandardColor.Magenta))]
+    [InlineData (nameof (StandardColor.SlateGray))]
+    [InlineData (nameof (StandardColor.SlateGrey))]
+    public void GetColorNames_IncludesNamesWithSameValues (string name)
+    {
+        string[] names = _candidate.GetColorNames ().ToArray();
+
+        Assert.True (names.Contains (name), $"W3C color names is missing '{name}'.");
+    }
+
+    [Theory]
+    [InlineData (240, 248, 255, nameof (StandardColor.AliceBlue))]
+    [InlineData (0, 255, 255, nameof (StandardColor.Aqua))]
+    [InlineData (255, 0, 0, nameof (StandardColor.Red))]
+    [InlineData (0, 128, 0, nameof (StandardColor.Green))]
+    [InlineData (0, 0, 255, nameof (StandardColor.Blue))]
+    [InlineData (0, 255, 0, nameof (StandardColor.Lime))]
+    [InlineData (0, 0, 0, nameof (StandardColor.Black))]
+    [InlineData (255, 255, 255, nameof (StandardColor.White))]
+    [InlineData (154, 205, 50, nameof (StandardColor.YellowGreen))]
+    public void TryNameColor_ReturnsExpectedColorName (int r, int g, int b, string expectedName)
+    {
+        var expected = (true, expectedName);
+
+        Color inputColor = new(r, g, b);
+        bool actualSuccess = _candidate.TryNameColor (inputColor, out string? actualName);
+        var actual = (actualSuccess, actualName);
+
+        Assert.Equal (expected, actual);
+    }
+
+    [Fact]
+    public void TryNameColor_NoMatchFails ()
+    {
+        (bool, string?) expected = (false, null);
+
+        bool actualSuccess = _candidate.TryNameColor (new Color (1, 2, 3), out string? actualName);
+        var actual = (actualSuccess, actualName);
+
+        Assert.Equal (expected, actual);
+    }
+
+    [Theory]
+    [InlineData (nameof (StandardColor.AliceBlue), 240, 248, 255)]
+    [InlineData (nameof (StandardColor.BlanchedAlmond), 255, 235, 205)]
+    [InlineData (nameof (StandardColor.CadetBlue), 95, 158, 160)]
+    [InlineData (nameof (StandardColor.DarkBlue), 0, 0, 139)]
+    [InlineData (nameof (StandardColor.FireBrick), 178, 34, 34)]
+    [InlineData (nameof (StandardColor.Gainsboro), 220, 220, 220)]
+    [InlineData (nameof (StandardColor.HoneyDew), 240, 255, 240)]
+    [InlineData (nameof (StandardColor.Indigo), 75, 0, 130)]
+    [InlineData (nameof (StandardColor.Khaki), 240, 230, 140)]
+    [InlineData (nameof (StandardColor.Lavender), 230, 230, 250)]
+    [InlineData (nameof (StandardColor.Maroon), 128, 0, 0)]
+    [InlineData (nameof (StandardColor.Navy), 0, 0, 128)]
+    [InlineData (nameof (StandardColor.Olive), 128, 128, 0)]
+    [InlineData (nameof (StandardColor.Plum), 221, 160, 221)]
+    [InlineData (nameof (StandardColor.RoyalBlue), 65, 105, 225)]
+    [InlineData (nameof (StandardColor.Silver), 192, 192, 192)]
+    [InlineData (nameof (StandardColor.Tomato), 255, 99, 71)]
+    [InlineData (nameof (StandardColor.Violet), 238, 130, 238)]
+    [InlineData (nameof (StandardColor.WhiteSmoke), 245, 245, 245)]
+    [InlineData (nameof (StandardColor.YellowGreen), 154, 205, 50)]
+    // Aliases also work
+    [InlineData (nameof (StandardColor.Aqua), 0, 255, 255)]
+    [InlineData (nameof (StandardColor.Cyan), 0, 255, 255)]
+    [InlineData (nameof (StandardColor.DarkGray), 169, 169, 169)]
+    [InlineData (nameof (StandardColor.DarkGrey), 169, 169, 169)]
+    // Case-insensitive
+    [InlineData ("Red", 255, 0, 0)]
+    [InlineData ("red", 255, 0, 0)]
+    [InlineData ("RED", 255, 0, 0)]
+    public void TryParseColor_ReturnsExpectedColor (string inputName, int r, int g, int b)
+    {
+        var expected = (true, new Color(r, g, b));
+
+        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
+        var actual = (actualSuccess, actualColor);
+
+        Assert.Equal (expected, actual);
+    }
+
+    [Theory]
+    [InlineData ("16737095", 255, 99, 71)] // W3cColor.Tomato
+    public void TryParseColor_ResolvesValidEnumNumber (string inputName, byte r, byte g, byte b)
+    {
+        var expected = (true, new Color(r, g, b));
+
+        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
+        var actual = (actualSuccess, actualColor);
+
+        Assert.Equal (expected, actual);
+    }
+
+    [Theory]
+    [InlineData (null)]
+    [InlineData ("")]
+    [InlineData ("brightlight")]
+    public void TryParseColor_FailsOnInvalidColorName (string? invalidName)
+    {
+        var expected = (false, default(Color));
+
+        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
+        var actual = (actualSuccess, actualColor);
+
+        Assert.Equal (expected, actual);
+    }
+
+    [Theory]
+    [InlineData ("-16737095")]
+    public void TryParseColor_FailsOnInvalidEnumNumber (string invalidName)
+    {
+        var expected = (false, default(Color));
+
+        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
+        var actual = (actualSuccess, actualColor);
+
+        Assert.Equal (expected, actual);
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Drawing/Color/W3cColorNameResolverTests.cs b/Tests/UnitTestsParallelizable/Drawing/Color/W3cColorNameResolverTests.cs
deleted file mode 100644
index 527c0be4ea..0000000000
--- a/Tests/UnitTestsParallelizable/Drawing/Color/W3cColorNameResolverTests.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-#nullable enable
-
-namespace Terminal.Gui.DrawingTests;
-
-public class W3cColorNameResolverTests
-{
-    private readonly W3cColorNameResolver _candidate = new();
-
-    [Fact]
-    public void GetColorNames_NamesAreInAlphabeticalOrder ()
-    {
-        string[] alphabeticallyOrderedNames = Enum.GetNames<W3cColor> ().Order ().ToArray ();
-
-        Assert.Equal (alphabeticallyOrderedNames, _candidate.GetColorNames ());
-    }
-
-    [Theory]
-    [InlineData (nameof (W3cColor.Aqua))]
-    [InlineData (nameof (W3cColor.Cyan))]
-    [InlineData (nameof (W3cColor.DarkGray))]
-    [InlineData (nameof (W3cColor.DarkGrey))]
-    [InlineData (nameof (W3cColor.DarkSlateGray))]
-    [InlineData (nameof (W3cColor.DarkSlateGrey))]
-    [InlineData (nameof (W3cColor.DimGray))]
-    [InlineData (nameof (W3cColor.DimGrey))]
-    [InlineData (nameof (W3cColor.Fuchsia))]
-    [InlineData (nameof (W3cColor.LightGray))]
-    [InlineData (nameof (W3cColor.LightGrey))]
-    [InlineData (nameof (W3cColor.LightSlateGray))]
-    [InlineData (nameof (W3cColor.LightSlateGrey))]
-    [InlineData (nameof (W3cColor.Magenta))]
-    [InlineData (nameof (W3cColor.SlateGray))]
-    [InlineData (nameof (W3cColor.SlateGrey))]
-    public void GetColorNames_IncludesNamesWithSameValues (string name)
-    {
-        string[] names = _candidate.GetColorNames ().ToArray();
-
-        Assert.True (names.Contains (name), $"W3C color names is missing '{name}'.");
-    }
-
-    [Theory]
-    [InlineData (240, 248, 255, nameof (W3cColor.AliceBlue))]
-    [InlineData (0, 255, 255, nameof (W3cColor.Aqua))]
-    [InlineData (255, 0, 0, nameof (W3cColor.Red))]
-    [InlineData (0, 128, 0, nameof (W3cColor.Green))]
-    [InlineData (0, 0, 255, nameof (W3cColor.Blue))]
-    [InlineData (0, 255, 0, nameof (W3cColor.Lime))]
-    [InlineData (0, 0, 0, nameof (W3cColor.Black))]
-    [InlineData (255, 255, 255, nameof (W3cColor.White))]
-    [InlineData (154, 205, 50, nameof (W3cColor.YellowGreen))]
-    public void TryNameColor_ReturnsExpectedColorName (int r, int g, int b, string expectedName)
-    {
-        var expected = (true, expectedName);
-
-        Color inputColor = new(r, g, b);
-        bool actualSuccess = _candidate.TryNameColor (inputColor, out string? actualName);
-        var actual = (actualSuccess, actualName);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Fact]
-    public void TryNameColor_NoMatchFails ()
-    {
-        (bool, string?) expected = (false, null);
-
-        bool actualSuccess = _candidate.TryNameColor (new Color (1, 2, 3), out string? actualName);
-        var actual = (actualSuccess, actualName);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    [InlineData (nameof (W3cColor.AliceBlue), 240, 248, 255)]
-    [InlineData (nameof (W3cColor.BlanchedAlmond), 255, 235, 205)]
-    [InlineData (nameof (W3cColor.CadetBlue), 95, 158, 160)]
-    [InlineData (nameof (W3cColor.DarkBlue), 0, 0, 139)]
-    [InlineData (nameof (W3cColor.FireBrick), 178, 34, 34)]
-    [InlineData (nameof (W3cColor.Gainsboro), 220, 220, 220)]
-    [InlineData (nameof (W3cColor.HoneyDew), 240, 255, 240)]
-    [InlineData (nameof (W3cColor.Indigo), 75, 0, 130)]
-    [InlineData (nameof (W3cColor.Khaki), 240, 230, 140)]
-    [InlineData (nameof (W3cColor.Lavender), 230, 230, 250)]
-    [InlineData (nameof (W3cColor.Maroon), 128, 0, 0)]
-    [InlineData (nameof (W3cColor.Navy), 0, 0, 128)]
-    [InlineData (nameof (W3cColor.Olive), 128, 128, 0)]
-    [InlineData (nameof (W3cColor.Plum), 221, 160, 221)]
-    [InlineData (nameof (W3cColor.RoyalBlue), 65, 105, 225)]
-    [InlineData (nameof (W3cColor.Silver), 192, 192, 192)]
-    [InlineData (nameof (W3cColor.Tomato), 255, 99, 71)]
-    [InlineData (nameof (W3cColor.Violet), 238, 130, 238)]
-    [InlineData (nameof (W3cColor.WhiteSmoke), 245, 245, 245)]
-    [InlineData (nameof (W3cColor.YellowGreen), 154, 205, 50)]
-    // Aliases also work
-    [InlineData (nameof (W3cColor.Aqua), 0, 255, 255)]
-    [InlineData (nameof (W3cColor.Cyan), 0, 255, 255)]
-    [InlineData (nameof (W3cColor.DarkGray), 169, 169, 169)]
-    [InlineData (nameof (W3cColor.DarkGrey), 169, 169, 169)]
-    // Case-insensitive
-    [InlineData ("Red", 255, 0, 0)]
-    [InlineData ("red", 255, 0, 0)]
-    [InlineData ("RED", 255, 0, 0)]
-    public void TryParseColor_ReturnsExpectedColor (string inputName, int r, int g, int b)
-    {
-        var expected = (true, new Color(r, g, b));
-
-        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    [InlineData ("16737095", 255, 99, 71)] // W3cColor.Tomato
-    public void TryParseColor_ResolvesValidEnumNumber (string inputName, byte r, byte g, byte b)
-    {
-        var expected = (true, new Color(r, g, b));
-
-        bool actualSuccess = _candidate.TryParseColor (inputName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    [InlineData (null)]
-    [InlineData ("")]
-    [InlineData ("brightlight")]
-    public void TryParseColor_FailsOnInvalidColorName (string? invalidName)
-    {
-        var expected = (false, default(Color));
-
-        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
-    }
-
-    [Theory]
-    [InlineData ("-16737095")]
-    public void TryParseColor_FailsOnInvalidEnumNumber (string invalidName)
-    {
-        var expected = (false, default(Color));
-
-        bool actualSuccess = _candidate.TryParseColor (invalidName, out Color actualColor);
-        var actual = (actualSuccess, actualColor);
-
-        Assert.Equal (expected, actual);
-    }
-}
diff --git a/Tests/UnitTestsParallelizable/Drawing/ColorSchemeTests.cs b/Tests/UnitTestsParallelizable/Drawing/ColorSchemeTests.cs
deleted file mode 100644
index 05ac1b7a99..0000000000
--- a/Tests/UnitTestsParallelizable/Drawing/ColorSchemeTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Reflection;
-
-namespace Terminal.Gui.DrawingTests;
-
-public class ColorSchemeTests
-{
-    [Fact]
-    public void Colors_ColorSchemes_Built_Ins ()
-    {
-        Colors.Reset ();
-        Dictionary<string, ColorScheme> schemes = Colors.ColorSchemes;
-        Assert.NotNull (schemes);
-        Assert.Equal (5, schemes.Count);
-        Assert.True (schemes.ContainsKey ("TopLevel"));
-        Assert.True (schemes.ContainsKey ("Base"));
-        Assert.True (schemes.ContainsKey ("Dialog"));
-        Assert.True (schemes.ContainsKey ("Menu"));
-        Assert.True (schemes.ContainsKey ("Error"));
-    }
-
-    [Fact]
-    public void Colors_ColorSchemes_Property_Has_Private_Setter ()
-    {
-        // Resharper Code Cleanup likes to remove the `private set; `
-        // from the ColorSchemes property.  This test will fail if
-        // that happens.
-        PropertyInfo property = typeof (Colors).GetProperty ("ColorSchemes");
-        Assert.NotNull (property);
-        Assert.NotNull (property.SetMethod);
-        Assert.True (property.GetSetMethod (true).IsPrivate);
-    }
-
-    [Fact]
-    public void ColorScheme_New ()
-    {
-        var scheme = new ColorScheme ();
-        var lbl = new Label ();
-        lbl.ColorScheme = scheme;
-        lbl.Draw ();
-    }
-
-    [Fact]
-    public void ColorScheme_BigConstructor ()
-    {
-        var a = new Attribute (1);
-        var b = new Attribute (2);
-        var c = new Attribute (3);
-        var d = new Attribute (4);
-        var e = new Attribute (5);
-
-        var cs = new ColorScheme (
-            normal: a,
-            focus: b,
-            hotNormal: c,
-            disabled: d,
-            hotFocus: e);
-
-        Assert.Equal (a, cs.Normal);
-        Assert.Equal (b, cs.Focus);
-        Assert.Equal (c, cs.HotNormal);
-        Assert.Equal (d, cs.Disabled);
-        Assert.Equal (e, cs.HotFocus);
-    }
-}
diff --git a/Tests/UnitTestsParallelizable/Drawing/SchemeTests.GetAttributeForRoleAlgorithmTests.cs b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.GetAttributeForRoleAlgorithmTests.cs
new file mode 100644
index 0000000000..999a4c828d
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.GetAttributeForRoleAlgorithmTests.cs
@@ -0,0 +1,128 @@
+using Xunit;
+
+namespace Terminal.Gui.DrawingTests;
+
+public class SchemeGetAttributeForRoleAlgorithmTests
+{
+    [Fact]
+    public void Normal_Is_Always_Explicit ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Assert.NotNull (scheme.Normal);
+        Assert.Equal (normal, scheme.GetAttributeForRole (VisualRole.Normal));
+    }
+
+    [Fact]
+    public void Focus_Derived_From_Normal_Swaps_FgBg ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Attribute focus = scheme.GetAttributeForRole (VisualRole.Focus);
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out _));
+        Assert.Equal (normal.Background, focus.Foreground);
+        Assert.Equal (normal.Foreground, focus.Background);
+    }
+
+    //[Fact]
+    //public void Highlight_Derived_From_Normal_HighlightColor ()
+    //{
+    //    Attribute normal = new ("Red", "Blue");
+    //    Scheme scheme = new (normal);
+
+    //    Attribute highlight = scheme.GetAttributeForRole (VisualRole.Highlight);
+    //    Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out _));
+    //    Assert.Equal (normal.Background.GetHighlightColor (), highlight.Background);
+    //}
+
+    //[Fact]
+    //public void Editable_Derived_From_Normal_LightYellow_Fg ()
+    //{
+    //    Attribute normal = new ("Red", "Blue");
+    //    Scheme scheme = new (normal);
+
+    //    Attribute editable = scheme.GetAttributeForRole (VisualRole.Editable);
+    //    Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out _));
+    //    Assert.Equal (new Color ("LightYellow"), editable.Foreground);
+    //}
+
+    //[Fact]
+    //public void ReadOnly_Derived_From_Editable_Italic ()
+    //{
+    //    Attribute normal = new ("Red", "Blue");
+    //    Scheme scheme = new (normal);
+
+    //    Attribute readOnly = scheme.GetAttributeForRole (VisualRole.ReadOnly);
+    //    Attribute editable = scheme.GetAttributeForRole (VisualRole.Editable);
+    //    Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out _));
+    //    Assert.Equal (editable.Foreground, readOnly.Foreground);
+    //    Assert.True (readOnly.Style.HasFlag (TextStyle.Italic));
+    //}
+
+    //[Fact]
+    //public void Disabled_Derived_From_Normal_Faint ()
+    //{
+    //    Attribute normal = new ("Red", "Blue");
+    //    Scheme scheme = new (normal);
+
+    //    Attribute disabled = scheme.GetAttributeForRole (VisualRole.Disabled);
+    //    Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out _));
+    //    Assert.True (disabled.Style.HasFlag (TextStyle.Faint));
+    //}
+
+    [Fact]
+    public void Active_Derived_Correctly ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+
+        Attribute active = scheme.GetAttributeForRole (VisualRole.Active);
+        Attribute focus = scheme.GetAttributeForRole (VisualRole.Focus);
+        Assert.True (active.Style.HasFlag (TextStyle.Bold));
+        //Assert.Equal (active.Foreground, focus.Foreground);
+        //Assert.Equal (active.Background, active.Background);
+    }
+
+    [Fact]
+    public void HotNormal_Derived_From_Normal_Underline ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Attribute hotNormal = scheme.GetAttributeForRole (VisualRole.HotNormal);
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+        Assert.True (hotNormal.Style.HasFlag (TextStyle.Underline));
+    }
+
+    [Fact]
+    public void HotFocus_Derived_From_Focus_Underline ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Attribute hotFocus = scheme.GetAttributeForRole (VisualRole.HotFocus);
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out _));
+        Attribute focus = scheme.GetAttributeForRole (VisualRole.Focus);
+        Assert.True (hotFocus.Style.HasFlag (TextStyle.Underline));
+        Assert.Equal (focus.Foreground, hotFocus.Foreground);
+        Assert.Equal (focus.Background, hotFocus.Background);
+    }
+
+    [Fact]
+    public void HotActive_Derived_From_Active_Underline ()
+    {
+        Attribute normal = new ("Red", "Blue");
+        Scheme scheme = new (normal);
+
+        Attribute hotActive = scheme.GetAttributeForRole (VisualRole.HotActive);
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out _));
+        Attribute active = scheme.GetAttributeForRole (VisualRole.Active);
+        Assert.True (hotActive.Style.HasFlag (TextStyle.Underline));
+        Assert.Equal (active.Foreground, hotActive.Foreground);
+        Assert.Equal (active.Background, hotActive.Background);
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Drawing/SchemeTests.cs b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.cs
new file mode 100644
index 0000000000..0d619f773e
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/Drawing/SchemeTests.cs
@@ -0,0 +1,165 @@
+#nullable enable
+using System.Reflection;
+
+namespace Terminal.Gui.DrawingTests;
+
+public class SchemeTests
+{
+    [Fact]
+    public void Colors_Schemes_Property_Has_Private_Setter ()
+    {
+        // Resharper Code Cleanup likes to remove the `private set; `
+        // from the Schemes property.  This test will fail if
+        // that happens.
+        PropertyInfo? property = typeof (SchemeManager).GetProperty ("Schemes");
+        Assert.NotNull (property);
+        Assert.NotNull (property.SetMethod);
+        Assert.True (property.GetSetMethod (true)!.IsPrivate);
+    }
+
+    [Fact]
+    public void New ()
+    {
+        var scheme = new Scheme ();
+        var lbl = new Label ();
+        lbl.SetScheme (scheme);
+        lbl.Draw ();
+    }
+
+    [Fact]
+    public void Built_Ins ()
+    {
+        Dictionary<string, Scheme?> schemes = SchemeManager.GetSchemes ();
+        Assert.NotNull (schemes);
+        Assert.Equal (5, schemes.Count);
+        Assert.True (schemes.ContainsKey ("Base"));
+        Assert.True (schemes.ContainsKey ("Dialog"));
+        Assert.True (schemes.ContainsKey ("Error"));
+        Assert.True (schemes.ContainsKey ("Menu"));
+        Assert.True (schemes.ContainsKey ("TopLevel"));
+    }
+
+    [Fact]
+    public void Built_Ins_Are_Implicit ()
+    {
+        Dictionary<string, Scheme?> schemes = SchemeManager.GetSchemes ();
+
+        Assert.True (schemes ["Base"]!.TryGetExplicitlySetAttributeForRole (VisualRole.Normal, out _));
+        Assert.False (schemes ["Base"]!.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+    }
+
+
+    [Fact]
+    public void With_Same_Attributes_AreEqual ()
+    {
+        Attribute attr = new (Color.Red, Color.Blue, TextStyle.Bold);
+        Scheme s1 = new (attr);
+        Scheme s2 = new (attr);
+
+        Assert.Equal (s1, s2);
+        Assert.Equal (s1.GetHashCode (), s2.GetHashCode ());
+    }
+
+    [Fact]
+    public void Scheme_Properties_Are_Immutable ()
+    {
+        Scheme scheme = new (new Attribute ("Red", "Blue"));
+        // The following line should not compile if uncommented:
+        // scheme.Normal = new Attribute("Green", "Yellow");
+        // Immutability is enforced by the C# compiler for init-only properties.
+        Assert.True (true); // This test is a placeholder for documentation purposes.
+    }
+
+    [Fact]
+    public void ObjectInitializer_Sets_Properties ()
+    {
+        Scheme scheme = new ()
+        {
+            Normal = new Attribute ("Red", "Blue"),
+            Focus = new Attribute ("Green", "Yellow"),
+            HotNormal = new Attribute ("White", "Black"),
+            HotFocus = new Attribute ("Black", "White"),
+            Active = new Attribute ("Cyan", "Magenta"),
+            HotActive = new Attribute ("Magenta", "Cyan"),
+            Highlight = new Attribute ("Yellow", "Red"),
+            Editable = new Attribute ("Blue", "Yellow"),
+            ReadOnly = new Attribute ("Gray", "Black"),
+            Disabled = new Attribute ("DarkGray", "White")
+        };
+
+        Assert.Equal (new Attribute ("Red", "Blue"), scheme.Normal);
+        Assert.Equal (new Attribute ("Green", "Yellow"), scheme.Focus);
+        Assert.Equal (new Attribute ("White", "Black"), scheme.HotNormal);
+        Assert.Equal (new Attribute ("Black", "White"), scheme.HotFocus);
+        Assert.Equal (new Attribute ("Cyan", "Magenta"), scheme.Active);
+        Assert.Equal (new Attribute ("Magenta", "Cyan"), scheme.HotActive);
+        Assert.Equal (new Attribute ("Yellow", "Red"), scheme.Highlight);
+        Assert.Equal (new Attribute ("Blue", "Yellow"), scheme.Editable);
+        Assert.Equal (new Attribute ("Gray", "Black"), scheme.ReadOnly);
+        Assert.Equal (new Attribute ("DarkGray", "White"), scheme.Disabled);
+    }
+
+    [Fact]
+    public void With_Different_Attributes_AreNotEqual ()
+    {
+        Scheme s1 = new (new Attribute ("Red", "Blue"));
+        Scheme s2 = new (new Attribute ("Green", "Yellow"));
+        Assert.NotEqual (s1, s2);
+        Assert.NotEqual (s1.GetHashCode (), s2.GetHashCode ());
+    }
+
+    [Fact]
+    public void Default_Constructor_Has_Default_Values ()
+    {
+        Scheme scheme = new ();
+        Assert.True (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Normal, out _));
+
+        // All other roles should be implicit and derived from Normal
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotNormal, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Focus, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotFocus, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Active, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.HotActive, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Highlight, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Editable, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.ReadOnly, out _));
+        Assert.False (scheme.TryGetExplicitlySetAttributeForRole (VisualRole.Disabled, out _));
+    }
+
+    [Fact]
+    public void ToString_Outputs_All_Properties ()
+    {
+        Scheme scheme = new (new Attribute ("Red", "Blue"));
+        string str = scheme.ToString ();
+        Assert.Contains ("Normal", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("HotNormal", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("Focus", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("HotFocus", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("Active", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("HotActive", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("Highlight", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("Editable", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("ReadOnly", str, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains ("Disabled", str, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public void CopyConstructor_Null_Throws ()
+    {
+        Assert.Throws<ArgumentNullException> (() => new Scheme (null));
+    }
+
+    [Fact]
+    public void Is_Thread_Safe_For_Concurrent_Reads ()
+    {
+        Scheme scheme = new (new Attribute ("Red", "Blue"));
+        Parallel.For (0, 1000, i =>
+                               {
+                                   // All threads can safely read properties
+                                   _ = scheme.Normal;
+                                   _ = scheme.GetAttributeForRole (VisualRole.Focus);
+                                   _ = scheme.ToString ();
+                               });
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
index 26605314a0..f0786872b3 100644
--- a/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
+++ b/Tests/UnitTestsParallelizable/Input/Keyboard/KeyTests.cs
@@ -573,20 +573,4 @@ public void Equals_Handled_Changed_ShouldReturnFalse_WhenNotEqual ()
         Key b = Key.A;
         Assert.False (a.Equals (b));
     }
-
-    [Fact]
-    public void Set_Key_Separator_With_Rune_Default_Ensure_Using_The_Default_Plus ()
-    {
-        Key key = new (Key.A.WithCtrl);
-        Assert.Equal ((Rune)'+', Key.Separator);
-        Assert.Equal ("Ctrl+A", key.ToString ());
-
-        Key.Separator = new ('-');
-        Assert.Equal ((Rune)'-', Key.Separator);
-        Assert.Equal ("Ctrl-A", key.ToString ());
-
-        Key.Separator = new ();
-        Assert.Equal ((Rune)'+', Key.Separator);
-        Assert.Equal ("Ctrl+A", key.ToString ());
-    }
 }
diff --git a/Tests/UnitTestsParallelizable/MockConsoleDriver.cs b/Tests/UnitTestsParallelizable/MockConsoleDriver.cs
new file mode 100644
index 0000000000..a5e97f26a8
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/MockConsoleDriver.cs
@@ -0,0 +1,206 @@
+#nullable enable
+using System.Text;
+
+using Terminal.Gui;
+using Attribute = Terminal.Gui.Attribute;
+using Color = Terminal.Gui.Color;
+
+internal class MockConsoleDriver : IConsoleDriver
+{
+    public event EventHandler<Attribute>? AttributeSet;
+
+    private IClipboard? _clipboard;
+    private Rectangle _screen;
+    private Region? _clip;
+    private int _col;
+    private int _cols;
+    private Cell [,]? _contents;
+    private int _left;
+    private int _row;
+    private int _rows;
+    private int _top;
+    private bool _supportsTrueColor;
+    private bool _force16Colors;
+    private Attribute _currentAttribute;
+
+    /// <inheritdoc />
+    public IClipboard? Clipboard => _clipboard;
+
+    /// <inheritdoc />
+    public Rectangle Screen => _screen;
+
+    /// <inheritdoc />
+    public Region? Clip
+    {
+        get => _clip;
+        set => _clip = value;
+    }
+
+    /// <inheritdoc />
+    public int Col => _col;
+
+    /// <inheritdoc />
+    public int Cols
+    {
+        get => _cols;
+        set => _cols = value;
+    }
+
+    /// <inheritdoc />
+    public Cell [,]? Contents
+    {
+        get => _contents;
+        set => _contents = value;
+    }
+
+    /// <inheritdoc />
+    public int Left
+    {
+        get => _left;
+        set => _left = value;
+    }
+
+    /// <inheritdoc />
+    public int Row => _row;
+
+    /// <inheritdoc />
+    public int Rows
+    {
+        get => _rows;
+        set => _rows = value;
+    }
+
+    /// <inheritdoc />
+    public int Top
+    {
+        get => _top;
+        set => _top = value;
+    }
+
+    /// <inheritdoc />
+    public bool SupportsTrueColor => _supportsTrueColor;
+
+    /// <inheritdoc />
+    public bool Force16Colors
+    {
+        get => _force16Colors;
+        set => _force16Colors = value;
+    }
+
+    /// <inheritdoc />
+    public Attribute CurrentAttribute
+    {
+        get => _currentAttribute;
+        set => _currentAttribute = value;
+    }
+
+    /// <inheritdoc />
+    public string GetVersionInfo () { return string.Empty; }
+
+    /// <inheritdoc />
+    public void WriteRaw (string ansi) {  }
+
+    /// <inheritdoc />
+    public bool IsRuneSupported (Rune rune) { return true; }
+
+    /// <inheritdoc />
+    public bool IsValidLocation (Rune rune, int col, int row) { return true; }
+
+    /// <inheritdoc />
+    public void Move (int col, int row)
+    {
+        _col = col;
+        _row = row;
+    }
+
+    /// <inheritdoc />
+    public void AddRune (Rune rune) {  }
+
+    /// <inheritdoc />
+    public void AddRune (char c) {  }
+
+    /// <inheritdoc />
+    public void AddStr (string str) {  }
+
+    /// <inheritdoc />
+    public void ClearContents () { }
+
+    /// <inheritdoc />
+    public event EventHandler<EventArgs>? ClearedContents;
+
+    /// <inheritdoc />
+    public void FillRect (Rectangle rect, Rune rune = default) { }
+
+    /// <inheritdoc />
+    public void FillRect (Rectangle rect, char c) {  }
+
+    /// <inheritdoc />
+    public bool GetCursorVisibility (out CursorVisibility visibility)
+    {
+        visibility = CursorVisibility.Invisible;
+        return false;
+
+    }
+
+    /// <inheritdoc />
+    public void Refresh () { }
+
+    /// <inheritdoc />
+    public bool SetCursorVisibility (CursorVisibility visibility) { throw new NotImplementedException (); }
+
+    /// <inheritdoc />
+    public event EventHandler<SizeChangedEventArgs>? SizeChanged;
+
+    /// <inheritdoc />
+    public void Suspend () {  }
+
+    /// <inheritdoc />
+    public void UpdateCursor () {}
+
+    /// <inheritdoc />
+    public MainLoop Init () { return null!; }
+
+    /// <inheritdoc />
+    public void End () {  }
+
+    /// <inheritdoc />
+
+    /// <inheritdoc />
+    public Attribute SetAttribute (Attribute c)
+    {
+        Attribute oldAttribute = _currentAttribute;
+        _currentAttribute = c;
+
+        AttributeSet?.Invoke (this, c);
+
+        return oldAttribute;
+    }
+
+    /// <inheritdoc />
+    public Attribute GetAttribute ()
+    {
+        return _currentAttribute;
+    }
+
+
+    /// <inheritdoc />
+    public Attribute MakeColor (in Color foreground, in Color background) { throw new NotImplementedException (); }
+
+    /// <inheritdoc />
+    public event EventHandler<MouseEventArgs>? MouseEvent;
+
+    /// <inheritdoc />
+    public event EventHandler<Key>? KeyDown;
+
+    /// <inheritdoc />
+    public event EventHandler<Key>? KeyUp;
+
+    /// <inheritdoc />
+    public void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool ctrl) { throw new NotImplementedException (); }
+
+    /// <inheritdoc />
+    public void QueueAnsiRequest (AnsiEscapeSequenceRequest request) { throw new NotImplementedException (); }
+
+    /// <inheritdoc />
+    public AnsiRequestScheduler GetRequestScheduler () { throw new NotImplementedException (); }
+}
diff --git a/Tests/UnitTestsParallelizable/TestSetup.cs b/Tests/UnitTestsParallelizable/TestSetup.cs
index fa86950e53..b85638e932 100644
--- a/Tests/UnitTestsParallelizable/TestSetup.cs
+++ b/Tests/UnitTestsParallelizable/TestSetup.cs
@@ -63,7 +63,7 @@ private void CheckDefaultState ()
         Assert.False (Application._forceFakeConsole);
         Assert.Equal (-1, Application.MainThreadId);
         Assert.Empty (Application.TopLevels);
-        Assert.Empty (Application._cachedViewsUnderMouse);
+        Assert.Empty (Application.CachedViewsUnderMouse);
 
         // Mouse
         // Do not reset _lastMousePosition
diff --git a/Tests/UnitTestsParallelizable/View/Adornment/BorderArrangementTests.cs b/Tests/UnitTestsParallelizable/View/Adornment/BorderArrangementTests.cs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Tests/UnitTestsParallelizable/View/Adornment/MarginTests.cs b/Tests/UnitTestsParallelizable/View/Adornment/MarginTests.cs
new file mode 100644
index 0000000000..3b834e8e9c
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/View/Adornment/MarginTests.cs
@@ -0,0 +1,66 @@
+using UnitTests;
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.ViewTests;
+
+public class MarginTests
+{
+    [Fact]
+    public void Is_Visually_Transparent ()
+    {
+        var view = new View { Height = 3, Width = 3 };
+        Assert.True(view.Margin!.ViewportSettings.HasFlag(ViewportSettings.Transparent), "Margin should be transparent by default.");
+    }
+
+    [Fact]
+    public void Is_Transparent_To_Mouse ()
+    {
+        var view = new View { Height = 3, Width = 3 };
+        Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse by default.");
+    }
+
+    [Fact]
+    public void When_Not_Visually_Transparent ()
+    {
+        var view = new View { Height = 3, Width = 3 };
+
+        // Give the Margin some size
+        view.Margin!.Thickness = new Thickness (1, 1, 1, 1);
+
+        // Give it Text
+        view.Margin.Text = "Test";
+
+        // Strip off ViewportSettings.Transparent
+        view.Margin!.ViewportSettings &= ~ViewportSettings.Transparent;
+
+        // 
+
+    }
+
+    [Fact]
+    public void Thickness_Is_Empty_By_Default ()
+    {
+        var view = new View { Height = 3, Width = 3 };
+        Assert.Equal (Thickness.Empty, view.Margin!.Thickness);
+    }
+
+    // ShadowStyle
+    [Fact]
+    public void Margin_Uses_ShadowStyle_Transparent ()
+    {
+        var view = new View { Height = 3, Width = 3, ShadowStyle = ShadowStyle.Transparent };
+        Assert.Equal (ShadowStyle.Transparent, view.Margin!.ShadowStyle);
+        Assert.True (view.Margin.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse when ShadowStyle is Transparent.");
+        Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.Transparent), "Margin should be transparent when ShadowStyle is Transparent..");
+    }
+
+    [Fact]
+    public void Margin_Uses_ShadowStyle_Opaque ()
+    {
+        var view = new View { Height = 3, Width = 3, ShadowStyle = ShadowStyle.Opaque };
+        Assert.Equal (ShadowStyle.Opaque, view.Margin!.ShadowStyle);
+        Assert.True (view.Margin.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse when ShadowStyle is Opaque.");
+        Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.Transparent), "Margin should be transparent when ShadowStyle is Opaque..");
+    }
+
+}
diff --git a/Tests/UnitTestsParallelizable/View/ColorSchemeTests.cs b/Tests/UnitTestsParallelizable/View/ColorSchemeTests.cs
deleted file mode 100644
index c8f99c9e2c..0000000000
--- a/Tests/UnitTestsParallelizable/View/ColorSchemeTests.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#nullable enable
-namespace Terminal.Gui.ViewTests;
-
-[Trait ("Category", "Output")]
-public class ColorSchemeTests
-{
-    [Fact]
-    public void GetHotNormalColor_ColorScheme ()
-    {
-        var view = new View { ColorScheme = Colors.ColorSchemes ["Base"] };
-
-        Assert.Equal (view.ColorScheme!.HotNormal, view.GetHotNormalColor ());
-
-        view.Enabled = false;
-        Assert.Equal (view.ColorScheme.Disabled, view.GetHotNormalColor ());
-        view.Dispose ();
-    }
-
-    [Fact]
-    public void GetNormalColor_ColorScheme ()
-    {
-        var view = new View { ColorScheme = Colors.ColorSchemes ["Base"] };
-
-        Assert.Equal (view.ColorScheme!.Normal, view.GetNormalColor ());
-
-        view.Enabled = false;
-        Assert.Equal (view.ColorScheme.Disabled, view.GetNormalColor ());
-        view.Dispose ();
-    }
-}
diff --git a/Tests/UnitTestsParallelizable/View/Draw/NeedsDrawTests.cs b/Tests/UnitTestsParallelizable/View/Draw/NeedsDrawTests.cs
index fc5093aaba..1a0839eb32 100644
--- a/Tests/UnitTestsParallelizable/View/Draw/NeedsDrawTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Draw/NeedsDrawTests.cs
@@ -238,7 +238,7 @@ public void NeedsDrawRect_Is_Viewport_Relative ()
         };
         Assert.Equal (new (0, 0, 10, 10), superView.Frame);
         Assert.Equal (new (0, 0, 10, 10), superView.Viewport);
-        Assert.Equal (new (0, 0, 10, 10), superView._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 10), superView.NeedsDrawRect);
 
         var view = new View
         {
@@ -248,49 +248,49 @@ public void NeedsDrawRect_Is_Viewport_Relative ()
         view.Frame = new (0, 1, 2, 3);
         Assert.Equal (new (0, 1, 2, 3), view.Frame);
         Assert.Equal (new (0, 0, 2, 3), view.Viewport);
-        Assert.Equal (new (0, 0, 2, 3), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 2, 3), view.NeedsDrawRect);
 
         superView.Add (view);
         Assert.Equal (new (0, 0, 10, 10), superView.Frame);
         Assert.Equal (new (0, 0, 10, 10), superView.Viewport);
-        Assert.Equal (new (0, 0, 10, 10), superView._needsDrawRect);
+        Assert.Equal (new (0, 0, 10, 10), superView.NeedsDrawRect);
         Assert.Equal (new (0, 1, 2, 3), view.Frame);
         Assert.Equal (new (0, 0, 2, 3), view.Viewport);
-        Assert.Equal (new (0, 0, 2, 3), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 2, 3), view.NeedsDrawRect);
 
         view.Frame = new (3, 3, 5, 5);
         Assert.Equal (new (3, 3, 5, 5), view.Frame);
         Assert.Equal (new (0, 0, 5, 5), view.Viewport);
-        Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
 
         view.Frame = new (3, 3, 6, 6); // Grow right/bottom 1
         Assert.Equal (new (3, 3, 6, 6), view.Frame);
         Assert.Equal (new (0, 0, 6, 6), view.Viewport);
-        Assert.Equal (new (0, 0, 6, 6), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 6, 6), view.NeedsDrawRect);
 
         view.Frame = new (3, 3, 5, 5); // Shrink right/bottom 1
         Assert.Equal (new (3, 3, 5, 5), view.Frame);
         Assert.Equal (new (0, 0, 5, 5), view.Viewport);
-        Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
 
         view.SetContentSize (new (10, 10));
         Assert.Equal (new (3, 3, 5, 5), view.Frame);
         Assert.Equal (new (0, 0, 5, 5), view.Viewport);
-        Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
 
         view.Viewport = new (1, 1, 5, 5); // Scroll up/left 1
         Assert.Equal (new (3, 3, 5, 5), view.Frame);
         Assert.Equal (new (1, 1, 5, 5), view.Viewport);
-        Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
+        Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
 
         view.Frame = new (3, 3, 6, 6); // Grow right/bottom 1
         Assert.Equal (new (3, 3, 6, 6), view.Frame);
         Assert.Equal (new (1, 1, 6, 6), view.Viewport);
-        Assert.Equal (new (1, 1, 6, 6), view._needsDrawRect);
+        Assert.Equal (new (1, 1, 6, 6), view.NeedsDrawRect);
 
         view.Frame = new (3, 3, 5, 5);
         Assert.Equal (new (3, 3, 5, 5), view.Frame);
         Assert.Equal (new (1, 1, 5, 5), view.Viewport);
-        Assert.Equal (new (1, 1, 5, 5), view._needsDrawRect);
+        Assert.Equal (new (1, 1, 5, 5), view.NeedsDrawRect);
     }
 }
diff --git a/Tests/UnitTestsParallelizable/View/Layout/GetViewsAtLocationTests.cs b/Tests/UnitTestsParallelizable/View/Layout/GetViewsAtLocationTests.cs
new file mode 100644
index 0000000000..88886740f6
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/View/Layout/GetViewsAtLocationTests.cs
@@ -0,0 +1,407 @@
+#nullable enable
+
+namespace Terminal.Gui.ViewMouseTests;
+
+[Trait ("Category", "Layout")]
+public class GetViewsAtLocationTests
+{
+    private class TestView : View
+    {
+        public TestView (int x, int y, int w, int h, bool visible = true)
+        {
+            X = x;
+            Y = y;
+            Width = w;
+            Height = h;
+            base.Visible = visible;
+        }
+    }
+
+    [Fact]
+    public void ReturnsEmpty_WhenRootIsNull ()
+    {
+        var result = View.GetViewsAtLocation (null, new Point (0, 0));
+        Assert.Empty (result);
+    }
+
+    [Fact]
+    public void ReturnsEmpty_WhenRootIsNotVisible ()
+    {
+        TestView root = new (0, 0, 10, 10, visible: false);
+        var result = View.GetViewsAtLocation (root, new Point (5, 5));
+        Assert.Empty (result);
+    }
+
+    [Fact]
+    public void ReturnsEmpty_WhenPointOutsideRoot ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var result = View.GetViewsAtLocation (root, new Point (20, 20));
+        Assert.Empty (result);
+    }
+
+
+    [Fact]
+    public void ReturnsEmpty_WhenPointOutsideRoot_AndSubview ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (5, 5, 2, 2);
+        root.Add (sub);
+        var result = View.GetViewsAtLocation (root, new Point (20, 20));
+        Assert.Empty (result);
+    }
+
+    [Fact]
+    public void ReturnsRoot_WhenPointInsideRoot_NoSubviews ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var result = View.GetViewsAtLocation (root, new Point (5, 5));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+
+
+    [Fact]
+    public void ReturnsRoot_And_Subview_WhenPointInsideRootMargin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Margin!.Thickness = new (1);
+        TestView sub = new (2, 2, 5, 5);
+        root.Add (sub);
+        var result = View.GetViewsAtLocation (root, new Point (3, 3));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_And_Subview_Border_WhenPointInsideRootMargin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Margin!.Thickness = new (1);
+        TestView sub = new (2, 2, 5, 5);
+        sub.BorderStyle = LineStyle.Dotted;
+        root.Add (sub);
+        var result = View.GetViewsAtLocation (root, new Point (3, 3));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Border, result [2]);
+    }
+
+
+    [Fact]
+    public void ReturnsRoot_And_Margin_WhenPointInside_With_Margin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Margin!.Thickness = new (1);
+        var result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Margin, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_WhenPointOutsideSubview_With_Margin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Margin!.Thickness = new (1);
+        TestView sub = new (2, 2, 5, 5);
+        root.Add (sub);
+        List<View?> result = View.GetViewsAtLocation (root, new Point (2, 2));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+
+        result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Margin, result [1]);
+
+        result = View.GetViewsAtLocation (root, new Point (1, 1));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+
+        result = View.GetViewsAtLocation (root, new Point (8, 8));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+
+
+    [Fact]
+    public void ReturnsRoot_And_Border_WhenPointInside_With_Border ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Border!.Thickness = new (1);
+        var result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Border, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_WhenPointOutsideSubview_With_Border ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Border!.Thickness = new (1);
+        TestView sub = new (2, 2, 5, 5);
+        root.Add (sub);
+        var result = View.GetViewsAtLocation (root, new Point (2, 2));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+
+        result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Border, result [1]);
+
+        result = View.GetViewsAtLocation (root, new Point (1, 1));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+
+        result = View.GetViewsAtLocation (root, new Point (8, 8));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_And_Border_WhenPointInsideRootBorder ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Border!.Thickness = new (1);
+        var result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Border, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_And_Padding_WhenPointInsideRootPadding ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        root.Padding!.Thickness = new (1);
+        var result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (root.Padding, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubview_WhenPointInsideSubview ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        root.Add (sub);
+
+        var result = View.GetViewsAtLocation (root, new Point (3, 3));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndMargin_WhenPointInsideSubviewMargin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.Margin!.Thickness = new (1);
+        root.Add (sub);
+
+        var result = View.GetViewsAtLocation (root, new Point (6, 6));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Margin, result [2]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndBorder_WhenPointInsideSubviewBorder ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.Border!.Thickness = new (1);
+        root.Add (sub);
+
+        var result = View.GetViewsAtLocation (root, new Point (2, 2));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Border, result [2]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndSubviewAndBorder_WhenPointInsideSubviewBorder ()
+    {
+        TestView root = new (2, 2, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.Border!.Thickness = new (1);
+        root.Add (sub);
+
+        var result = View.GetViewsAtLocation (root, new Point (4, 4));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Border, result [2]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndBorder_WhenPointInsideSubviewPadding ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.Padding!.Thickness = new (1);
+        root.Add (sub);
+
+        var result = View.GetViewsAtLocation (root, new Point (2, 2));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Padding, result [2]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndMarginAndShadowView_WhenPointInsideSubviewMargin ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.ShadowStyle = ShadowStyle.Opaque;
+        root.Add (sub);
+
+        root.Layout ();
+
+        var result = View.GetViewsAtLocation (root, new Point (6, 6));
+        Assert.Equal (5, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Margin, result [2]);
+        Assert.Equal (sub.Margin!.SubViews.ElementAt (0), result [3]);
+        Assert.Equal (sub.Margin!.SubViews.ElementAt (1), result [4]);
+    }
+
+    [Fact]
+    public void ReturnsRootAndSubviewAndBorderAndButton_WhenPointInsideSubviewBorder ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        TestView sub = new (2, 2, 5, 5);
+        sub.Border!.Thickness = new (1);
+
+        Button closeButton = new Button ()
+        {
+            NoDecorations = true,
+            NoPadding = true,
+            Title = "X",
+            Width = 1,
+            Height = 1,
+            X = Pos.AnchorEnd (),
+            Y= 0,
+            ShadowStyle = ShadowStyle.None
+        };
+        sub.Border!.Add (closeButton);
+        root.Add (sub);
+
+        root.Layout ();
+
+        var result = View.GetViewsAtLocation (root, new Point (6, 2));
+        Assert.Equal (4, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub, result [1]);
+        Assert.Equal (sub.Border, result [2]);
+        Assert.Equal (closeButton, result [3]);
+    }
+
+    [Fact]
+    public void ReturnsDeepestSubview_WhenNested ()
+    {
+        TestView root = new (0, 0, 20, 20);
+        var sub1 = new TestView (2, 2, 16, 16);
+        var sub2 = new TestView (3, 3, 10, 10);
+        var sub3 = new TestView (1, 1, 5, 5);
+        root.Add (sub1);
+        sub1.Add (sub2);
+        sub2.Add (sub3);
+
+        // Point inside all
+        var result = View.GetViewsAtLocation (root, new Point (7, 7));
+        Assert.Equal (4, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub1, result [1]);
+        Assert.Equal (sub2, result [2]);
+        Assert.Equal (sub3, result [3]);
+    }
+
+    [Fact]
+    public void ReturnsTopmostSubview_WhenOverlapping ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var sub1 = new TestView (2, 2, 6, 6);
+        var sub2 = new TestView (4, 4, 6, 6);
+        root.Add (sub1);
+        root.Add (sub2); // sub2 is on top
+
+        var result = View.GetViewsAtLocation (root, new Point (5, 5));
+        Assert.Equal (3, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub1, result [1]);
+        Assert.Equal (sub2, result [2]);
+    }
+
+    [Fact]
+    public void ReturnsTopmostSubview_WhenNotOverlapping ()
+    {
+        TestView root = new (0, 0, 10, 10);// under 5,5,
+        var sub1 = new TestView (10, 10, 6, 6); // not under location 5,5
+        var sub2 = new TestView (4, 4, 6, 6); // under 5,5,
+        root.Add (sub1);
+        root.Add (sub2); // sub2 is on top
+
+        var result = View.GetViewsAtLocation (root, new Point (5, 5));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub2, result [1]);
+    }
+
+    [Fact]
+    public void SkipsInvisibleSubviews ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var sub1 = new TestView (2, 2, 6, 6, visible: false);
+        var sub2 = new TestView (4, 4, 6, 6);
+        root.Add (sub1);
+        root.Add (sub2);
+
+        var result = View.GetViewsAtLocation (root, new Point (5, 5));
+        Assert.Equal (2, result.Count);
+        Assert.Equal (root, result [0]);
+        Assert.Equal (sub2, result [1]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_WhenPointOnEdge ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var result = View.GetViewsAtLocation (root, new Point (0, 0));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+
+    [Fact]
+    public void ReturnsRoot_WhenPointOnBottomRightCorner ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var result = View.GetViewsAtLocation (root, new Point (9, 9));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+
+    [Fact]
+    public void ReturnsEmpty_WhenAllSubviewsInvisible ()
+    {
+        TestView root = new (0, 0, 10, 10);
+        var sub1 = new TestView (2, 2, 6, 6, visible: false);
+        root.Add (sub1);
+
+        var result = View.GetViewsAtLocation (root, new Point (3, 3));
+        Assert.Single (result);
+        Assert.Equal (root, result [0]);
+    }
+}
+
diff --git a/Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationForRootTests.cs b/Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationForRootTests.cs
new file mode 100644
index 0000000000..d492b9e472
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationForRootTests.cs
@@ -0,0 +1,334 @@
+#nullable enable
+
+namespace Terminal.Gui.ViewMouseTests;
+
+[Trait ("Category", "Input")]
+public class GetViewsUnderLocationForRootTests
+{
+    [Fact]
+    public void ReturnsRoot_WhenPointInsideRoot_NoSubviews ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        List<View?> result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+    }
+
+    [Fact]
+    public void ReturnsEmpty_WhenPointOutsideRoot ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        List<View?> result = View.GetViewsUnderLocation (top, new (20, 20), ViewportSettings.TransparentMouse);
+        Assert.Empty (result);
+    }
+
+    [Fact]
+    public void ReturnsSubview_WhenPointInsideSubview ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+
+        View sub = new ()
+        {
+            X = 2, Y = 2, Width = 5, Height = 5
+        };
+        top.Add (sub);
+        List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (sub, result);
+        Assert.Equal (sub, result.Last ());
+    }
+
+    [Fact]
+    public void ReturnsTop_WhenPointInsideSubview_With_TransparentMouse ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+
+        View sub = new ()
+        {
+            X = 2, Y = 2, Width = 5, Height = 5,
+            ViewportSettings = ViewportSettings.TransparentMouse
+        };
+        top.Add (sub);
+        List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
+        Assert.Single (result);
+        Assert.Contains (top, result);
+
+        result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.None);
+        Assert.Equal (2, result.Count);
+        Assert.Contains (top, result);
+        Assert.Contains (sub, result);
+    }
+
+    [Fact]
+    public void ReturnsAdornment_WhenPointInMargin ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        top.Margin!.Thickness = new (1);
+        top.Margin!.ViewportSettings = ViewportSettings.None;
+        List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (top.Margin, result);
+    }
+
+    [Fact]
+    public void Returns_WhenPointIn_TransparentToMouseMargin_None ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        top.Margin!.Thickness = new (1);
+        top.Margin!.ViewportSettings = ViewportSettings.TransparentMouse;
+        List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+        Assert.DoesNotContain (top, result);
+        Assert.DoesNotContain (top.Margin, result);
+    }
+
+    [Fact]
+    public void Returns_WhenPointIn_NotTransparentToMouseMargin_Top_And_Margin ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        top.Margin!.Thickness = new (1);
+        top.Margin!.ViewportSettings = ViewportSettings.None;
+        List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (top.Margin, result);
+    }
+
+    [Fact]
+    public void ReturnsAdornment_WhenPointInBorder ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        top.Border!.Thickness = new (1);
+        List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (top.Border, result);
+    }
+
+    [Fact]
+    public void ReturnsAdornment_WhenPointInPadding ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+        top.Border!.Thickness = new (1);
+        top.Padding!.Thickness = new (1);
+        top.Layout ();
+        List<View?> result = View.GetViewsUnderLocation (top, new (1, 1), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (top.Padding, result);
+    }
+
+    [Fact]
+    public void HonorsIgnoreTransparentMouseParam ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10),
+            ViewportSettings = ViewportSettings.TransparentMouse
+        };
+        List<View?> result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.TransparentMouse);
+        Assert.Empty (result);
+
+        result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.None);
+        Assert.NotEmpty (result);
+    }
+
+    [Fact]
+    public void ReturnsDeepestSubview_WhenNested ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+
+        View sub1 = new ()
+        {
+            X = 1, Y = 1, Width = 8, Height = 8
+        };
+
+        View sub2 = new ()
+        {
+            X = 1, Y = 1, Width = 6, Height = 6
+        };
+        sub1.Add (sub2);
+        top.Add (sub1);
+        List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
+        Assert.Contains (sub2, result);
+        Assert.Equal (sub2, result.Last ());
+    }
+
+    [Fact]
+    public void Returns_Subview_WhenPointIn_TransparentToMouseMargin_Top ()
+    {
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 20, 20)
+        };
+
+        View subView = new ()
+        {
+            Frame = new (0, 0, 5, 5)
+        };
+        subView.Margin!.Thickness = new (1);
+        subView.Margin!.ViewportSettings = ViewportSettings.None;
+        top.Add (subView);
+
+        Assert.True (subView.Contains (new Point (4, 4)));
+        List<View?> result = View.GetViewsUnderLocation (top, new (4, 4), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.Contains (subView.Margin, result);
+        Assert.Contains (subView, result);
+
+        subView.Margin!.ViewportSettings = ViewportSettings.TransparentMouse;
+
+        result = View.GetViewsUnderLocation (top, new (4, 4), ViewportSettings.TransparentMouse);
+        Assert.Contains (top, result);
+        Assert.DoesNotContain (subView.Margin, result);
+        Assert.DoesNotContain (subView, result);
+    }
+
+    [Theory]
+    [InlineData ("Margin")]
+    [InlineData ("Border")]
+    [InlineData ("Padding")]
+    public void Returns_Subview_Of_Adornment (string adornmentType)
+    {
+        // Arrange: top -> subView -> subView.[Adornment] -> adornmentSubView
+        Toplevel top = new ()
+        {
+            Frame = new (0, 0, 10, 10)
+        };
+
+        View subView = new ()
+        {
+            X = 0, Y = 0, Width = 8, Height = 8
+        };
+        top.Add (subView);
+
+        View? adornment = null;
+        switch (adornmentType)
+        {
+            case "Margin":
+                subView.Margin!.Thickness = new (2);
+                adornment = subView.Margin;
+                break;
+            case "Border":
+                subView.Border!.Thickness = new (2);
+                adornment = subView.Border;
+                break;
+            case "Padding":
+                subView.Padding!.Thickness = new (2);
+                adornment = subView.Padding;
+                break;
+        }
+
+        subView.Layout ();
+
+        // Add a child to the adornment
+        View adornmentSubView = new ()
+        {
+            X = 0, Y = 0, Width = 2, Height = 2
+        };
+        adornment!.Add (adornmentSubView);
+
+        // Set adornment ViewportSettings to None so it doesn't interfere with the test
+        adornment.ViewportSettings = ViewportSettings.None;
+
+        // Act: Point inside adornmentSubView (which is inside the adornment)
+        var result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+
+        // Assert: Should contain top, subView, adornment, and adornmentSubView
+        Assert.Contains (top, result);
+        Assert.Contains (subView, result);
+        Assert.Contains (adornment, result);
+        Assert.Contains (adornmentSubView, result);
+        Assert.Equal (top, result [0]);
+        Assert.Equal (adornmentSubView, result [^1]);
+    }
+
+
+
+    [Theory]
+    [InlineData ("Margin")]
+    [InlineData ("Border")]
+    [InlineData ("Padding")]
+    public void Returns_OnlyParentsSuperView_Of_Adornment_If_TransparentMouse (string adornmentType)
+    {
+        // Arrange: top -> subView -> subView.[Adornment] -> adornmentSubView
+        Toplevel top = new ()
+        {
+            Id = "top",
+            Frame = new (0, 0, 10, 10)
+        };
+
+        View subView = new ()
+        {
+            Id = "subView",
+            X = 0, Y = 0, Width = 8, Height = 8
+        };
+        top.Add (subView);
+
+        View? adornment = null;
+        switch (adornmentType)
+        {
+            case "Margin":
+                subView.Margin!.Thickness = new (2);
+                adornment = subView.Margin;
+                break;
+            case "Border":
+                subView.Border!.Thickness = new (2);
+                adornment = subView.Border;
+                break;
+            case "Padding":
+                subView.Padding!.Thickness = new (2);
+                adornment = subView.Padding;
+                break;
+        }
+
+        subView.Layout ();
+
+        // Add a child to the adornment
+        View adornmentSubView = new ()
+        {
+            Id = "adornmentSubView",
+            X = 0, Y = 0, Width = 2, Height = 2
+        };
+        adornment!.Add (adornmentSubView);
+
+        adornment.ViewportSettings = ViewportSettings.TransparentMouse;
+
+        // Act: Point inside adornmentSubView (which is inside the adornment)
+        var result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
+
+        // Assert: Should contain top, subView, adornment, and adornmentSubView
+        Assert.Contains (top, result);
+        Assert.DoesNotContain (adornment, result);
+        Assert.Contains (adornmentSubView, result);
+        Assert.DoesNotContain (subView, result);
+        Assert.Equal (top, result [0]);
+        Assert.Equal (adornmentSubView, result [^1]);
+    }
+
+}
diff --git a/Tests/UnitTestsParallelizable/View/Mouse/GetViewsUnderMouseTests.cs b/Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationTests.cs
similarity index 92%
rename from Tests/UnitTestsParallelizable/View/Mouse/GetViewsUnderMouseTests.cs
rename to Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationTests.cs
index 830977c878..070e834255 100644
--- a/Tests/UnitTestsParallelizable/View/Mouse/GetViewsUnderMouseTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Layout/GetViewsUnderLocationTests.cs
@@ -3,13 +3,13 @@
 namespace Terminal.Gui.ViewMouseTests;
 
 [Trait ("Category", "Input")]
-public class GetViewsUnderMouseTests
+public class GetViewsUnderLocationTests
 {
     [Theory]
     [InlineData (0, 0)]
     [InlineData (2, 1)]
     [InlineData (20, 20)]
-    public void GetViewsUnderMouse_Returns_Null_If_No_SubViews_Coords_Outside (int testX, int testY)
+    public void Returns_Null_If_No_SubViews_Coords_Outside (int testX, int testY)
     {
         // Arrange
         var view = new View
@@ -20,7 +20,7 @@ public void GetViewsUnderMouse_Returns_Null_If_No_SubViews_Coords_Outside (int t
         var location = new Point (testX, testY);
 
         // Act
-        List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.None);
 
         // Assert
         Assert.Empty (viewsUnderMouse);
@@ -30,7 +30,7 @@ public void GetViewsUnderMouse_Returns_Null_If_No_SubViews_Coords_Outside (int t
     [InlineData (0, 0)]
     [InlineData (2, 1)]
     [InlineData (20, 20)]
-    public void GetViewsUnderMouse_Returns_Null_If_Start_Not_Visible (int testX, int testY)
+    public void Returns_Null_If_Start_Not_Visible (int testX, int testY)
     {
         // Arrange
         var view = new View
@@ -42,7 +42,7 @@ public void GetViewsUnderMouse_Returns_Null_If_Start_Not_Visible (int testX, int
         var location = new Point (testX, testY);
 
         // Act
-        List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
+        List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.None);
 
         // Assert
         Assert.Empty (viewsUnderMouse);
diff --git a/Tests/UnitTestsParallelizable/View/Layout/ViewportTests.cs b/Tests/UnitTestsParallelizable/View/Layout/ViewportTests.cs
index 003073442e..541f34c1e7 100644
--- a/Tests/UnitTestsParallelizable/View/Layout/ViewportTests.cs
+++ b/Tests/UnitTestsParallelizable/View/Layout/ViewportTests.cs
@@ -474,97 +474,4 @@ public void ViewportChanged_Event_Raised_When_Frame_Changes ()
         Assert.Equal (2, view.ViewportChangedEventCallCount);
     }
 
-    //[Theory]
-    //[InlineData (0, 0, true)]
-    //[InlineData (-1, 0, true)]
-    //[InlineData (0, -1, true)]
-    //[InlineData (-1, -1, true)]
-    //[InlineData (-2, -2, true)]
-    //[InlineData (-3, -3, true)]
-    //[InlineData (-4, -4, true)]
-    //[InlineData (-5, -4, false)]
-    //[InlineData (-4, -5, false)]
-    //[InlineData (-5, -5, false)]
-
-    //[InlineData (1, 1, true)]
-    //[InlineData (2, 2, true)]
-    //[InlineData (3, 3, true)]
-    //[InlineData (4, 4, true)]
-    //[InlineData (5, 4, false)]
-    //[InlineData (4, 5, false)]
-    //[InlineData (5, 5, false)]
-    //public void IsVisibleInSuperView_No_Driver_No_SuperView (int x, int y, bool expected)
-    //{
-    //    var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
-    //    Assert.True (view.IsVisibleInSuperView (x, y) == expected);
-    //}
-
-    //[Theory]
-    //[InlineData (0, 0, true)]
-    //[InlineData (-1, 0, true)]
-    //[InlineData (0, -1, true)]
-    //[InlineData (-1, -1, true)]
-    //[InlineData (-2, -2, true)]
-    //[InlineData (-3, -3, true)]
-    //[InlineData (-4, -4, true)]
-    //[InlineData (-5, -4, true)]
-    //[InlineData (-4, -5, true)]
-    //[InlineData (-5, -5, true)]
-    //[InlineData (-6, -5, false)]
-    //[InlineData (-5, -6, false)]
-    //[InlineData (-6, -6, false)]
-
-    //[InlineData (1, 1, true)]
-    //[InlineData (2, 2, true)]
-    //[InlineData (3, 3, true)]
-    //[InlineData (4, 4, true)]
-    //[InlineData (5, 4, true)]
-    //[InlineData (4, 5, true)]
-    //[InlineData (5, 5, true)]
-    //[InlineData (6, 5, true)]
-    //[InlineData (6, 6, true)]
-    //[InlineData (7, 7, true)]
-    //[InlineData (8, 8, true)]
-    //[InlineData (9, 8, false)]
-    //[InlineData (8, 9, false)]
-    //[InlineData (9, 9, false)]
-    //public void IsVisibleInSuperView_No_Driver_With_SuperView (int x, int y, bool expected)
-    //{
-    //    var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
-    //    var top = new Toplevel { Width = 10, Height = 10 };
-    //    top.Add (view);
-
-    //    Assert.True (view.IsVisibleInSuperView (x, y) == expected);
-    //}
-
-    //[SetupFakeDriver]
-    //[Theory]
-    //[InlineData (0, 0, true)]
-    //[InlineData (-1, 0, false)]
-    //[InlineData (0, -1, false)]
-    //[InlineData (-1, -1, false)]
-
-    //[InlineData (1, 0, true)]
-    //[InlineData (0, 1, true)]
-    //[InlineData (1, 1, true)]
-    //[InlineData (2, 2, true)]
-    //[InlineData (3, 3, true)]
-    //[InlineData (4, 4, true)]
-    //[InlineData (5, 4, false)]
-    //[InlineData (4, 5, false)]
-    //[InlineData (5, 5, false)]
-    //public void IsVisibleInSuperView_With_Driver (int x, int y, bool expected)
-    //{
-    //    ((FakeDriver)Application.Driver!).SetBufferSize (10, 10);
-
-    //    var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
-    //    var top = new Toplevel ();
-    //    top.Add (view);
-    //    Application.Begin (top);
-
-    //    Assert.True (view.IsVisibleInSuperView (x, y) == expected);
-
-    //    top.Dispose ();
-    //    Application.Shutdown ();
-    //}
 }
diff --git a/Tests/UnitTestsParallelizable/View/SchemeTests.cs b/Tests/UnitTestsParallelizable/View/SchemeTests.cs
new file mode 100644
index 0000000000..34c059f867
--- /dev/null
+++ b/Tests/UnitTestsParallelizable/View/SchemeTests.cs
@@ -0,0 +1,267 @@
+#nullable enable
+using Terminal.Gui;
+using Xunit;
+
+namespace Terminal.Gui.ViewTests;
+
+[Trait ("Category", "View.Scheme")]
+public class SchemeTests
+{
+
+    [Fact]
+    public void GetScheme_Default_ReturnsBaseScheme ()
+    {
+        var view = new View ();
+        var baseScheme = SchemeManager.GetHardCodedSchemes ()? ["Base"];
+
+        Assert.Equal (baseScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void SetScheme_Explicitly_SetsSchemeCorrectly ()
+    {
+        var view = new View ();
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+
+        view.SetScheme (dialogScheme);
+
+        Assert.True (view.HasScheme);
+        Assert.Equal (dialogScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GetScheme_InheritsFromSuperView_WhenNotExplicitlySet ()
+    {
+        var superView = new View ();
+        var subView = new View ();
+
+        superView.Add (subView);
+
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+        superView.SetScheme (dialogScheme);
+
+        Assert.Equal (dialogScheme, subView.GetScheme ());
+        Assert.False (subView.HasScheme);
+
+        subView.Dispose ();
+        superView.Dispose ();
+    }
+
+    [Fact]
+    public void SetSchemeName_OverridesInheritedScheme ()
+    {
+        var view = new View ();
+        view.SchemeName = "Dialog";
+
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+        Assert.Equal (dialogScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GetAttribute_ReturnsCorrectAttribute_Via_Mock ()
+    {
+        var view = new View { SchemeName = "Base" };
+        view.Driver = new MockConsoleDriver ();
+        view.Driver.SetAttribute (new Attribute (Color.Red, Color.Green));
+
+        // Act
+        var attribute = view.GetCurrentAttribute ();
+
+        // Assert
+        Assert.Equal (new Attribute (Color.Red, Color.Green), attribute);
+    }
+
+    [Fact]
+    public void GetAttributeForRole_ReturnsCorrectAttribute ()
+    {
+        var view = new View { SchemeName = "Base" };
+
+        Assert.Equal (view.GetScheme ().Normal, view.GetAttributeForRole (VisualRole.Normal));
+        Assert.Equal (view.GetScheme ().HotNormal, view.GetAttributeForRole (VisualRole.HotNormal));
+        Assert.Equal (view.GetScheme ().Focus, view.GetAttributeForRole (VisualRole.Focus));
+        Assert.Equal (view.GetScheme ().HotFocus, view.GetAttributeForRole (VisualRole.HotFocus));
+        Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.Disabled));
+
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GetAttributeForRole_DisabledView_ReturnsCorrectAttribute ()
+    {
+        var view = new View { SchemeName = "Base" };
+
+        view.Enabled = false;
+        Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.Normal));
+        Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.HotNormal));
+
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void SetAttributeForRole_SetsCorrectAttribute ()
+    {
+        var view = new View { SchemeName = "Base" };
+        view.Driver = new MockConsoleDriver ();
+        view.Driver.SetAttribute (new Attribute (Color.Red, Color.Green));
+
+        var previousAttribute = view.SetAttributeForRole (VisualRole.Focus);
+        Assert.Equal (view.GetScheme ().Focus, view.GetCurrentAttribute ());
+        Assert.NotEqual (previousAttribute, view.GetCurrentAttribute ());
+
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void OnGettingScheme_Override_StopsDefaultBehavior ()
+    {
+        var view = new CustomView ();
+        var customScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
+
+        Assert.Equal (customScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void OnSettingScheme_Override_PreventsSettingScheme ()
+    {
+        var view = new CustomView ();
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+
+        view.SetScheme (dialogScheme);
+
+        Assert.NotEqual (dialogScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GettingScheme_Event_CanOverrideScheme ()
+    {
+        var view = new View ();
+        var customScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
+
+        view.GettingScheme += (sender, args) =>
+        {
+            args.NewScheme = customScheme;
+            args.Cancel = true;
+        };
+
+        Assert.Equal (customScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void SettingScheme_Event_CanCancelSchemeChange ()
+    {
+        var view = new View ();
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+
+        view.SettingScheme += (sender, args) => args.Cancel = true;
+
+        view.SetScheme (dialogScheme);
+
+        Assert.NotEqual (dialogScheme, view.GetScheme ());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GetAttributeForRole_Event_CanOverrideAttribute ()
+    {
+        var view = new View { SchemeName = "Base" };
+        var customAttribute = new Attribute (Color.BrightRed, Color.BrightYellow);
+
+        view.GettingAttributeForRole += (sender, args) =>
+        {
+            if (args.Role == VisualRole.Focus)
+            {
+                args.NewValue = customAttribute;
+                args.Cancel = true;
+            }
+        };
+
+        Assert.Equal (customAttribute, view.GetAttributeForRole (VisualRole.Focus));
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void GetHardCodedSchemes_ReturnsExpectedSchemes ()
+    {
+        var schemes = Scheme.GetHardCodedSchemes ();
+
+        Assert.NotNull (schemes);
+        Assert.Contains ("Base", schemes.Keys);
+        Assert.Contains ("Dialog", schemes.Keys);
+        Assert.Contains ("Error", schemes.Keys);
+        Assert.Contains ("Menu", schemes.Keys);
+        Assert.Contains ("Toplevel", schemes.Keys);
+    }
+
+    [Fact]
+    public void SchemeName_OverridesSuperViewScheme ()
+    {
+        var superView = new View ();
+        var subView = new View ();
+
+        superView.Add (subView);
+
+        subView.SchemeName = "Error";
+
+        var errorScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
+        Assert.Equal (errorScheme, subView.GetScheme());
+
+        subView.Dispose ();
+        superView.Dispose ();
+    }
+
+    [Fact]
+    public void Scheme_DefaultsToBase_WhenNotSet ()
+    {
+        var view = new View ();
+        var baseScheme = SchemeManager.GetHardCodedSchemes ()? ["Base"];
+
+        Assert.Equal (baseScheme, view.GetScheme());
+        view.Dispose ();
+    }
+
+    [Fact]
+    public void Scheme_HandlesNullSuperViewGracefully ()
+    {
+        var view = new View ();
+        view.SchemeName = "Dialog";
+
+        var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
+        Assert.Equal (dialogScheme, view.GetScheme());
+
+        view.Dispose ();
+    }
+
+    private class CustomView : View
+    {
+        protected override bool OnGettingScheme (out Scheme? scheme)
+        {
+            scheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
+            return true;
+        }
+
+        protected override bool OnSettingScheme (in Scheme? scheme)
+        {
+            return true; // Prevent setting the scheme
+        }
+    }
+
+    [Fact]
+    public void View_Resolves_Attributes_From_Scheme ()
+    {
+        View view = new Label { SchemeName = "Base" };
+
+        foreach (VisualRole role in Enum.GetValues<VisualRole> ())
+        {
+            Attribute attr = view.GetAttributeForRole (role);
+            Assert.NotEqual (default, attr.Foreground); // Defensive: avoid all-defaults
+        }
+
+        view.Dispose ();
+    }
+}
diff --git a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
index 888be90de9..45ecb0437b 100644
--- a/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/AllViewsTests.cs
@@ -145,4 +145,38 @@ public void AllViews_Command_HotKey_Raises_HandlingHotKey (Type viewType)
         }
         view?.Dispose ();
     }
+
+    [Theory]
+    [MemberData (nameof (AllViewTypes))]
+    public void AllViews_Disabled_Draws_Disabled_Or_Faint (Type viewType)
+    {
+        var view = CreateInstanceIfNotGeneric (viewType);
+
+        if (view == null)
+        {
+            output.WriteLine ($"Ignoring {viewType} - It's a Generic");
+
+            return;
+        }
+
+        if (view is IDesignable designable)
+        {
+            designable.EnableForDesign ();
+        }
+
+        var mockDriver = new MockConsoleDriver ();
+        mockDriver.AttributeSet += (_, args) =>
+                                   {
+                                       if (args != view.GetAttributeForRole (VisualRole.Disabled) && args.Style != TextStyle.Faint)
+                                       {
+                                           Assert.Fail($"{viewType} with `Enabled == false` tried to SetAttribute to {args}");
+                                       }
+                                   };
+        view.Driver = mockDriver;
+        view.Enabled = false;
+        view.SetNeedsDraw ();
+        view.Draw ();
+
+        view?.Dispose ();
+    }
 }
diff --git a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
index 1cd6bb8f8e..b4cff4a034 100644
--- a/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/ShortcutTests.cs
@@ -439,18 +439,4 @@ public void Focus_CanFocus_CommandView_Add_Tracks ()
         Assert.False (shortcut.CanFocus);
         Assert.True (shortcut.CommandView.CanFocus);
     }
-
-    [Fact]
-    public void ColorScheme_SetsAndGetsCorrectly ()
-    {
-        var colorScheme = new ColorScheme ();
-
-        var shortcut = new Shortcut
-        {
-            ColorScheme = colorScheme
-        };
-
-        Assert.Same (colorScheme, shortcut.ColorScheme);
-    }
-
 }
diff --git a/docfx/docs/cancellable-work-pattern.md b/docfx/docs/cancellable-work-pattern.md
new file mode 100644
index 0000000000..4cd3904c3e
--- /dev/null
+++ b/docfx/docs/cancellable-work-pattern.md
@@ -0,0 +1,243 @@
+# Cancellable Work Pattern in Terminal.Gui
+
+The *Cancellable Work Pattern* is a core design pattern in Terminal.Gui, used to structure workflows that can be executed in a default manner, modified by external code or subclasses, or cancelled entirely. This pattern is prevalent across various components of Terminal.Gui, including the `View` class for rendering, keyboard input, and command execution, as well as application-level input handling and property changes. Unlike traditional inheritance-based approaches that rely on overriding virtual methods (which often require subclasses to understand base class implementation details), the *Cancellable Work Pattern* prioritizes events for loose coupling, supplemented by optional virtual methods for flexibility.
+
+This deep dive defines the *Cancellable Work Pattern*, outlines its components and goals, and illustrates its implementation through examples in `View.Draw`, `View.Keyboard`, `View.Command`, `Application.Keyboard`, and `OrientationHelper`.
+
+## Definition
+
+The *Cancellable Work Pattern* is a design pattern for executing a structured workflow with one or more phases, where each phase can:
+- Proceed in a default manner.
+- Be modified by external code or subclasses.
+- Be cancelled to halt further processing.
+
+The pattern uses events as the primary mechanism for notification and customization, supplemented by virtual methods for subclassing when needed. It is a specialization of the **Observer Pattern**, extended with structured workflows, explicit cancellation mechanisms, and context-aware notifications. It also incorporates elements of the **Template Method Pattern** (via virtual methods) and **Pipeline Pattern** (via sequential phases).
+
+## Goals
+
+The *Cancellable Work Pattern* is designed to achieve the following:
+1. **Default Execution**: Provide a standard process that executes unless interrupted, ensuring predictable behavior out of the box.
+2. **Modification**: Allow external code or subclasses to customize specific phases without requiring deep knowledge of the implementation.
+3. **Cancellation**: Enable halting of a phase or the entire workflow, giving consumers control over the process.
+4. **Decoupling**: Use events to reduce reliance on inheritance, minimizing the need for subclasses to understand base class details.
+
+## Components
+
+The *Cancellable Work Pattern* consists of the following components:
+- **Workflow**: A sequence of phases, which may be multi-phase (e.g., rendering in `View.Draw`), linear (e.g., key processing in `View.Keyboard`), per-unit (e.g., command execution in `View.Command`), or event-driven (e.g., key handling in `Application.Keyboard`, property changes in `OrientationHelper`).
+- **Notifications**: Events (e.g., `DrawingText`, `KeyDown`, `Activating`, `OrientationChanging`) and virtual methods (e.g., `OnDrawingText`, `OnKeyDown`, `OnActivating`, `OnOrientationChanging`) raised at each phase to notify observers.
+- **Cancellation**: Mechanisms to halt a phase or workflow, such as setting `Cancel`/`Handled` properties in event arguments or returning `bool` from virtual methods.
+- **Context**: Data passed to observers for informed decision-making, such as `DrawContext` (drawing), `Key` (keyboard), `ICommandContext` (commands), or `CancelEventArgs<Orientation>` (orientation).
+- **Default Behavior**: A standard implementation for each phase, such as `DrawText` (drawing), `InvokeCommands` (keyboard and application-level), `RaiseActivating` (commands), or updating a property (`OrientationHelper`).
+
+## Implementation in Terminal.Gui
+
+The *Cancellable Work Pattern* is implemented consistently across several key areas of Terminal.Gui’s `v2_develop` branch. Below are five primary examples, each illustrating the pattern in a different domain: rendering, keyboard input at the view level, command execution, application-level keyboard input, and property changes.
+
+### 1. View.Draw: Rendering Workflow
+
+The `View.Draw` method orchestrates the rendering of a view, including its adornments (margin, border, padding), viewport, text, content, subviews, and line canvas. It is a multi-phase workflow where each phase can be customized or cancelled.
+
+#### Example: `DoDrawText`
+The `DoDrawText` method, responsible for drawing a view’s text, exemplifies the pattern:
+```csharp
+private void DoDrawText(DrawContext? context = null)
+{
+    if (OnDrawingText(context)) // Virtual method for subclasses
+    {
+        return; // Cancel if true
+    }
+    if (OnDrawingText()) // Legacy virtual method
+    {
+        return; // Cancel if true
+    }
+    var dev = new DrawEventArgs(Viewport, Rectangle.Empty, context);
+    DrawingText?.Invoke(this, dev); // Notify observers
+    if (dev.Cancel) // Check for cancellation
+    {
+        return;
+    }
+    DrawText(context); // Default behavior
+}
+```
+- **Workflow**: Single phase for text drawing within the broader `Draw` workflow.
+- **Notifications**: `OnDrawingText` (virtual), `DrawingText` (event).
+- **Cancellation**: `OnDrawingText` returning `true` or `dev.Cancel = true`.
+- **Context**: `DrawContext` and `DrawEventArgs` provide rendering details.
+- **Default Behavior**: `DrawText` renders the view’s text.
+- **Use Case**: Allows customization of text rendering (e.g., custom formatting) or cancellation (e.g., skipping text for performance).
+
+### 2. View.Keyboard: View-Level Keyboard Input
+
+The `View.ProcessKeyDown` method processes keyboard input for a view, mapping keys to commands or handling them directly. It is a linear workflow with a single phase per key event.
+
+#### Example: `ProcessKeyDown`
+```csharp
+public virtual bool ProcessKeyDown(Key key)
+{
+    if (OnKeyDown(key)) // Virtual method
+    {
+        return true; // Cancel if true
+    }
+    KeyDown?.Invoke(this, key); // Notify observers
+    if (key.Handled) // Check for cancellation
+    {
+        return true;
+    }
+    bool handled = InvokeCommands(key, KeyBindingScope.HotKey | KeyBindingScope.Focused); // Default behavior
+    return handled;
+}
+```
+- **Workflow**: Linear, processing one key event.
+- **Notifications**: `OnKeyDown` (virtual), `KeyDown` (event).
+- **Cancellation**: `OnKeyDown` returning `true` or `key.Handled = true`.
+- **Context**: `Key` provides key details and bindings.
+- **Default Behavior**: `InvokeCommands` maps keys to commands (e.g., `Command.Accept`).
+- **Use Case**: Allows views to customize key handling (e.g., `TextField` capturing input) or cancel default command execution.
+
+### 3. View.Command: Command Execution
+
+The `View.Command` APIs execute commands like `Command.Activate` and `Command.Accept`, used for state changes (e.g., `CheckBox` toggling) and action confirmation (e.g., dialog submission). It is a per-unit workflow, with one phase per command.
+
+#### Example: `RaiseActivating`
+The `RaiseActivating` method handles `Command.Activate`:
+```csharp
+protected bool? RaiseActivating(ICommandContext? ctx)
+{
+    CommandEventArgs args = new() { Context = ctx };
+    if (OnActivating(args) || args.Handled)
+    {
+        return true;
+    }
+    Activating?.Invoke(this, args);
+    return Activating is null ? null : args.Handled;
+}
+```
+- **Workflow**: Single phase for `Command.Activate`.
+- **Notifications**: `OnActivating` (virtual), `Activating` (event).
+- **Cancellation**: `OnActivating` returning `true` or `args.Handled = true`.
+- **Context**: `ICommandContext` provides `Command`, `Source`, and `Binding`.
+- **Default Behavior**: `SetFocus` for `Command.Activate` (in `SetupCommands`).
+- **Use Case**: Allows customization of state changes (e.g., `CheckBox` toggling) or cancellation (e.g., preventing focus in `MenuItemv2`).
+
+#### Propagation Challenge
+- `Command.Activate` is local, limiting hierarchical coordination (e.g., `MenuBarv2` popovers). A proposed `PropagatedCommands` property addresses this, as detailed in the appendix.
+
+### 4. Application.Keyboard: Application-Level Keyboard Input
+
+The `Application.OnKeyDown` method processes application-wide keyboard input, raising events for global key handling. It is an event-driven workflow, with a single phase per key event.
+
+#### Example: `OnKeyDown`
+```csharp
+public static bool OnKeyDown(Key key)
+{
+    if (KeyDown is null)
+    {
+        return false;
+    }
+    KeyDown?.Invoke(null, key); // Notify observers
+    return key.Handled; // Check for cancellation
+}
+```
+- **Workflow**: Event-driven, processing one key event.
+- **Notifications**: `KeyDown` (event, no virtual method).
+- **Cancellation**: `key.Handled = true`.
+- **Context**: `Key` provides key details.
+- **Default Behavior**: None; relies on subscribers (e.g., `Top` view processing).
+- **Use Case**: Allows global key bindings (e.g., `Ctrl+Q` to quit) or cancellation of default view handling.
+
+### 5. OrientationHelper: Property Changes
+
+The `OrientationHelper` class manages orientation changes (e.g., in `StackPanel`), raising events for property updates. It is an event-driven workflow, with a single phase per change.
+
+#### Example: `Orientation` Setter
+```csharp
+public Orientation Orientation
+{
+    get => _orientation;
+    set
+    {
+        if (_orientation == value)
+        {
+            return;
+        }
+        var oldOrientation = _orientation;
+        var args = new CancelEventArgs<Orientation>(_orientation, ref value);
+        if (OnOrientationChanging(args))
+        {
+            return; // Cancel if true
+        }
+        OrientationChanging?.Invoke(this, args);
+        if (args.Cancel)
+        {
+            return;
+        }
+        _orientation = value;
+        var changedArgs = new EventArgs<Orientation>(oldOrientation, _orientation);
+        OnOrientationChanged(changedArgs);
+        OrientationChanged?.Invoke(this, changedArgs);
+    }
+}
+```
+- **Workflow**: Event-driven, processing one property change.
+- **Notifications**: `OnOrientationChanging` (virtual), `OrientationChanging` (event), `OnOrientationChanged`, `OrientationChanged` (post-event).
+- **Cancellation**: `OnOrientationChanging` returning `true` or `args.Cancel = true`.
+- **Context**: `CancelEventArgs<Orientation>` provides old and new values.
+- **Default Behavior**: Updates `_orientation` and notifies via `OrientationChanged`.
+- **Use Case**: Allows customization of orientation changes (e.g., adjusting layout) or cancellation (e.g., rejecting invalid orientations).
+
+## Proposed Enhancement: Command Propagation
+
+The *Cancellable Work Pattern* in `View.Command` currently supports local `Command.Activate` and propagating `Command.Accept`. To address hierarchical coordination needs (e.g., `MenuBarv2` popovers, `Dialog` closing), a `PropagatedCommands` property is proposed (Issue #4050):
+
+- **Change**: Add `IReadOnlyList<Command> PropagatedCommands` to `View`, defaulting to `[Command.Accept]`. `Raise*` methods propagate if the command is in `SuperView?.PropagatedCommands` and `args.Handled` is `false`.
+- **Example**:
+  ```csharp
+  public IReadOnlyList<Command> PropagatedCommands { get; set; } = new List<Command> { Command.Accept };
+  protected bool? RaiseActivating(ICommandContext? ctx)
+  {
+      CommandEventArgs args = new() { Context = ctx };
+      if (OnActivating(args) || args.Handled)
+      {
+          return true;
+      }
+      Activating?.Invoke(this, args);
+      if (!args.Handled && SuperView?.PropagatedCommands.Contains(Command.Activate) == true)
+      {
+          return SuperView.InvokeCommand(Command.Activate, ctx);
+      }
+      return Activating is null ? null : args.Handled;
+  }
+  ```
+- **Impact**: Enables `Command.Activate` propagation for `MenuBarv2` while preserving `Command.Accept` propagation, maintaining decoupling and avoiding noise from irrelevant commands.
+
+## Challenges and Recommendations
+
+1. **Conflation in FlagSelector**:
+   - **Issue**: `CheckBox.Activating` triggers `Accepting`, conflating state change and confirmation.
+   - **Recommendation**: Refactor to separate `Activating` and `Accepting`:
+     ```csharp
+     checkbox.Activating += (sender, args) =>
+     {
+         if (RaiseActivating(args.Context) is true)
+         {
+             args.Handled = true;
+         }
+     };
+     ```
+
+2. **Propagation Limitations**:
+   - **Issue**: Local `Command.Activate` restricts `MenuBarv2` coordination; `Command.Accept` uses hacks (#3925).
+   - **Recommendation**: Adopt `PropagatedCommands` to enable targeted propagation, as proposed.
+
+3. **Documentation Gaps**:
+   - **Issue**: The pattern’s phases and `Handled` semantics are not fully documented.
+   - **Recommendation**: Document the pattern’s structure, phases, and examples across `View.Draw`, `View.Keyboard`, `View.Command`, `Application.Keyboard`, and `OrientationHelper`.
+
+4. **Complexity in Multi-Phase Workflows**:
+   - **Issue**: `View.Draw`’s multi-phase workflow can be complex for developers to customize.
+   - **Recommendation**: Provide clearer phase-specific documentation and examples.
+
+## Conclusion
+
+The *Cancellable Work Pattern* is a foundational design in Terminal.Gui, enabling extensible, cancellable, and decoupled workflows across rendering, input handling, command execution, and property changes. Its implementation in `View.Draw`, `View.Keyboard`, `View.Command`, `Application.Keyboard`, and `OrientationHelper` supports diverse use cases, from `Menuv2`’s hierarchical menus to `CheckBox`’s state toggling. The proposed `PropagatedCommands` property enhances the pattern’s applicability in `View.Command`, addressing propagation needs while maintaining its core principles. By refining implementation flaws (e.g., `FlagSelector`) and improving documentation, Terminal.Gui can further leverage this pattern for robust, flexible UI interactions.
\ No newline at end of file
diff --git a/docfx/docs/config.md b/docfx/docs/config.md
index 8a01205916..8a09fd3630 100644
--- a/docfx/docs/config.md
+++ b/docfx/docs/config.md
@@ -2,58 +2,271 @@
 
 Terminal.Gui provides persistent configuration settings via the [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) class.
 
-1) **Settings**. Settings are applied to the [`Application`](~/api/Terminal.Gui.Application.yml) class. Settings are accessed via the `Settings` property of [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml).
-2) **Themes**. Themes are a named collection of settings impacting how applications look. The default theme is named "Default". Two other built-in themes are provided: "Dark", and "Light". Additional themes can be defined in the configuration files.
-3) **AppSettings**. Applications can use the [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) to store and retrieve application-specific settings.
+## Configuration Lexicon and Taxonomy
+
+| Term | Meaning |
+|:-----|:--------|
+| **AppSettings** | Application-specific settings stored in the application's resources. |
+| **Apply** | Apply the configuration to the application; copies settings from configuration properties to corresponding `static` `[ConfigProperty]` properties. |
+| **Attribute** | Defines concrete visual styling for a visual element (Foreground color, Background color, TextStyle). |
+| **BackgroundColor** | A property of `Attribute` describing the background text color. |
+| **Color** | Base terminal color (supports TrueColor and named values like White, Black, Cyan, etc.). |
+| **ConfigProperty** | A property decorated with `[ConfigProperty]` that can be configured via the configuration system. |
+| **Configuration** | A collection of settings defining application behavior and appearance. |
+| **ConfigurationManager** | System that loads and manages application runtime settings from external sources. |
+| **ForegroundColor** | A property of `Attribute` describing the foreground text color. |
+| **Load** | Load configuration from given location(s), updating with new values. Loading doesn't apply settings automatically. |
+| **Location** | Storage location for configuration (e.g., user's home directory, application directory). |
+| **Reset** | Reset configuration to current values or hard-coded defaults. Does not load configuration. |
+| **Scope** | Defines the context where configuration applies (Settings, Theme, or AppSettings). |
+| **Scheme** | Maps `VisualRole` to `Attribute`, defining visual element appearance (color and style) based on semantic purpose. |
+| **Settings** | Runtime options including both system settings and application-specific settings. |
+| **Sources** | Set of locations where configuration can be stored (@Terminal.Gui.ConfigLocations enum). |
+| **Style** | Property of `Attribute` for font-like hints (bold, italic, underline). |
+| **Theme** | Named instance containing specific appearance settings. |
+| **ThemeInheritance** | Mechanism where themes can inherit and override settings from other themes. |
+| **Themes** | Collection of named Theme definitions bundling visual and layout settings. |
+| **VisualRole** | Semantic role/purpose of a visual element (Normal, Focus, HotFocus, Active, Disabled, ReadOnly). |
+
+# Fundamentals
+
+The `ConfigurationManager` class provides a way to store and retrieve configuration settings for an application. The configuration is stored in JSON documents, which can be located in the user's home directory, the current working directory, in memory, or as a resource within the application's main assembly.
+
+Settings are defined in JSON format, according to this schema: https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json.
+
+Terminal.Gui library developers can define settings in code and set the default values in the Terminal.Gui assembly's resources (e.g. `Terminal.Gui.Resources.config.json`).
+
+Terminal.Gui application developers can define settings in their apps' code and set the default values in their apps' resources (e.g. `Resources/config.json`) or by setting @Terminal.Gui.Application.RuntimeConfig to string containing JSON.
+
+Users can change settings on a global or per-application basis by providing JSON formatted configuration files. The configuration files can be placed in at .tui folder in the user's home directory (e.g. `C:/Users/username/.tui`, or `/usr/username/.tui`) or the folder where the Terminal.Gui application was launched from (e.g. `./.tui`).
+
+## CM is Disabled by Default
+
+The `ConfigurationManager` must be enabled explicitly by calling  @Terminal.Gui.ConfigurationManager.Enable() in an application's `Main` method.
+
+```csharp
+// Enable configuration with all sources  
+ConfigurationManager.Enable(ConfigLocations.All);
+```
+
+If `ConfigurationManager.Enable()` is not called (`ConfigurationManager.IsEnabled` is 'false'), all configuration settings are ignored and ConfigurationManager will effectively be a no-op. All `[ConfigurationProperty]` properties will initially be their hard-coded default values. Calling @Terminal.Gui.ConfigurationManager.Reset will reset all configuration properties back to their hard-coded default values.
+
+Other than that, no other ConfigurationManager APIs will have any effect.
+
+## Loading and Applying Configuration
+
+Optionally, developers can more granularly control the loading and applying of configuration by calling the `Load` and `Apply` methods directly.
+
+When a configuration has been loaded, the @Terminal.Gui.ConfigurationManager.Apply method must be called to apply the settings to the application. This method uses reflection to find all static fields decorated with the `[ConfigurationProperty]` attribute and applies the settings to the corresponding properties.
+
+```csharp
+// Load the configuration from just the users home directory.
+ConfigurationManager.Enable(ConfigLocations.HardCoded);
+ConfigurationManager.Load(ConfigLocations.GlobalHome);
+ConfigurationManager.Apply();
+```
+
+> [!IMPORTANT]
+>  Configuration Settings Apply at the Process Level. 
+> Configuration settings are applied at the process level, which means that they are applied to all applications that are part of the same process. This is due to the fact that configuration properties are defined as static fields, which are static for the process.
+
+## Configuration Types and Scopes
+
+Terminal.Gui supports three main configuration scopes. See the section below titled [What Can Be Configured](#what-can-be-configured) for more details.
+
+### SettingsScope
+
+System-level settings that affect Terminal.Gui behavior:
+```csharp
+[ConfigurationProperty (Scope = typeof (SettingsScope))]
+public static int MaxSearchResults { get; set; } = 10000;
+```
+
+### ThemeScope
+Visual appearance settings that can be themed:
+```csharp
+ [ConfigurationProperty (Scope = typeof (ThemeScope))]
+ public new static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single;
+```
+
+### AppSettingsScope (default)
+Application-specific settings:
+```csharp
+[ConfigurationProperty] // AppSettingsScope is default
+public static string MyAppSetting { get; set; } = "default";
+```
+
+## Configuration Precedence
+
+```mermaid
+graph TD
+    A[Hard-coded Defaults] --> B[Terminal.Gui Defaults]
+    B --> C[Runtime Config]
+    C --> D[App Resources]
+    D --> E[App Home Directory]
+    E --> F[App Current Directory]
+    F --> G[Global Home Directory]
+    G --> H[Global Current Directory]
+```
+
+Settings are applied using the following precedence (higher precedence settings overwrite lower precedence settings):
+
+1. Hard-coded default values in any static property decorated with the `[ConfigurationProperty]` attribute.
+
+2. @Terminal.Gui.ConfigLocations.Default - Default settings in the Terminal.Gui assembly -- Lowest precedence.
+
+3. @Terminal.Gui.ConfigLocations.Runtime - Settings stored in the @Terminal.Gui.ConfigurationManager.RuntimeConfig static property.
+
+4. @Terminal.Gui.ConfigLocations.AppResources - App settings in app resources (`Resources/config.json`).
+
+5. @Terminal.Gui.ConfigLocations.AppHome - App-specific settings in the users's home directory (`~/.tui/appname.config.json`). 
+
+6. @Terminal.Gui.ConfigLocations.AppCurrent - App-specific settings in the directory the app was launched from (`./.tui/appname.config.json`).
+
+7. @Terminal.Gui.ConfigLocations.GlobalHome - Global settings in the the user's home directory (`~/.tui/config.json`).
+
+8. @Terminal.Gui.ConfigLocations.GlobalCurrent - Global settings in the directory the app was launched from (`./.tui/config.json`) --- Hightest precedence.
+
 
 The [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) will look for configuration files in the `.tui` folder in the user's home directory (e.g. `C:/Users/username/.tui` or `/usr/username/.tui`), the folder where the Terminal.Gui application was launched from (e.g. `./.tui`), or as a resource within the Terminal.Gui application's main assembly.
 
 Settings that will apply to all applications (global settings) reside in files named `config.json`. Settings that will apply to a specific Terminal.Gui application reside in files named `appname.config.json`, where *appname* is the assembly name of the application (e.g. `UICatalog.config.json`).
 
-Settings are applied using the following precedence (higher precedence settings overwrite lower precedence settings):
 
-1. @Terminal.Gui.ConfigLocations.Default - Default settings in the Terminal.Gui assembly -- Lowest precedence.
 
-2. @Terminal.Gui.ConfigLocations.Runtime - Settings stored in the @Terminal.Gui.ConfigurationManager.RuntimeConfig static property.
+## Configuration Events
+
+The ConfigurationManager provides several events to track configuration changes:
+
+```csharp
+// Called after configuration is applied
+ConfigurationManager.Applied += (sender, e) => {
+    // Handle configuration changes
+};
+
+// Called when the active theme changes
+ConfigurationManager.ThemeChanged += (sender, e) => {
+    // Handle theme changes
+};
+```
+
+
+## How Settings are Defined 
 
-3. @Terminal.Gui.ConfigLocations.AppResources - App settings in app resources (`Resources/config.json`).
+Application developers define settings by decorating static properties with the `[ConfigurationProperty]` attribute.
 
-4. @Terminal.Gui.ConfigLocations.AppHome - App-specific settings in the users's home directory (`~/.tui/appname.config.json`). 
+```csharp
+class MyApp
+{
+    [ConfigurationProperty]
+    public static string MySetting { get; set; } = "Default Value";
+}
+```
+
+Configuration Properties must be `public` or `internal` `static` properties.
 
-5. @Terminal.Gui.ConfigLocations.AppCurrent - App-specific settings in the directory the app was launched from (`./.tui/appname.config.json`).
+The above example will define a configuration property in the `AppSettings` scope. The name of the property will be `MyApp.MySetting` and will appear in JSON as:
 
-6. @Terminal.Gui.ConfigLocations.GlobalHome - Global settings in the the user's home directory (`~/.tui/config.json`).
+```json
+{
+    "AppSettings": {
+      "MyApp.MySetting": "Default Value"
+    }
+}
+```
 
-7. @Terminal.Gui.ConfigLocations.GlobalCurrent - Global settings in the directory the app was launched from (`./.tui/config.json`) --- Hightest precedence.
+`AppSettings` property names must be globally unique. To ensure this, the name of the AppSettings property is the name of the property prefixed with a period and the full name of the class that holds it. In the example above, the AppSettings property is named `MyApp.MySetting`.
 
-The `UICatalog` application provides an example of how to use the [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) class to load and save configuration files. The `Configuration Editor` scenario provides an editor that allows users to edit the configuration files. UI Catalog also uses a file system watcher to detect changes to the configuration files to tell [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) to reload them; allowing users to change settings without having to restart the application.
+Terminal.Gui library developers can use the `SettingsScope` and `ThemeScope` attributes to define settings and themes for the terminal.Gui library.
+
+> [!IMPORTANT] App developers cannot define `SettingScope` or `ThemeScope` properties.
+
+```csharp
+    /// <summary>
+    ///     Gets or sets whether <see cref="Button"/>s are shown with a shadow effect by default.
+    /// </summary>
+    [ConfigurationProperty (Scope = typeof (ThemeScope))]
+    public static ShadowStyle DefaultShadow { get; set; } = ShadowStyle.None;
+```
+
+# Sample Code
+
+The `UICatalog` application provides an example of how to use the [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) class to load and save configuration files. 
+
+The `Configuration Editor` Scenario provides an editor that allows users to edit the configuration files. UI Catalog also uses a file system watcher to detect changes to the configuration files to tell [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) to reload them; allowing users to change settings without having to restart the application.
+
+The `Themes` Scenario in the UI Catalog provides a viewer for the themes defined in the configuration files.
 
 # What Can Be Configured
 
-## Settings
+`ConfigurationManager` provides the following features:
 
-> [!IMPORTANT]
-> This list is not complete; search the source code for `SerializableConfigurationProperty` to find all settings that can be configured.
-
-  * @Terminal.Gui.Application.QuitKey
-  * @Terminal.Gui.Application.NextTabKey
-  * @Terminal.Gui.Application.PrevTabKey
-  * @Terminal.Gui.Application.NextTabGroupKey
-  * @Terminal.Gui.Application.PrevTabGroupKey
-  * @Terminal.Gui.Application.ArrangeKey
-  * @Terminal.Gui.Application.ForceDriver
-  * @Terminal.Gui.Application.Force16Colors
-  * @Terminal.Gui.Application.IsMouseDisabled
-  
+1) **Settings**. Settings are applied to the [`Application`](~/api/Terminal.Gui.Application.yml) class. Settings are accessed via the `Settings` property of [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml). E.g. `Settings["Application.QuitKey"]`
+2) **Themes**. Themes are a named collection of settings impacting how applications look. The default theme is named "Default". Two other built-in themes are provided: "Dark", and "Light". Additional themes can be defined in the configuration files. `Settings ["Themes"]` is a dictionary of theme names to theme settings.
+3) **AppSettings**. Applications can use the [`ConfigurationManager`](~/api/Terminal.Gui.ConfigurationManager.yml) to store and retrieve application-specific settings.
+
+Methods for discovering what can be configured are available in the `ConfigurationManager` class:
+
+- Call @ConfigurationManager.GetConfigurationProperties()
+- Search the source code for `[ConfigurationProperty]` 
+- View `./Terminal.Gui/Resources/config.json`
+
+For complete schema details and examples, refer to:
+- Schema: https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json
+- Default configuration: Terminal.Gui/Resources/config.json
 
 ## Themes
 
 A Theme is a named collection of settings that impact the visual style of Terminal.Gui applications. The default theme is named "Default". The built-in configuration within the Terminal.Gui library defines two more themes: "Dark", and "Light". Additional themes can be defined in the configuration files. The JSON property `Theme` defines the name of the theme that will be used. If the theme is not found, the default theme will be used.
 
-Themes support defining ColorSchemes as well as various default settings for Views. Both the default color schemes and user-defined color schemes can be configured. See [ColorSchemes](~/api/Terminal.Gui.Colors.yml) for more information.
+Themes support defining Schemes (a set of colors and styles that define the appearance of views) as well as various default settings for Views. Both the default color schemes and user-defined color schemes can be configured. See [Schemes](~/api/Terminal.Gui.Schemes.yml) for more information.
+
+### Theme Configuration
+
+Themes provide a way to bundle visual settings together. When @Terminal.Gui.ConfigurationManager.Apply is called, the theme settings are applied to the application. 
+
+```json
+// ...
+ "Dark": {
+   "Dialog.DefaultButtonAlignment": "End",
+   "Dialog.DefaultButtonAlignmentModes": "AddSpaceBetweenItems",
+   "Dialog.DefaultBorderStyle": "Heavy",
+   "Dialog.DefaultShadow": "Transparent",
+   "FrameView.DefaultBorderStyle": "Single",
+   "Window.DefaultBorderStyle": "Single",
+   "MessageBox.DefaultButtonAlignment": "Center",
+   "MessageBox.DefaultBorderStyle": "Heavy",
+   "Button.DefaultShadow": "Opaque",
+   "Schemes": [
+     {
+       "TopLevel": {
+         "Normal": {
+           "Foreground": "LightGray",
+           "Background": "Black",
+           "Style": "None"
+         },
+// etc...
+```
+
+Only properties that are defined in the theme will be applied, meaning that themes can be used to override the a previously applied theme.
+
+To ensure a theme inherits from the default theme, first apply the default theme, then apply the new theme, like this:
+
+```csharp
+// Apply the default theme
+  ThemeManager.Theme = "Default";
+ConfigurationManager.Apply();
+
+// Apply the new theme
+ThemeManager.Theme = "MyCustomTheme";
+ConfigurationManager.Apply();
+```
+
+### Glyphs
 
 Themes support changing the standard set of glyphs used by views (e.g. the default indicator for [Button](~/api/Terminal.Gui.Button.yml)) and line drawing (e.g. [LineCanvas](~/api/Terminal.Gui.LineCanvas.yml)).
 
+
 The value can be either a decimal number or a string. The string may be:
 
 - A Unicode char (e.g. "☑")
@@ -67,9 +280,98 @@ The value can be either a decimal number or a string. The string may be:
   "Glyphs.UpArrow": 965010
 ```
 
-The `UI Catalog` application defines a `UICatlog` Theme. Look at the UI Catalog's `./Resources/config.json` file to see how to define a theme.
+The `UI Catalog` application defines a `UICatalog` Theme. Look at the UI Catalog's `./Resources/config.json` file to see how to define a theme.
+
+### Theme and Scheme Management
+
+Terminal.Gui provides two key managers for handling visual themes and schemes:
+
+The ThemeManager provides convenient methods for working with themes:
+
+```csharp
+// Get the currently active theme
+ThemeScope currentTheme = ThemeManager.GetCurrentTheme();
+
+// Get all available themes
+Dictionary<string, ThemeScope> themes = ThemeManager.GetThemes();
+
+// Get list of theme names
+ImmutableList<string> themeNames = ThemeManager.GetThemeNames();
+
+// Get/Set current theme name
+string currentThemeName = ThemeManager.GetCurrentThemeName();
+ThemeManager.Theme = "Dark"; // Switch themes
+
+// Listen for theme changes
+ThemeManager.ThemeChanged += (sender, e) => {
+    // Handle theme changes
+};
+```
+
+### SchemeManager
+
+The SchemeManager handles schemes within themes. Each theme contains multiple schemes for different UI contexts:
+
+```csharp
+// Get current schemes
+Dictionary<string, Scheme> schemes = SchemeManager.GetCurrentSchemes();
+
+// Get list of scheme names
+ImmutableList<string> schemeNames = SchemeManager.GetSchemeNames();
+
+// Access specific schemes
+Scheme topLevelScheme = SchemeManager.GetScheme("TopLevel");
+
+// Listen for scheme changes
+SchemeManager.CollectionChanged += (sender, e) => {
+    // Handle scheme changes
+};
+```
+
+### Built-in Schemes
+
+The following Schemes are available by default:
+
+- **TopLevel**: Used for the application's top-level windows
+- **Base**: Default scheme for most views
+- **Dialog**: Used for dialogs and message boxes
+- **Menu**: Used for menus and status bars
+- **Error**: Used for error messages and dialogs
+
+Each Scheme defines the attributes for different VisualRoles.
+
+## Application Settings
+
+Terminal.Gui provides several top-level application settings:
+
+```json
+{
+  "Key.Separator": "+",
+  "Application.ArrangeKey": "Ctrl+F5",
+  "Application.Force16Colors": false,
+  "Application.IsMouseDisabled": false,
+  "Application.NextTabGroupKey": "F6",
+  "Application.NextTabKey": "Tab",
+  "Application.PrevTabGroupKey": "Shift+F6",
+  "Application.PrevTabKey": "Shift+Tab",
+  "Application.QuitKey": "Esc"
+}
+```
+
+### View-Specific Settings
 
-# Key Bindings
+Examples of settings that control specific view behaviors:
+
+```json
+{
+  "PopoverMenu.DefaultKey": "Shift+F10",
+  "FileDialog.MaxSearchResults": 10000,
+  "FileDialogStyle.DefaultUseColors": false,
+  "FileDialogStyle.DefaultUseUnicodeCharacters": false
+}
+```
+
+### Key Bindings
 
 > [!WARNING]
 >  Configuration Manager support for key bindings is not yet implemented.
@@ -78,18 +380,26 @@ Key bindings are defined in the `KeyBindings` property of the configuration file
 
 - `Key`: The key to bind to. The format is a string describing the key (e.g. "q", "Q,  "Ctrl+Q"). Function keys are specified as "F1", "F2", etc. 
 
+# Error Handling
+
+```json
+{
+  "ConfigurationManager.ThrowOnJsonErrors": false
+}
+```
+
+Set to `true` to throw exceptions on JSON parsing errors instead of silent failures.
+
 # Configuration File Schema
 
 Settings are defined in JSON format, according to the schema found here:
 
 https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json
 
-## Schema
+## The Default Config File
 
-[!code-json[tui-config-schema.json](../schemas/tui-config-schema.json)]
+To illustrate the syntax, the below is the `config.json` file found in `Terminal.Gui.dll`:
 
-# The Default Config File
+[!code-json[config.json](../../Terminal.Gui/Resources/config.json)]
 
-To illustrate the syntax, the below is the `config.json` file found in `Terminal.Gui.dll`:
 
-[!code-json[config.json](../../Terminal.Gui/Resources/config.json)]
\ No newline at end of file
diff --git a/docfx/docs/drawing.md b/docfx/docs/drawing.md
index fb472bae28..bd707c3a79 100644
--- a/docfx/docs/drawing.md
+++ b/docfx/docs/drawing.md
@@ -1,31 +1,50 @@
 # Drawing (Text, Lines, and Color)
 
-Terminal.Gui provides a set of APIs for formatting text, line drawing, and character-based graphing. The fundamental concept is a @Terminal.Gui.Cell which occupies a particular row and column in the terminal. A Cell includes the character (glyph) that should be rendred by the terminal, and attributes that indicate how the glyph should be rendered (e.g. the foreground and background color).
+Terminal.Gui provides a set of APIs for formatting text, line drawing, and character-based graphing. 
 
-Color is supported on all platforms, including Windows, Mac, and Linux. The default colors are 24-bit RGB colors, but the library will gracefully degrade to 16-colors if the terminal does not support 24-bit color, and black and white if the terminal does not support 16-colors.
+## Drawing Lexicon and Taxonomy
+
+| Term | Meaning |
+|:-----|:--------|
+| **Attribute** | Defines the concrete visual styling for a visual element, including Foreground color, Background color, and TextStyle. |
+| **BackgroundColor** | A property of `Attribute` that describes the color of background text. |
+| **Color** | Base terminal color (part of the color palette; supports TrueColor and named values like White, Black, Cyan, etc.). |
+| **Cell** | A single character and its attributes which occupies a particular row and column in the terminal. Not exposed directly to the developer, but used internally by drivers. See @Terminal.Gui.Cell |
+| **ForegroundColor** | A property of `Attribute` that describes the color of foreground text. |
+| **Scheme** | A Scheme is a mapping from `VisualRole`s (e.g. `VisualRole.Focus`) to `Attribute`s, defining how a `View` should look based on its purpose (e.g. Menu or Dialog). |
+| **Style** | A property of `Attribute` that captures additional font-like hints such as bold, italic, underline, beyond color. |
+| **Theme** | A single named instance containing specific appearance settings (e.g., "Default", "Dark"). |
+| **Themes** | A collection of named Theme definitions, each of which bundles visual and layout settings. |
+| **VisualRole** | The semantic role/purpose of a visual element inside a View (e.g., Normal, Focus, HotFocus, Active, Disabled, ReadOnly). |
 
-## View Drawing API
+# View Drawing API
 
 Terminal.Gui apps draw using the @Terminal.Gui.View.Move(System.Int32,System.Int32) and @Terminal.Gui.View.AddRune(System.Text.Rune) APIs. Move selects the column and row of the cell and AddRune places the specified glyph in that cell using the @Terminal.Gui.Attribute that was most recently set via @Terminal.Gui.View.SetAttribute(Terminal.Gui.Attribute). The @Terminal.Gui.ConsoleDriver caches all changed Cells and efficiently outputs them to the terminal each iteration of the Application. In other words, Terminal.Gui uses deferred rendering. 
 
-Outputting unformatted text involves:
+## Coordinate System for Drawing
+
+The @Terminal.Gui.View draw APIs all take coordinates specified in *Viewport-Relative* coordinates. That is, `0, 0` is the top-left cell visible to the user.
+
+See [Layout](layout.md) for more details of the Terminal.Gui coordinate system.
+
+## Outputting unformatted text
 
 1) Moving the draw cursor using @Terminal.Gui.View.Move(System.Int32,System.Int32).
 2) Setting the attributes using @Terminal.Gui.View.SetAttribute(Terminal.Gui.Attribute).
 3) Outputting glyphs by calling @Terminal.Gui.View.AddRune(System.Text.Rune) or @Terminal.Gui.View.AddStr(System.String) .
 
-Outputting formatted text involves:
+## Outputting formatted text
 
 1) Adding the text to a @Terminal.Gui.TextFormatter object.
 2) Setting formatting options, such as @Terminal.Gui.TextFormatter.Alignment.
 3) Calling @Terminal.Gui.TextFormatter.Draw(System.Drawing.Rectangle,Terminal.Gui.Attribute,Terminal.Gui.Attribute,System.Drawing.Rectangle,Terminal.Gui.IConsoleDriver).
 
-Line drawing is accomplished using the @Terminal.Gui.LineCanvas API:
+## Line drawing
 
 1) Add the lines via @Terminal.Gui.LineCanvas.AddLine(System.Drawing.Point,System.Int32,Terminal.Gui.Orientation,Terminal.Gui.LineStyle,System.Nullable{Terminal.Gui.Attribute}).
 2) Either render the line canvas via @Terminal.Gui.LineCanvas.GetMap or let the @Terminal.Gui.View do so automatically (which enables automatic line joining across Views).
 
-### Drawing occurs each MainLoop Iteration
+## When Drawing Occurs
 
 The @Terminal.Gui.Application MainLoop will iterate over all Views in the view hierarchy, starting with @Terminal.Gui.Application.Toplevels. The @Terminal.Gui.View.Draw method will be called which, in turn:
 
@@ -48,24 +67,14 @@ Most of the steps above can be overridden by developers using the standard [Term
 
 Then, after the above steps have completed, the Mainloop will iterate through all views in the view hierarchy again, this time calling Draw on any @Terminal.Gui.View.Margin objects, using the cached Clip region mentioned above. This enables Margin to be transparent.
 
-
 ### Declaring that drawing is needed
 
 If a View need to redraw because something changed within it's Content Area it can call @Terminal.Gui.View.SetNeedsDraw. If a View needs to be redrawn because something has changed the size of the Viewport, it can call @Terminal.Gui.View.SetNeedsLayout.
 
-### Clipping
-
-> [!IMPORTANT]
-> Clipping is still under development and the API is subject to change.
-
+## Clipping
 
 Clipping enables better performance and features like transparent margins by ensuring regions of the terminal that need to be drawn actually get drawn by the @Terminal.Gui.ConsoleDriver. Terminal.Gui supports non-rectangular clip regions with @Terminal.Gui.Region. @Terminal.Gui.ConsoleDriver.Clip is the application managed clip region and is managed by @Terminal.Gui.Application. Developers cannot change this directly, but can use @Terminal.Gui.View.ClipToScreen, @Terminal.Gui.View.SetClip(Region), @Terminal.Gui.View.ClipToFrame, and @Terminal.Gui.ClipToViewPort.
 
-## Coordinate System for Drawing
-
-The @Terminal.Gui.View draw APIs all take coordinates specified in *Viewport-Relative* coordinates. That is, `0, 0` is the top-left cell visible to the user.
-
-See [Layout](layout.md) for more details of the Terminal.Gui coordinate system.
 
 ## Cell
 
@@ -83,25 +92,52 @@ See the Character Map sample app in the [UI Catalog](https://gui-cs.github.io/Te
 
 ## Attribute 
 
-The @Terminal.Gui.Attribute class represents the formatting attributes of a `Cell`. It exposes properties for the foreground and background colors. The foreground and background colors are of type @Terminal.Gui.Color. In the future, it will expose properties for bold, underline, and other formatting attributes.
+The @Terminal.Gui.Attribute class represents the formatting attributes of a `Cell`. It exposes properties for the foreground and background colors as well as the text style. The foreground and background colors are of type @Terminal.Gui.Color. Bold, underline, and other formatting attributes are supported via the @Terminal.Gui.Attribute.Style property.
+
+Use @Terminal.Gui.View.SetAttribute to indicate which Attribute subsequent @Terminal.Gui.View.AddRune and @Terminal.Gui.View.AddStr calls will use:
+
+```cs
+// This is for illustration only. Developers typically use SetAttributeForRole instead.
+SetAttribute (new Attribute (Color.Red, Color.Black, Style.Underline));
+AddStr ("Red on Black Underlined.");
+```
+
+In the above example a hard-coded Attribute is set. Normally, developers will use @Terminal.Gui.View.SetAttributeForRole(VisualRole) to have the system use the Attributes associated with a `VisualRole` (see below).
+
+```cs
+// Modify the View's Scheme such that Focus is Red on Black Underlined
+SetScheme (new Scheme (Scheme)
+    {
+        Focus = new Attribute (Color.Red, Color.Black, Style.Underline)
+    });
+    
+SetAttributeForRole (VisualRole.Focus);
+AddStr ("Red on Black Underlined.");
+```
 
 ## Color
 
-The `Color` class represents a color. It provides automatic mapping between the legacy 4-bit (16-color) system and 24-bit colors. It contains properties for the red, green, and blue components of the color. The `Color` class also contains a static property for each of the 16 ANSI colors.
+Color is supported on all platforms, including Windows, Mac, and Linux. The default colors are 24-bit RGB colors, but the library will gracefully degrade to 16-colors if the terminal does not support 24-bit color, and black and white if the terminal does not support 16-colors.
+
+The `Color` class represents a color. It provides automatic mapping between the legacy 4-bit (16-color) system and 24-bit colors. It contains properties for the red, green, and blue components of the color. The `StandardColor` enum provides a set of predefined colors.
+
+```cs
+Attribute attribute = new Attribute(StandardColor.Goldenrod, StandardColor.Wheat Style.None);
+```
+
+## VisualRole
+
+Represents the semantic visual role of a visual element rendered by a View (e.g., Normal text, Focused item, Active selection).
 
-## Color Schemes
+@Terminal.Gui.VisualRole provides a set of predefined VisualRoles:
 
-Terminal.Gui supports named collections of colors called @Terminal.Gui.ColorScheme. Three built-in color schemes are provided: "Default", "Dark", and "Light". Additional color schemes can be defined via [Configuration Manager](config.md). 
+[!code-csharp[VisualRole.cs](../../Terminal.Gui/Drawing/VisualRole.cs)]
 
-Color schemes support defining colors for various states of a View. The following states are supported:
+## Schemes
 
-* Normal - The color of normal text.
-* HotNormal - The color of text indicating a @Terminal.Gui.View.Hotkey.
-* Focus - The color of text that indicates the view has focus.
-* HotFocus - The color of text indicating a hot key, when the view has focus.
-* Disabled - The state of a view when it is disabled.
+[!code-md[Scheme Overview](scheme.md#Scheme-Overview)]
 
-Change the colors of a view by setting the @Terminal.Gui.View.ColorScheme property.
+See [Scheme Deep Dive](scheme.md) for more details.
 
 ## Text Formatting
 
diff --git a/docfx/docs/index.md b/docfx/docs/index.md
index 988fa19c1d..b832aae3d2 100644
--- a/docfx/docs/index.md
+++ b/docfx/docs/index.md
@@ -46,6 +46,7 @@ The simplest application looks like this:
 
 ```csharp
 using Terminal.Gui;
+ConfigurationManager.Enable(ConfigLocations.All);
 Application.Init ();
 var n = MessageBox.Query (50, 5, "Question", "Do you like TUI apps?", "Yes", "No");
 Application.Shutdown ();
@@ -62,6 +63,7 @@ The [Application](~/api/Terminal.Gui.Application.yml) class additionally creates
 
 ```csharp
 using Terminal.Gui;
+ConfigurationManager.Enable(ConfigLocations.All);
 Application.Init ();
 
 var label = new Label () {
@@ -83,6 +85,7 @@ This example includes a menu bar at the top of the screen and a button that show
 ```csharp
 using Terminal.Gui;
 
+ConfigurationManager.Enable(ConfigLocations.All);
 Application.Init ();
 var menu = new MenuBar (new MenuBarItem [] {
     new MenuBarItem ("_File", new MenuItem [] {
diff --git a/docfx/docs/scheme.md b/docfx/docs/scheme.md
new file mode 100644
index 0000000000..a4c3d983fd
--- /dev/null
+++ b/docfx/docs/scheme.md
@@ -0,0 +1,97 @@
+# Scheme Deep Dive
+
+See [Drawing](drawing.md) for an overview of the drawing system and [Configuration](config.md) for an overview of the configuration system.
+
+## Scheme Overview
+
+A Scheme is named a mapping from `VisualRole`s (e.g. `VisualRole.Focus`) to `Attribute`s, defining how a `View` should look based on its purpose (e.g. Menu or Dialog). @Terminal.Gui.SchemeManager.Schemes is a dictionary of `Scheme`s, indexed by name.
+
+A Scheme defines how Views look based on their semantic purpose. The following schemes are supported:
+
+| Scheme Name | Description |
+|:-----|:--------|
+| **Base** | The base scheme used for most Views. |
+| **Dialog** | The dialog scheme; used for Dialog, MessageBox, and other views dialog-like views. |
+| **Error** | The scheme for showing errors, such as in `ErrorQuery`. |
+| **Menu** | The menu scheme; used for Terminal.Gui.Menu, MenuBar, and StatusBar. |
+| **TopLevel** | The application Toplevel scheme; used for the Toplevel View. |
+
+@Terminal.Gui.SchemeManager manages the set of available schemes and provides a set of convenience methods for getting the current scheme and for overriding the default values for these schemes.
+
+```csharp
+Scheme dialogScheme = SchemeManager.GetScheme (Schemes.Dialog);
+```
+
+[ConfigurationManager](config.md) can be used to override the default values for these schemes and add additional schemes. 
+
+### Scheme Inheritance
+
+ A `Scheme` enables consistent, semantic theming of UI elements by associating each visual state with a specific style. Each property (e.g., `Normal`  or `Focus`) is an @Terminal.Gui.Attribute. 
+
+ Only `Normal` is required. If other properties are not explicitly set, its value is derived from other roles (typically `Normal`) using well-defined inheritance rules. See the source code for the `Scheme` class for more details. 
+
+### Flexible Scheme Management in `Terminal.Gui.View`
+
+A `View`'s appearance is primarily determined by its `Scheme`, which maps semantic `VisualRole`s (like `Normal`, `Focus`, `Disabled`) to specific `Attribute`s (foreground color, background color, and text style). `Terminal.Gui` provides a flexible system for managing these schemes:
+
+1.  **Scheme Inheritance (Default Behavior)**:
+    *   By default, if a `View` does not have a `Scheme` explicitly set, it inherits the `Scheme` from its `SuperView` (its parent in the view hierarchy).
+    *   This cascading behavior allows for consistent styling across related views. If no `SuperView` has a scheme, (e.g., if the view is a top-level view), it ultimately falls back to the "Base" scheme defined in `SchemeManager.GetCurrentSchemes()`.
+    *   The `GetScheme()` method implements this logic:
+        *   It first checks if a scheme has been explicitly set via the `_scheme` field (see point 2).
+        *   If not, and if `SchemeName` is set, it tries to resolve the scheme by name from `SchemeManager`.
+        *   If still no scheme, it recursively calls `SuperView.GetScheme()`.
+        *   As a final fallback, it uses `SchemeManager.GetCurrentSchemes()["Base"]`.
+
+2.  **Explicit Scheme Assignment**:
+    *   You can directly assign a `Scheme` object to a `View` using the `View.Scheme` property (which calls `SetScheme(value)`). This overrides any inherited scheme. The `HasScheme` property will then return `true`.
+    *   Alternatively, you can set the `View.SchemeName` property to the name of a scheme registered in `SchemeManager`. If `Scheme` itself hasn't been directly set, `GetScheme()` will use `SchemeName` to look up the scheme. This is useful for declarative configurations (e.g., from a JSON file).
+    *   The `SetScheme(Scheme? scheme)` method updates the internal `_scheme` field. If the new scheme is different from the current one, it marks the view for redraw (`SetNeedsDraw()`) to reflect the visual change. It also handles a special case for `Border` to ensure its scheme is updated if it `HasScheme`.
+
+3.  **Event-Driven Customization**:
+    The scheme resolution and application process includes events that allow for fine-grained control and customization:
+
+    *   **`GettingScheme` Event (`View.Scheme.cs`)**:
+        *   This event is raised within `GetScheme()` *before* the default logic (inheritance, `SchemeName` lookup, or explicit `_scheme` usage) fully determines the scheme.
+        *   Subscribers (which could be the `SuperView`, a `SubView`, or any other interested component) can handle this event.
+        *   In the event handler, you can:
+            *   **Modify the scheme**: Set `args.NewScheme` to a different `Scheme` object.
+            *   **Cancel default resolution**: Set `args.Cancel = true`. If canceled, the `Scheme` provided in `args.NewScheme` (which might have been modified by the handler) is returned directly by `GetScheme()`.
+        *   The `OnGettingScheme(out Scheme? scheme)` virtual method is called first, allowing derived classes to provide a scheme directly.
+
+    *   **`SettingScheme` Event (`View.Scheme.cs`)**:
+        *   This event is raised within `SetScheme(Scheme? scheme)` *before* the `_scheme` field is actually updated.
+        *   Subscribers can cancel the scheme change by setting `args.Cancel = true` in the event handler.
+        *   The `OnSettingScheme(in Scheme? scheme)` virtual method is called first, allowing derived classes to prevent the scheme from being set.
+
+4.  **Retrieving and Applying Attributes for Visual Roles (`View.Attribute.cs`)**:
+    Once a `View` has determined its active `Scheme` (via `GetScheme()`), it uses this scheme to get specific `Attribute`s for rendering different parts of itself based on their `VisualRole`.
+
+    *   **`GetAttributeForRole(VisualRole role)`**:
+        *   This method first retrieves the base `Attribute` for the given `role` from the `View`'s current `Scheme` (`GetScheme()!.GetAttributeForRole(role)`).
+        *   It then raises the `GettingAttributeForRole` event (and calls the `OnGettingAttributeForRole` virtual method).
+        *   Subscribers to `GettingAttributeForRole` can:
+            *   **Modify the attribute**: Change the `args.NewValue` (which is passed by `ref` as `schemeAttribute` to the event).
+            *   **Cancel default behavior**: Set `args.Cancel = true`. The (potentially modified) `args.NewValue` is then returned.
+        *   Crucially, if the `View` is `Enabled == false` and the requested `role` is *not* `VisualRole.Disabled`, this method will recursively call itself to get the `Attribute` for `VisualRole.Disabled`. This ensures disabled views use their designated disabled appearance.
+
+    *   **`SetAttributeForRole(VisualRole role)`**:
+        *   This method is used to tell the `ConsoleDriver` which `Attribute` to use for subsequent drawing operations (like `AddRune` or `AddStr`).
+        *   It first determines the appropriate `Attribute` for the `role` from the current `Scheme` by calling `GetAttributeForRole`.
+
+    *   **`SetAttribute(Attribute attribute)`**:
+        *   This is a more direct way to set the driver's current attribute, bypassing the scheme and role system. It's generally preferred to use `SetAttributeForRole` to maintain consistency with the `Scheme`.
+
+### Impact of SuperViews and SubViews via Events
+
+*   **SuperView Influence**: A `SuperView` can subscribe to its `SubView`'s `GettingScheme` or `GettingAttributeForRole` events. This would allow a `SuperView` to dynamically alter how its children determine their schemes or specific attributes, perhaps based on the `SuperView`'s state or other application logic. For example, a container view might want all its children to adopt a slightly modified version of its own scheme under certain conditions.
+
+*   **SubView Influence (Less Common for Scheme of Parent)**: While a `SubView` *could* subscribe to its `SuperView`'s scheme events, this is less typical for influencing the `SuperView`'s *own* scheme. It's more common for a `SubView` to react to changes in its `SuperView`'s scheme if needed, or to manage its own scheme independently.
+
+*   **General Event Usage**: These events are powerful for scenarios where:
+    *   A specific `View` instance needs a unique, dynamically calculated appearance that isn't easily captured by a static `Scheme` object.
+    *   External logic needs to intercept and modify appearance decisions.
+    *   Derived `View` classes want to implement custom scheme or attribute resolution logic by overriding the `On...` methods.
+
+In summary, `Terminal.Gui` offers a layered approach to scheme management: straightforward inheritance and explicit setting for common cases, and a robust event system for advanced customization and dynamic control over how views derive and apply their visual attributes. This allows developers to achieve a wide range of visual styles and behaviors.
+
diff --git a/docfx/schemas/tui-config-schema.json b/docfx/schemas/tui-config-schema.json
index a57dffbf5a..87fec828d3 100644
--- a/docfx/schemas/tui-config-schema.json
+++ b/docfx/schemas/tui-config-schema.json
@@ -1,234 +1,226 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "The JSON schema for the Terminal.Gui Configuration Manager (https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json).",
+  "title": "Terminal.Gui Configuration",
+  "description": "Configuration settings for Terminal.Gui applications. This schema defines settings for the application behavior, appearance, themes, key bindings, and component-specific options.",
   "type": "object",
   "properties": {
+    "$schema": {
+      "type": "string",
+      "format": "uri",
+      "description": "The URI of the schema that this configuration file adheres to. Optional but recommended for validation."
+    },
+    "ConfigurationManager.ThrowOnJsonErrors": {
+      "type": "boolean",
+      "default": false,
+      "description": "If true, JSON parsing errors encountered during configuration loading will throw exceptions. If false, errors are typically logged, and default values may be used."
+    },
+    "Key.Separator": {
+      "type": "string",
+      "default": "+",
+      "description": "The character used to separate modifiers and keys in key string representations (e.g., 'Ctrl+Q')."
+    },
     "Application.ArrangeKey": {
-      "description": "Key eanable arrange mode (move/size with keyboard).",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "Ctrl+F5",
+      "description": "The key combination used to trigger an arrange or layout command, often for tiling or re-organizing windows."
     },
     "Application.Force16Colors": {
-      "description": "Force the application to use 16 colors.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": false,
+      "description": "If true, forces the console driver to output only the basic 16 ANSI colors, even if the terminal supports more (e.g., 256 colors or TrueColor)."
     },
     "Application.ForceDriver": {
-      "description": "Force the application to use a specific driver.",
-      "type": "string"
+      "type": [
+        "string",
+        "null"
+      ],
+      "enum": [
+        "",
+        "fake",
+        "ansi",
+        "curses",
+        "net",
+        "windows",
+        null
+      ],
+      "default": "",
+      "description": "Forces the use of a specific console driver. If empty or null, Terminal.Gui will attempt to auto-detect the best driver. Options: 'fake', 'ansi', 'curses', 'net', 'windows'."
     },
     "Application.IsMouseDisabled": {
-      "description": "Disable or enable the mouse. The mouse is enabled by default.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": false,
+      "description": "Disables or enables mouse support for the application. If true, mouse events will be ignored."
     },
     "Application.NextTabGroupKey": {
-      "description": "Key to navigate to the next tab group.",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "F6",
+      "description": "The key combination to navigate to the next logical group of controls or container (e.g., 'F6', 'Ctrl+PageDown')."
     },
     "Application.NextTabKey": {
-      "description": "Key to navigate to the next tab.",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "Tab",
+      "description": "The key combination to navigate to the next focusable view or tab stop (e.g., 'Tab')."
     },
     "Application.PrevTabGroupKey": {
-      "description": "Key to navigate to the previous tab group.",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "Shift+F6",
+      "description": "The key combination to navigate to the previous logical group of controls or container (e.g., 'Shift+F6', 'Ctrl+PageUp')."
     },
     "Application.PrevTabKey": {
-      "description": "Key to navigate to the previous tab.",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "Shift+Tab",
+      "description": "The key combination to navigate to the previous focusable view or tab stop (e.g., 'Shift+Tab')."
     },
     "Application.QuitKey": {
-      "description": "The key to quit the application. Esc is the default.",
-      "$ref": "#/definitions/Key"
+      "type": "string",
+      "default": "Esc",
+      "description": "The primary key combination used to request the application to quit (e.g., 'Esc', 'Ctrl+Q')."
     },
-    "AppSettings": {
-      "description": "Application-specific settings.",
-      "type": "object",
-      "properties": {
-        "ConfigurationEditor.EditorColorScheme": {
-          "description": "Color scheme for the configuration editor.",
-          "$ref": "#/definitions/ColorScheme"
-        },
-        "UICatalog.StatusBar": {
-          "description": "Enable or disable the status bar in the UI catalog.",
-          "type": "boolean"
-        }
-      }
+    "Application.AlternateForwardKey": {
+      "type": "string",
+      "description": "An alternative key combination for forward navigation or cycling through elements, often used in specific contexts (e.g., 'Ctrl+CursorRight')."
     },
-    "Colors16": {
-      "description": "Mapping of 16 colors to their names.",
-      "type": "object",
-      "additionalProperties": {
-        "$ref": "#/definitions/Color"
-      }
+    "Application.AlternateBackwardKey": {
+      "type": "string",
+      "description": "An alternative key combination for backward navigation or cycling through elements (e.g., 'Ctrl+CursorLeft')."
     },
-    "ConfigurationManager.ThrowOnJsonErrors": {
-      "description": "Throw exceptions on JSON errors.",
-      "type": "boolean"
+    "Application.ShortCutKey": {
+      "type": "string",
+      "description": "The key used to activate shortcuts or hotkeys within views (e.g., 'AltMask', 'F9'). Typically used for menu shortcuts."
     },
-    "ContextMenu.DefaultKey": {
-      "description": "Default key for the context menu.",
-      "$ref": "#/definitions/Key"
+    "PopoverMenu.DefaultKey": {
+      "type": "string",
+      "default": "Shift+F10",
+      "description": "Default key to open the context menu (PopoverMenu)."
     },
     "FileDialog.MaxSearchResults": {
-      "description": "Maximum number of search results in the file dialog.",
-      "type": "integer"
+      "type": "integer",
+      "default": 10000,
+      "description": "Maximum number of search results to display in the FileDialog."
     },
     "FileDialogStyle.DefaultUseColors": {
-      "description": "Use colors in the file dialog by default.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": false,
+      "description": "Whether the FileDialog should use colors by default to differentiate file/directory types."
     },
     "FileDialogStyle.DefaultUseUnicodeCharacters": {
-      "description": "Use Unicode characters in the file dialog by default.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": false,
+      "description": "Whether the FileDialog should use Unicode characters for icons by default."
     },
-    "Glyphs": {
-      "description": "Custom glyphs used in the application.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "Key.Separator": {
-      "description": "Separator used in key combinations.",
-      "type": "string"
-    },
-    "Theme": {
-      "description": "The currently selected theme. The default is 'Default'.",
-      "type": "string"
-    },
-    "Themes": {
-      "description": "An array of Theme objects. Each Theme specifies a set of settings for an application. Set Theme to the name of the active theme.",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Theme"
-      }
-    }
-  },
-  "definitions": {
-    "Theme": {
-      "description": "A Theme is a collection of settings that are named.",
+    "Colors16": {
       "type": "object",
+      "description": "Defines the 3-byte/6-character hexadecimal string values for the 16 legacy ANSI color names (ColorName16). These definitions can be overridden by the user to customize the base 16 color palette.",
       "properties": {
-        "Button.DefaultHighlightStyle": {
-          "description": "Default highlight style for buttons.",
-          "type": "string"
-        },
-        "Button.DefaultShadow": {
-          "description": "Default shadow style for buttons.",
-          "type": "string"
-        },
-        "CheckBox.DefaultHighlightStyle": {
-          "description": "Default highlight style for checkboxes.",
-          "type": "string"
+        "Black": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Black (typically #000000)."
         },
-        "ColorSchemes": {
-          "description": "The ColorSchemes defined for this Theme.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ColorScheme"
-          }
+        "Blue": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Blue (typically #000080, a dark blue like Navy)."
         },
-        "Dialog.DefaultBorderStyle": {
-          "description": "Default border style for dialogs.",
-          "type": "string"
+        "Green": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Green (typically #008000, a dark green)."
         },
-        "Dialog.DefaultButtonAlignment": {
-          "description": "Default button alignment for dialogs.",
-          "type": "string"
+        "Cyan": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Cyan (typically #008080, a dark cyan like Teal)."
         },
-        "Dialog.DefaultButtonAlignmentModes": {
-          "description": "Default button alignment modes for dialogs.",
-          "type": "string"
+        "Red": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Red (typically #800000, a dark red like Maroon)."
         },
-        "Dialog.DefaultMinimumHeight": {
-          "description": "Default minimum height for dialogs.",
-          "type": "integer"
+        "Magenta": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Magenta (typically #800080, a dark magenta like Purple)."
         },
-        "Dialog.DefaultMinimumWidth": {
-          "description": "Default minimum width for dialogs.",
-          "type": "integer"
+        "Yellow": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Yellow (typically #808000, a dark yellow like Olive)."
         },
-        "Dialog.DefaultShadow": {
-          "description": "Default shadow style for dialogs.",
-          "type": "string"
+        "Gray": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.Gray (typically #C0C0C0, a light gray like Silver)."
         },
-        "FrameView.DefaultBorderStyle": {
-          "description": "Default border style for frame views.",
-          "type": "string"
+        "DarkGray": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.DarkGray (typically #808080, a medium gray)."
         },
-        "MessageBox.DefaultBorderStyle": {
-          "description": "Default border style for message boxes.",
-          "type": "string"
+        "BrightBlue": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightBlue (typically #0000FF)."
         },
-        "MessageBox.DefaultButtonAlignment": {
-          "description": "Default button alignment for message boxes.",
-          "type": "string"
+        "BrightGreen": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightGreen (typically #00FF00, like Lime)."
         },
-        "MessageBox.DefaultMinimumHeight": {
-          "description": "Default minimum height for message boxes.",
-          "type": "integer"
+        "BrightCyan": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightCyan (typically #00FFFF, like Aqua)."
         },
-        "MessageBox.DefaultMinimumWidth": {
-          "description": "Default minimum width for message boxes.",
-          "type": "integer"
+        "BrightRed": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightRed (typically #FF0000)."
         },
-        "NerdFonts.Enable": {
-          "description": "Enable or disable Nerd Fonts.",
-          "type": "boolean"
+        "BrightMagenta": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightMagenta (typically #FF00FF, like Fuchsia)."
         },
-        "Window.DefaultBorderStyle": {
-          "description": "Default border style for windows.",
-          "type": "string"
+        "BrightYellow": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.BrightYellow (typically #FFFF00)."
         },
-        "Window.DefaultShadow": {
-          "description": "Default shadow style for windows.",
-          "type": "string"
+        "White": {
+          "type": "string",
+          "pattern": "^#[0-9a-fA-F]{6}$",
+          "description": "Hex string for ColorName16.White (typically #FFFFFF)."
         }
-      }
+      },
+      "additionalProperties": false
     },
-    "ColorScheme": {
-      "description": "A Terminal.Gui ColorScheme. Specifies the Foreground & Background colors for modes of an Terminal.Gui app.",
-      "type": "object",
-      "properties": {
-        "Normal": {
-          "description": "The foreground and background color for text when the view is not focused, hot, or disabled.",
-          "$ref": "#/definitions/Attribute"
-        },
-        "Focus": {
-          "description": "The foreground and background color for text when the view has focus.",
-          "$ref": "#/definitions/Attribute"
-        },
-        "HotNormal": {
-          "description": "The foreground and background color for text when the view is highlighted (hot).",
-          "$ref": "#/definitions/Attribute"
-        },
-        "HotFocus": {
-          "description": "The foreground and background color for text when the view is highlighted (hot) and has focus.",
-          "$ref": "#/definitions/Attribute"
-        },
-        "Disabled": {
-          "description": "The foreground and background color for text when the view is disabled.",
-          "$ref": "#/definitions/Attribute"
-        }
-      }
+    "Theme": {
+      "type": "string",
+      "default": "Default",
+      "description": "The name of the theme to be applied at application startup. This name must match one of the theme names defined in the 'Themes' array."
     },
-    "Attribute": {
-      "description": "A Terminal.Gui color attribute. Specifies the Foreground & Background colors for Terminal.Gui output.",
-      "type": "object",
-      "properties": {
-        "Foreground": {
-          "$ref": "#/definitions/Color"
+    "Themes": {
+      "type": "array",
+      "description": "A list of theme definitions. Each theme provides a distinct look and feel for the application.",
+      "items": {
+        "type": "object",
+        "description": "A single theme definition. The object should have exactly one property, where the key is the unique name of the theme (e.g., 'Default', 'Dark'), and the value contains the theme's settings.",
+        "maxProperties": 1,
+        "minProperties": 1,
+        "patternProperties": {
+          "^[\\w\\s&\\(\\)-]+$": {
+            "$ref": "#/definitions/themeSettings"
+          }
         },
-        "Background": {
-          "$ref": "#/definitions/Color"
-        }
-      },
-      "required": [
-        "Foreground",
-        "Background"
-      ]
-    },
+        "additionalProperties": false
+      }
+    }
+  },
+  "additionalProperties": true,
+  "definitions": {
     "Color": {
-      "description": "One be either one of the W3C standard color names, an rgb(r,g,b) tuple, or a hex color string in the format #RRGGBB.",
+      "description": "One be either one of the W3C standard color names (parsed case-insensitively), a ColorName16 (e.g. 'BrightBlue', parsed case-insensitively), an rgb(r,g,b) tuple, or a hex color string in the format #RRGGBB.",
       "$schema": "http://json-schema.org/draft-07/schema#",
       "type": "string",
       "oneOf": [
@@ -236,6 +228,7 @@
           "type": "string",
           "enum": [
             "AliceBlue",
+            "AmberPhosphor",
             "AntiqueWhite",
             "Aqua",
             "Aquamarine",
@@ -246,21 +239,26 @@
             "BlanchedAlmond",
             "Blue",
             "BlueViolet",
+            "BrightBlue",
+            "BrightCyan",
+            "BrightGreen",
+            "BrightMagenta",
+            "BrightRed",
+            "BrightYellow",
             "Brown",
             "BurlyWood",
             "CadetBlue",
-            "Chartreuse",
-            "Chocolate",
-            "Coral",
+            "Charcoal",
             "CornflowerBlue",
             "Cornsilk",
             "Crimson",
             "Cyan",
             "DarkBlue",
             "DarkCyan",
-            "DarkGoldenRod",
+            "DarkGoldenrod",
             "DarkGray",
             "DarkGreen",
+            "DarkGrey",
             "DarkKhaki",
             "DarkMagenta",
             "DarkOliveGreen",
@@ -271,28 +269,36 @@
             "DarkSeaGreen",
             "DarkSlateBlue",
             "DarkSlateGray",
+            "DarkSlateGrey",
             "DarkTurquoise",
             "DarkViolet",
             "DeepPink",
             "DeepSkyBlue",
             "DimGray",
+            "DimGrey",
             "DodgerBlue",
+            "Ebony",
             "FireBrick",
             "FloralWhite",
+            "FluorescentOrange",
             "ForestGreen",
             "Fuchsia",
             "Gainsboro",
             "GhostWhite",
             "Gold",
-            "GoldenRod",
+            "Goldenrod",
             "Gray",
             "Green",
+            "GreenPhosphor",
             "GreenYellow",
+            "Grey",
+            "GuppieGreen",
             "HoneyDew",
             "HotPink",
             "IndianRed",
             "Indigo",
             "Ivory",
+            "Jet",
             "Khaki",
             "Lavender",
             "LavenderBlush",
@@ -301,14 +307,16 @@
             "LightBlue",
             "LightCoral",
             "LightCyan",
-            "LightGoldenRodYellow",
+            "LightGoldenrodYellow",
             "LightGray",
             "LightGreen",
+            "LightGrey",
             "LightPink",
             "LightSalmon",
             "LightSeaGreen",
             "LightSkyBlue",
             "LightSlateGray",
+            "LightSlateGrey",
             "LightSteelBlue",
             "LightYellow",
             "Lime",
@@ -334,9 +342,11 @@
             "OldLace",
             "Olive",
             "OliveDrab",
+            "Onyx",
             "Orange",
             "OrangeRed",
             "Orchid",
+            "OuterSpace",
             "PaleGoldenRod",
             "PaleGreen",
             "PaleTurquoise",
@@ -348,6 +358,7 @@
             "Plum",
             "PowderBlue",
             "Purple",
+            "RaisinBlack",
             "RebeccaPurple",
             "Red",
             "RosyBrown",
@@ -362,6 +373,7 @@
             "SkyBlue",
             "SlateBlue",
             "SlateGray",
+            "SlateGrey",
             "Snow",
             "SpringGreen",
             "SteelBlue",
@@ -388,10 +400,233 @@
         }
       ]
     },
-    "Key": {
-      "description": "A key pressed on the keyboard (e.g. \"Ctrl+Q\")",
-      "type": "string"
+    "attribute": {
+      "type": "object",
+      "description": "Defines the foreground color, background color, and style for a specific UI element state.",
+      "properties": {
+        "Foreground": {
+          "$ref": "#/definitions/Color"
+        },
+        "Background": {
+          "$ref": "#/definitions/Color"
+        },
+        "Style": {
+          "type": "string",
+          "default": "None",
+          "description": "Text style. Parsed case-insensitively by the application. Can be a single style or a comma-separated list of the following valid flags: None, Bold, Italic, Underline, Faint, Blink, Reverse, Strikethrough (e.g., 'Bold,Italic').",
+          "pattern": "^(None|Bold|Italic|Underline|Faint|Blink|Reverse|Strikethrough)(\\s*,\\s*(None|Bold|Italic|Underline|Faint|Blink|Reverse|Strikethrough))*$"
+        }
+      },
+      "required": [
+        "Foreground",
+        "Background"
+      ],
+      "additionalProperties": false
+    },
+    "scheme": {
+      "type": "object",
+      "description": "A collection of attributes defining the appearance of UI elements in different states (normal, focused, etc.).",
+      "properties": {
+        "Normal": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance in the normal, non-focused state."
+        },
+        "Focus": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance when the element has input focus."
+        },
+        "HotNormal": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for a 'hot' element (e.g., mouse hover) that is not focused."
+        },
+        "HotFocus": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for a 'hot' element that also has input focus."
+        },
+        "Disabled": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance when the element is disabled."
+        },
+        "Active": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance when the element is active."
+        },
+        "HotActive": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for a 'hot' element that is also active."
+        },
+        "Highlight": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for a highlighted element."
+        },
+        "Editable": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for an editable element."
+        },
+        "ReadOnly": {
+          "$ref": "#/definitions/attribute",
+          "description": "Appearance for a read-only element."
+        }
+      },
+      "required": [
+        "Normal"
+      ],
+      "additionalProperties": false
+    },
+    "themeSettings": {
+      "type": "object",
+      "description": "Contains all settings for a specific theme, including default styles for various UI elements, glyphs, and color schemes.",
+      "properties": {
+        "BasedOn": {
+          "type": "string",
+          "description": "The name of another theme that this theme inherits settings from. Settings in the current theme will override those from the base theme."
+        },
+        "Dialog.DefaultButtonAlignment": {
+          "type": "string",
+          "enum": [
+            "Start",
+            "End",
+            "Center",
+            "Fill"
+          ],
+          "description": "Default horizontal alignment for buttons within Dialog views."
+        },
+        "Dialog.DefaultButtonAlignmentModes": {
+          "type": "string",
+          "enum": [
+            "None",
+            "AddSpaceBetweenItems",
+            "AddSpaceAroundItems"
+          ],
+          "description": "Specifies how extra space is distributed between buttons in Dialog views when alignment is 'Start', 'End', or 'Center'."
+        },
+        "Dialog.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for Dialog views."
+        },
+        "Dialog.DefaultShadow": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Transparent",
+            "Opaque"
+          ],
+          "description": "Default shadow style for Dialog views, rendered behind the dialog."
+        },
+        "FrameView.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for FrameView controls."
+        },
+        "Window.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for Window views."
+        },
+        "MessageBox.DefaultButtonAlignment": {
+          "type": "string",
+          "enum": [
+            "Start",
+            "End",
+            "Center",
+            "Fill"
+          ],
+          "description": "Default horizontal alignment for buttons within MessageBox views."
+        },
+        "MessageBox.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for MessageBox views."
+        },
+        "Button.DefaultShadow": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Transparent",
+            "Opaque"
+          ],
+          "description": "Default shadow style for Button controls, often used for 3D effect."
+        },
+        "Menuv2.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for the newer Menuv2 control and its sub-menus."
+        },
+        "MenuBarv2.DefaultBorderStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy",
+            "Rounded"
+          ],
+          "description": "Default border style for the MenuBarv2 control."
+        },
+        "StatusBar.DefaultSeparatorLineStyle": {
+          "type": "string",
+          "enum": [
+            "None",
+            "Single",
+            "Double",
+            "Heavy"
+          ],
+          "description": "Default style for separator lines in the StatusBar."
+        },
+        "Schemes": {
+          "type": "array",
+          "description": "A list of scheme definitions for this theme. Each item in the array is an object containing one or more named schemes (e.g., 'TopLevel', 'Base', 'Menu').",
+          "items": {
+            "type": "object",
+            "description": "An object where each key is a scheme name (e.g., 'Base', 'Error') and its value is the scheme definition.",
+            "patternProperties": {
+              "^[A-Za-z][A-Za-z0-9_]*$": {
+                "$ref": "#/definitions/scheme"
+              }
+            },
+            "additionalProperties": false,
+            "minProperties": 1
+          }
+        }
+      },
+      "patternProperties": {
+        "^Glyphs\\.[A-Za-z0-9]+$": {
+          "type": "string",
+          "description": "A specific glyph character used by the theme for drawing UI elements like borders, arrows, indicators, etc. (e.g., 'Glyphs.LeftArrow', 'Glyphs.HLine'). The string value is the character to be used."
+        }
+      },
+      "additionalProperties": true
     }
   }
-}
-
+}
\ No newline at end of file
diff --git a/local_packages/Terminal.Gui.2.0.0.nupkg b/local_packages/Terminal.Gui.2.0.0.nupkg
index 2679fea5f6..d0d27c8a82 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 b88bd91b5c..15b94e60c2 100644
Binary files a/local_packages/Terminal.Gui.2.0.0.snupkg and b/local_packages/Terminal.Gui.2.0.0.snupkg differ